shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-22 17:35:59 +03:00
Code Releases Activity

o changed _dev_lock to a rw_semaphore

Browse Source
This commit is contained in:
Joe Thornber 2001-08-20 14:06:25 +00:00
parent d534900b91
commit bf235aa693
2 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
driver/device-mapper/dm.c
View File

@ -141,17 +141,6 @@ static int _block_size[MAX_DEVICES];
static int _blksize_size[MAX_DEVICES]; static int _blksize_size[MAX_DEVICES];
static int _hardsect_size[MAX_DEVICES]; static int _hardsect_size[MAX_DEVICES];
static int _ctl_open(struct inode *inode, struct file *file);
static int _ctl_close(struct inode *inode, struct file *file);
static int _ctl_ioctl(struct inode *inode, struct file *file,
uint command, ulong a);
static struct file_operations _ctl_fops = {
open: _ctl_open,
release: _ctl_close,
ioctl: _ctl_ioctl,
};
static int _blk_open(struct inode *inode, struct file *file); static int _blk_open(struct inode *inode, struct file *file);
static int _blk_close(struct inode *inode, struct file *file); static int _blk_close(struct inode *inode, struct file *file);
static int _blk_ioctl(struct inode *inode, struct file *file, static int _blk_ioctl(struct inode *inode, struct file *file,
@ -328,12 +317,12 @@ static int _request_fn(request_queue_t *q, int rw, struct buffer_head *bh)
down_read(&_dev_lock); down_read(&_dev_lock);
md = _devs[minor]; md = _devs[minor];
up_read(&_dev_lock);
if (!md) if (!md) {
return -ENXIO; ret = -ENXIO;
goto out;
}
down_read(&md->lock);
for (l = 0; l < md->depth; l++) { for (l = 0; l < md->depth; l++) {
next_node = ((KEYS_PER_NODE + 1) * next_node) + i; next_node = ((KEYS_PER_NODE + 1) * next_node) + i;
node = md->index[l] + (next_node * KEYS_PER_NODE); node = md->index[l] + (next_node * KEYS_PER_NODE);
@ -353,12 +342,11 @@ static int _request_fn(request_queue_t *q, int rw, struct buffer_head *bh)
} else } else
buffer_IO_error(bh); buffer_IO_error(bh);
out:
up_read(&md->lock); up_read(&md->lock);
return ret; return ret;
} }
static inline int __specific_dev(int minor) static inline int __specific_dev(int minor)
{ {
if (minor > MAX_DEVICES) { if (minor > MAX_DEVICES) {
@ -419,37 +407,48 @@ static void _free_dev(struct mapped_device *md)
kfree(md); kfree(md);
} }
static inline struct mapped_device *__find_dev(const char *name) static inline struct mapped_device *__find_name(const char *name)
{ {
int i; int i;
for (i = 0; i < MAX_DEVICES; i++)
if (_devs[i] && !strcmp(_devs[i]->name, name))
return _devs[i];
return 0; return 0;
} }
struct mapped_device *dm_find_name(const char *name) struct mapped_device *dm_find_name(const char *name)
{ {
int i;
struct mapped_device *md; struct mapped_device *md;
down_read(&_dev_lock); down_read(&_dev_lock);
for (i = 0; i < MAX_DEVICES; i++) md = __find_name(name);
if (_devs[i] && !strcmp(_devs[i]->name, name))
return _devs[i];
up_read(&_dev_lock); up_read(&_dev_lock);
return md;
} }
struct mapped_device *dm_find_minor(int minor) struct mapped_device *dm_find_minor(int minor)
{ {
struct mapped_device *md;
down_read(&_dev_lock);
md = _devs[minor];
up_read(&_dev_lock);
return md;
} }
static int dm_create(int minor, const char *name) static int dm_create(int minor, const char *name)
{ {
struct mapped_device *md = _alloc_dev(minor); struct mapped_device *md;
if (!md) if (minor >= MAX_DEVICES)
return -ENXIO; return -ENXIO;
if (!(md = _alloc_dev(minor)))
return -ENOMEM;
down_write(&_dev_lock); down_write(&_dev_lock);
if (__find_dev(name)) { if (__find_dev(name)) {
WARN("device with that name already exists"); WARN("device with that name already exists");
@ -459,6 +458,7 @@ static int dm_create(int minor, const char *name)
} }
strcpy(md->name, name); strcpy(md->name, name);
_devs[minor] = md;
up_write(&_dev_lock); up_write(&_dev_lock);
} }
@ -473,11 +473,9 @@ static int dm_remove(const char *name, int minor)
return -ENXIO; return -ENXIO;
} }
minor = MINOR(md->dev);
clear_bit(md->status, CREATED);
dm_clear_table(md); dm_clear_table(md);
minor = MINOR(md->dev);
_free_dev(md); _free_dev(md);
_devs[minor] = 0; _devs[minor] = 0;
up_write(&_dev_lock); up_write(&_dev_lock);

2
driver/device-mapper/dm.h
View File

@ -40,8 +40,6 @@ enum {
}; };
struct mapped_device { struct mapped_device {
struct rw_semaphore lock;
kdev_t dev; kdev_t dev;
char name[DM_NAME_LEN]; char name[DM_NAME_LEN];