Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nbd: Remove variable 'pid'

Browse source 
This patch uses nbd->task_recv to determine the value of the previously
used variable 'pid' for sysfs.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Markus Pargmann 2015-08-17 08:20:05 +02:00 committed by Jens Axboe
parent e78273c80b
commit 6521d39a64
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/block/nbd.c
View file

@ -55,7 +55,6 @@ struct nbd_device {
struct gendisk *disk; struct gendisk *disk;
int blksize; int blksize;
loff_t bytesize; loff_t bytesize;
pid_t pid; /* pid of nbd-client, if attached */
int xmit_timeout; int xmit_timeout;
int disconnect; /* a disconnect has been requested by user */ int disconnect; /* a disconnect has been requested by user */
@ -379,9 +378,9 @@ static ssize_t pid_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct gendisk *disk = dev_to_disk(dev); struct gendisk *disk = dev_to_disk(dev);
struct nbd_device *nbd = (struct nbd_device *)disk->private_data;
return sprintf(buf, "%ld\n", return sprintf(buf, "%d\n", task_pid_nr(nbd->task_recv));
(long) ((struct nbd_device *)disk->private_data)->pid);
} }
static struct device_attribute pid_attr = { static struct device_attribute pid_attr = {
@ -397,16 +396,16 @@ static int nbd_do_it(struct nbd_device *nbd)
BUG_ON(nbd->magic != NBD_MAGIC); BUG_ON(nbd->magic != NBD_MAGIC);
sk_set_memalloc(nbd->sock->sk); sk_set_memalloc(nbd->sock->sk);
nbd->pid = task_pid_nr(current);
nbd->task_recv = current;
ret = device_create_file(disk_to_dev(nbd->disk), &pid_attr); ret = device_create_file(disk_to_dev(nbd->disk), &pid_attr);
if (ret) { if (ret) {
dev_err(disk_to_dev(nbd->disk), "device_create_file failed!\n"); dev_err(disk_to_dev(nbd->disk), "device_create_file failed!\n");
nbd->pid = 0; nbd->task_recv = NULL;
return ret; return ret;
} }
nbd->task_recv = current;
while (1) { while (1) {
req = nbd_read_stat(nbd); req = nbd_read_stat(nbd);
if (IS_ERR(req)) { if (IS_ERR(req)) {
@ -417,6 +416,8 @@ static int nbd_do_it(struct nbd_device *nbd)
nbd_end_request(nbd, req); nbd_end_request(nbd, req);
} }
device_remove_file(disk_to_dev(nbd->disk), &pid_attr);
nbd->task_recv = NULL; nbd->task_recv = NULL;
if (signal_pending(current)) { if (signal_pending(current)) {
@ -431,8 +432,6 @@ static int nbd_do_it(struct nbd_device *nbd)
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
} }
device_remove_file(disk_to_dev(nbd->disk), &pid_attr);
nbd->pid = 0;
return ret; return ret;
} }
@ -708,7 +707,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
struct socket *sock; struct socket *sock;
int error; int error;
if (nbd->pid) if (nbd->task_recv)
return -EBUSY; return -EBUSY;
if (!nbd->sock) if (!nbd->sock)
return -EINVAL; return -EINVAL;