summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-16 11:18:23 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-16 11:18:23 -0700
commitabce891a10559343d8ac9f79b46d78afdba63a40 (patch)
tree4aff21669025c0dbe9f8fc7cbdd727613c554526 /block
parent10b275ddfd05ccb414cfe0cc56a0f47ff20fe807 (diff)
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>
Diffstat (limited to 'block')
-rw-r--r--block/bsg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/bsg.c b/block/bsg.c
index 461c9f56f3e..576933fe186 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;