Fix new generic block device SG compile
Linus Torvalds [Mon, 16 Jul 2007 18:18:23 +0000 (11:18 -0700)]
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>

block/bsg.c

index 461c9f5..576933f 100644 (file)
@@ -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;