diff options
author | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2012-07-12 10:28:48 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-07-22 15:58:08 -0400 |
commit | b16ca626358cbf056b752eab63ba8f20087afeaf (patch) | |
tree | 11c8b1c87ae30b43aa2236f206822ae413a22313 /fs | |
parent | 4527440d5db8ff27ae8801de3f819843a1e6c6f6 (diff) |
hfs: introduce VFS superblock object back-reference
Add an 'sb' VFS superblock back-reference to the 'struct hfs_sb_info' data
structure - we will need to find the VFS superblock from a
'struct hfs_sb_info' object in the next patch, so this change is jut a
preparation.
Remove few useless newlines while on it.
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/hfs/hfs_fs.h | 6 | ||||
-rw-r--r-- | fs/hfs/super.c | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/fs/hfs/hfs_fs.h b/fs/hfs/hfs_fs.h index 1bf967c6bfdc..351561223ec3 100644 --- a/fs/hfs/hfs_fs.h +++ b/fs/hfs/hfs_fs.h | |||
@@ -137,16 +137,12 @@ struct hfs_sb_info { | |||
137 | gid_t s_gid; /* The gid of all files */ | 137 | gid_t s_gid; /* The gid of all files */ |
138 | 138 | ||
139 | int session, part; | 139 | int session, part; |
140 | |||
141 | struct nls_table *nls_io, *nls_disk; | 140 | struct nls_table *nls_io, *nls_disk; |
142 | |||
143 | struct mutex bitmap_lock; | 141 | struct mutex bitmap_lock; |
144 | |||
145 | unsigned long flags; | 142 | unsigned long flags; |
146 | |||
147 | u16 blockoffset; | 143 | u16 blockoffset; |
148 | |||
149 | int fs_div; | 144 | int fs_div; |
145 | struct super_block *sb; | ||
150 | }; | 146 | }; |
151 | 147 | ||
152 | #define HFS_FLG_BITMAP_DIRTY 0 | 148 | #define HFS_FLG_BITMAP_DIRTY 0 |
diff --git a/fs/hfs/super.c b/fs/hfs/super.c index 0730135b771e..99c6239bc3a1 100644 --- a/fs/hfs/super.c +++ b/fs/hfs/super.c | |||
@@ -380,6 +380,7 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent) | |||
380 | if (!sbi) | 380 | if (!sbi) |
381 | return -ENOMEM; | 381 | return -ENOMEM; |
382 | 382 | ||
383 | sbi->sb = sb; | ||
383 | sb->s_fs_info = sbi; | 384 | sb->s_fs_info = sbi; |
384 | 385 | ||
385 | res = -EINVAL; | 386 | res = -EINVAL; |