projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
10b275d
)
Fix new generic block device SG compile
author
Linus Torvalds
<
[email protected]
>
Mon, 16 Jul 2007 18:18:23 +0000
(11:18 -0700)
committer
Linus Torvalds
<
[email protected]
>
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 <
[email protected]
>
Cc: FUJITA Tomonori <
[email protected]
>
Cc: James Bottomley <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
block/bsg.c
patch
|
blob
|
history
diff --git
a/block/bsg.c
b/block/bsg.c
index 461c9f56f3ee557016ec3df262e95f53a3d9cb90..576933fe1860ff1c07d4603ecad5a0726447f830 100644
(file)
--- 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;