diff --git a/[refs] b/[refs]
index a17402777cc7..93f916fb9f36 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f963d270cb7bbb8eeb57901d02b22a493e664fd2
+refs/heads/master: 25ac0c2b971235d3e8c7af0b6889a1eb6988b559
diff --git a/trunk/drivers/block/nbd.c b/trunk/drivers/block/nbd.c
index f533f3375e24..a928287177fd 100644
--- a/trunk/drivers/block/nbd.c
+++ b/trunk/drivers/block/nbd.c
@@ -405,7 +405,7 @@ static int nbd_do_it(struct nbd_device *lo)
 
 	BUG_ON(lo->magic != LO_MAGIC);
 
-	lo->pid = current->pid;
+	lo->pid = task_pid_nr(current);
 	ret = sysfs_create_file(&disk_to_dev(lo->disk)->kobj, &pid_attr.attr);
 	if (ret) {
 		printk(KERN_ERR "nbd: sysfs_create_file failed!");