diff options
author | Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> | 2011-05-04 23:56:51 -0400 |
---|---|---|
committer | Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> | 2011-05-10 09:21:56 -0400 |
commit | 0ef28f9aec4dccfba33cef74412f601c1b48b658 (patch) | |
tree | 12018cde66a20b8e8804c11296ac19a3aec59fea /fs/nilfs2/mdt.h | |
parent | 0cc1283881d3fcc9011c713e067795ccec322ae7 (diff) |
nilfs2: get rid of NILFS_I_NILFS
This replaces all references of NILFS_I_NILFS(inode)->ns_bdev with
inode->i_sb->s_bdev and unfolds remaining uses of NILFS_I_NILFS inline
function.
Before 2.6.37, referring to a nilfs object from inodes needed a
conditional judgement, and NILFS_I_NILFS was helpful to simplify it.
But now we can simply do it by going through a super block instance
like inode->i_sb->s_fs_info.
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Diffstat (limited to 'fs/nilfs2/mdt.h')
-rw-r--r-- | fs/nilfs2/mdt.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/nilfs2/mdt.h b/fs/nilfs2/mdt.h index ed68563ec708..baea03663a3d 100644 --- a/fs/nilfs2/mdt.h +++ b/fs/nilfs2/mdt.h | |||
@@ -64,11 +64,6 @@ static inline struct nilfs_mdt_info *NILFS_MDT(const struct inode *inode) | |||
64 | return inode->i_private; | 64 | return inode->i_private; |
65 | } | 65 | } |
66 | 66 | ||
67 | static inline struct the_nilfs *NILFS_I_NILFS(struct inode *inode) | ||
68 | { | ||
69 | return inode->i_sb->s_fs_info; | ||
70 | } | ||
71 | |||
72 | /* Default GFP flags using highmem */ | 67 | /* Default GFP flags using highmem */ |
73 | #define NILFS_MDT_GFP (__GFP_WAIT | __GFP_IO | __GFP_HIGHMEM) | 68 | #define NILFS_MDT_GFP (__GFP_WAIT | __GFP_IO | __GFP_HIGHMEM) |
74 | 69 | ||
@@ -108,7 +103,7 @@ static inline void nilfs_mdt_clear_dirty(struct inode *inode) | |||
108 | 103 | ||
109 | static inline __u64 nilfs_mdt_cno(struct inode *inode) | 104 | static inline __u64 nilfs_mdt_cno(struct inode *inode) |
110 | { | 105 | { |
111 | return NILFS_I_NILFS(inode)->ns_cno; | 106 | return ((struct the_nilfs *)inode->i_sb->s_fs_info)->ns_cno; |
112 | } | 107 | } |
113 | 108 | ||
114 | #define nilfs_mdt_bgl_lock(inode, bg) \ | 109 | #define nilfs_mdt_bgl_lock(inode, bg) \ |