diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 22:33:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 22:33:38 -0700 |
| commit | 5bab188a316718a26346cdb25c4cc6b319f8f907 (patch) | |
| tree | 0316a8294b9709a55b0c5b2f1c1c0d3793d35c01 /fs/nilfs2/mdt.h | |
| parent | a8c91da549f625d0600d5bd7e1831066b55edf0d (diff) | |
| parent | 4d3cf1bc557dc8b88e1cabf1980b3baa3380a641 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
nilfs2: move NILFS_SUPER_MAGIC to linux/magic.h
nilfs2: get rid of nilfs_sb_info structure
nilfs2: use sb instance instead of nilfs_sb_info struct
nilfs2: get rid of sc_sbi back pointer
nilfs2: move log writer onto nilfs object
nilfs2: move next generation counter into nilfs object
nilfs2: move s_inode_lock and s_dirty_files into nilfs object
nilfs2: move parameters on nilfs_sb_info into nilfs object
nilfs2: move mount options to nilfs object
nilfs2: record used amount of each checkpoint in checkpoint list
nilfs2: optimize rec_len functions
nilfs2: append blocksize info to warnings during loading super blocks
nilfs2: add compat ioctl
nilfs2: implement FS_IOC_GETFLAGS/SETFLAGS/GETVERSION
nilfs2: tighten restrictions on inode flags
nilfs2: mark S_NOATIME on inodes only if NOATIME attribute is set
nilfs2: use common file attribute macros
nilfs2: add free entries count only if clear bit operation succeeded
nilfs2: decrement inodes count only if raw inode was successfully deleted
Diffstat (limited to 'fs/nilfs2/mdt.h')
| -rw-r--r-- | fs/nilfs2/mdt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nilfs2/mdt.h b/fs/nilfs2/mdt.h index b13734bf352..ed68563ec70 100644 --- a/fs/nilfs2/mdt.h +++ b/fs/nilfs2/mdt.h @@ -66,7 +66,7 @@ static inline struct nilfs_mdt_info *NILFS_MDT(const struct inode *inode) static inline struct the_nilfs *NILFS_I_NILFS(struct inode *inode) { - return NILFS_SB(inode->i_sb)->s_nilfs; + return inode->i_sb->s_fs_info; } /* Default GFP flags using highmem */ |