dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

nbd: check the return value of sysfs_create_file 

[akpm@linux-foundation.org: fix it]
Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
Cc: Paul Clements <paul.clements@steeleye.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
WANG Cong 2007-05-09 02:33:36 -07:00 committed by Linus Torvalds
parent b8cb34481e
commit 84963048ca
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/block/nbd.c
View File

@ -366,20 +366,25 @@ static struct disk_attribute pid_attr = {
.show = pid_show,
};
static void nbd_do_it(struct nbd_device *lo)
static int nbd_do_it(struct nbd_device *lo)
{
struct request *req;
int ret;
BUG_ON(lo->magic != LO_MAGIC);
lo->pid = current->pid;
sysfs_create_file(&lo->disk->kobj, &pid_attr.attr);
ret = sysfs_create_file(&lo->disk->kobj, &pid_attr.attr);
if (ret) {
printk(KERN_ERR "nbd: sysfs_create_file failed!");
return ret;
}
while ((req = nbd_read_stat(lo)) != NULL)
nbd_end_request(req);
sysfs_remove_file(&lo->disk->kobj, &pid_attr.attr);
return;
return 0;
}
static void nbd_clear_que(struct nbd_device *lo)
@ -569,7 +574,9 @@ static int nbd_ioctl(struct inode *inode, struct file *file,
case NBD_DO_IT:
if (!lo->file)
return -EINVAL;
nbd_do_it(lo);
error = nbd_do_it(lo);
if (error)
return error;
/* on return tidy up in case we have a signal */
/* Forcibly shutdown the socket causing all listeners
* to error