Commit 3961f0e2 authored by Ryusuke Konishi's avatar Ryusuke Konishi
Browse files

nilfs2: eliminate inlines to directly read/write inode of metadata files 



Removes two inline functions: nilfs_mdt_read_inode_direct() and
nilfs_mdt_write_inode_direct().

Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
parent 8707df38

fs/nilfs2/mdt.h

+0 −17
Original line number Diff line number Diff line
@@ -105,21 +105,4 @@ static inline __u64 nilfs_mdt_cno(struct inode *inode) 
#define nilfs_mdt_bgl_lock(inode, bg) \

	(&NILFS_MDT(inode)->mi_bgl->locks[(bg) & (NR_BG_LOCKS-1)].lock)





static inline int

nilfs_mdt_read_inode_direct(struct inode *inode, struct buffer_head *bh,

			    unsigned n)

{

	return nilfs_read_inode_common(

		inode, (struct nilfs_inode *)(bh->b_data + n));

}



static inline void

nilfs_mdt_write_inode_direct(struct inode *inode, struct buffer_head *bh,

			     unsigned n)

{

	nilfs_write_inode_common(

		inode, (struct nilfs_inode *)(bh->b_data + n), 1);

}



#endif /* _NILFS_MDT_H */

fs/nilfs2/segment.c

+6 −6
Original line number Diff line number Diff line
@@ -974,12 +974,12 @@ static void nilfs_segctor_fill_in_super_root(struct nilfs_sc_info *sci, 
			      nilfs->ns_nongc_ctime : sci->sc_seg_ctime);

	raw_sr->sr_flags = 0;



	nilfs_mdt_write_inode_direct(

		nilfs_dat_inode(nilfs), bh_sr, NILFS_SR_DAT_OFFSET(isz));

	nilfs_mdt_write_inode_direct(

		nilfs->ns_cpfile, bh_sr, NILFS_SR_CPFILE_OFFSET(isz));

	nilfs_mdt_write_inode_direct(

		nilfs->ns_sufile, bh_sr, NILFS_SR_SUFILE_OFFSET(isz));

	nilfs_write_inode_common(nilfs_dat_inode(nilfs), (void *)raw_sr +

				 NILFS_SR_DAT_OFFSET(isz), 1);

	nilfs_write_inode_common(nilfs->ns_cpfile, (void *)raw_sr +

				 NILFS_SR_CPFILE_OFFSET(isz), 1);

	nilfs_write_inode_common(nilfs->ns_sufile, (void *)raw_sr +

				 NILFS_SR_SUFILE_OFFSET(isz), 1);

}



static void nilfs_redirty_inodes(struct list_head *head)