From abce891a10559343d8ac9f79b46d78afdba63a40 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 16 Jul 2007 11:18:23 -0700 Subject: [PATCH] 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 Cc: FUJITA Tomonori Cc: James Bottomley Signed-off-by: Linus Torvalds --- block/bsg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/bsg.c b/block/bsg.c index 461c9f56f3ee..576933fe1860 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; -- 2.20.1