From d8bb6db52cc016779b878e1ecb4f567619bb9f24 Mon Sep 17 00:00:00 2001
From: WANG Cong <amwang@redhat.com>
Date: Fri, 19 Aug 2011 14:48:17 +0200
Subject: [PATCH] --- yaml --- r: 273819 b: refs/heads/master c:
 25ac0c2b971235d3e8c7af0b6889a1eb6988b559 h: refs/heads/master i:   273817:
 3ef6c885e5558e73bfe642b321fbc57f53abaad7   273815:
 8b293a26940ddcb5991a4a959accf5cd40e11c39 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/block/nbd.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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!");