diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2010-03-21 19:24:23 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-05-21 18:31:13 -0400 |
| commit | 79d7e39ee1d4b423206f6cfd2cd2eed6253d95fe (patch) | |
| tree | 72cda49fac91729b68edbec086dd5f36178448d5 /include/linux/fs.h | |
| parent | 3981f2e2a04df4b95129ddbb8bb869ef1d57bea9 (diff) | |
sb_entry() has been killed a couple of years ago and resurrected on mismerge
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include/linux/fs.h')
| -rw-r--r-- | include/linux/fs.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 4079ef99900f..d13a6b83ad0c 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
| @@ -1314,7 +1314,6 @@ extern int send_sigurg(struct fown_struct *fown); | |||
| 1314 | extern struct list_head super_blocks; | 1314 | extern struct list_head super_blocks; |
| 1315 | extern spinlock_t sb_lock; | 1315 | extern spinlock_t sb_lock; |
| 1316 | 1316 | ||
| 1317 | #define sb_entry(list) list_entry((list), struct super_block, s_list) | ||
| 1318 | #define S_BIAS (1<<30) | 1317 | #define S_BIAS (1<<30) |
| 1319 | struct super_block { | 1318 | struct super_block { |
| 1320 | struct list_head s_list; /* Keep this first */ | 1319 | struct list_head s_list; /* Keep this first */ |