summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2010-03-21 19:24:23 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2010-05-21 18:31:13 -0400
commit79d7e39ee1d4b423206f6cfd2cd2eed6253d95fe (patch)
tree72cda49fac91729b68edbec086dd5f36178448d5 /include
parent3981f2e2a04df4b95129ddbb8bb869ef1d57bea9 (diff)
downloadlinux-79d7e39ee1d4b423206f6cfd2cd2eed6253d95fe.tar.gz
linux-79d7e39ee1d4b423206f6cfd2cd2eed6253d95fe.tar.bz2
linux-79d7e39ee1d4b423206f6cfd2cd2eed6253d95fe.zip
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')
-rw-r--r--include/linux/fs.h1
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);
extern struct list_head super_blocks;
extern spinlock_t sb_lock;
-#define sb_entry(list) list_entry((list), struct super_block, s_list)
#define S_BIAS (1<<30)
struct super_block {
struct list_head s_list; /* Keep this first */