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>
struct gendisk *disk;
int blksize;
loff_t bytesize;
struct gendisk *disk;
int blksize;
loff_t bytesize;
- pid_t pid; /* pid of nbd-client, if attached */
int xmit_timeout;
int disconnect; /* a disconnect has been requested by user */
int xmit_timeout;
int disconnect; /* a disconnect has been requested by user */
struct device_attribute *attr, char *buf)
{
struct gendisk *disk = dev_to_disk(dev);
struct device_attribute *attr, char *buf)
{
struct gendisk *disk = dev_to_disk(dev);
+ struct nbd_device *nbd = (struct nbd_device *)disk->private_data;
- return sprintf(buf, "%ld\n",
- (long) ((struct nbd_device *)disk->private_data)->pid);
+ return sprintf(buf, "%d\n", task_pid_nr(nbd->task_recv));
}
static struct device_attribute pid_attr = {
}
static struct device_attribute pid_attr = {
BUG_ON(nbd->magic != NBD_MAGIC);
sk_set_memalloc(nbd->sock->sk);
BUG_ON(nbd->magic != NBD_MAGIC);
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);
if (ret) {
dev_err(disk_to_dev(nbd->disk), "device_create_file failed!\n");
ret = device_create_file(disk_to_dev(nbd->disk), &pid_attr);
if (ret) {
dev_err(disk_to_dev(nbd->disk), "device_create_file failed!\n");
- nbd->task_recv = current;
-
while (1) {
req = nbd_read_stat(nbd);
if (IS_ERR(req)) {
while (1) {
req = nbd_read_stat(nbd);
if (IS_ERR(req)) {
nbd_end_request(nbd, req);
}
nbd_end_request(nbd, req);
}
+ device_remove_file(disk_to_dev(nbd->disk), &pid_attr);
+
nbd->task_recv = NULL;
if (signal_pending(current)) {
nbd->task_recv = NULL;
if (signal_pending(current)) {
- device_remove_file(disk_to_dev(nbd->disk), &pid_attr);
- nbd->pid = 0;
struct socket *sock;
int error;
struct socket *sock;
int error;
return -EBUSY;
if (!nbd->sock)
return -EINVAL;
return -EBUSY;
if (!nbd->sock)
return -EINVAL;