From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 16 Jul 2007 18:18:23 +0000 (-0700)
Subject: Fix new generic block device SG compile
X-Git-Tag: v2.6.23-rc1~779
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abce891a10559343d8ac9f79b46d78afdba63a40;p=linux-2.6

Fix new generic block device SG compile

We had a merge issue with the "dentry" field going away from the
kobject, and being replaced by a sysfs_dirent field (named "sd")
instead.  That broke the BSG compile.

Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: James Bottomley <James.Bottomley@SteelEye.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/block/bsg.c b/block/bsg.c
index 461c9f56f3..576933fe18 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -1011,7 +1011,7 @@ retry:
 	}
 	bcd->class_dev = class_dev;
 
-	if (q->kobj.dentry) {
+	if (q->kobj.sd) {
 		ret = sysfs_create_link(&q->kobj, &bcd->class_dev->kobj, "bsg");
 		if (ret)
 			goto err;