Skip to content

Commit

Permalink
Fix new generic block device SG compile
Browse files Browse the repository at this point in the history
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 <[email protected]>
Cc: FUJITA Tomonori <[email protected]>
Cc: James Bottomley <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Linus Torvalds committed Jul 16, 2007
1 parent 10b275d commit abce891
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion block/bsg.c
Original file line number Diff line number Diff line change
Expand Up @@ -1011,7 +1011,7 @@ int bsg_register_queue(struct request_queue *q, const char *name)
}
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;
Expand Down

0 comments on commit abce891

Please sign in to comment.