Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcbc8c64 authored by Ryusuke Konishi's avatar Ryusuke Konishi
Browse files

nilfs2: do not pass sbi to functions which can get it from inode 



This removes argument for passing nilfs_sb_info structure from
nilfs_set_file_dirty and nilfs_load_inode_block functions.  We can get
a pointer to the structure from inodes.

[Stephen Rothwell <sfr@canb.auug.org.au>: fix conflict with commit
 b74c79e9]

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

fs/nilfs2/dir.c

+1 −2
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ static void nilfs_commit_chunk(struct page *page, 
			       unsigned from, unsigned to)

{

	struct inode *dir = mapping->host;

	struct nilfs_sb_info *sbi = NILFS_SB(dir->i_sb);

	loff_t pos = page_offset(page) + from;

	unsigned len = to - from;

	unsigned nr_dirty, copied;
@@ -103,7 +102,7 @@ static void nilfs_commit_chunk(struct page *page, 
		i_size_write(dir, pos + copied);

	if (IS_DIRSYNC(dir))

		nilfs_set_transaction_flag(NILFS_TI_SYNC);

	err = nilfs_set_file_dirty(sbi, dir, nr_dirty);

	err = nilfs_set_file_dirty(dir, nr_dirty);

	WARN_ON(err); /* do not happen */

	unlock_page(page);

}

fs/nilfs2/inode.c

+8 −10
Original line number Diff line number Diff line
@@ -181,10 +181,9 @@ static int nilfs_set_page_dirty(struct page *page) 


	if (ret) {

		struct inode *inode = page->mapping->host;

		struct nilfs_sb_info *sbi = NILFS_SB(inode->i_sb);

		unsigned nr_dirty = 1 << (PAGE_SHIFT - inode->i_blkbits);



		nilfs_set_file_dirty(sbi, inode, nr_dirty);

		nilfs_set_file_dirty(inode, nr_dirty);

	}

	return ret;

}
@@ -225,7 +224,7 @@ static int nilfs_write_end(struct file *file, struct address_space *mapping, 
						  start + copied);

	copied = generic_write_end(file, mapping, pos, len, copied, page,

				   fsdata);

	nilfs_set_file_dirty(NILFS_SB(inode->i_sb), inode, nr_dirty);

	nilfs_set_file_dirty(inode, nr_dirty);

	err = nilfs_transaction_commit(inode->i_sb);

	return err ? : copied;

}
@@ -674,7 +673,7 @@ void nilfs_truncate(struct inode *inode) 
		nilfs_set_transaction_flag(NILFS_TI_SYNC);



	nilfs_mark_inode_dirty(inode);

	nilfs_set_file_dirty(NILFS_SB(sb), inode, 0);

	nilfs_set_file_dirty(inode, 0);

	nilfs_transaction_commit(sb);

	/* May construct a logical segment and may fail in sync mode.

	   But truncate has no return value. */
@@ -792,9 +791,9 @@ int nilfs_permission(struct inode *inode, int mask, unsigned int flags) 
	return generic_permission(inode, mask, flags, NULL);

}



int nilfs_load_inode_block(struct nilfs_sb_info *sbi, struct inode *inode,

			   struct buffer_head **pbh)

int nilfs_load_inode_block(struct inode *inode, struct buffer_head **pbh)

{

	struct nilfs_sb_info *sbi = NILFS_SB(inode->i_sb);

	struct nilfs_inode_info *ii = NILFS_I(inode);

	int err;
@@ -835,9 +834,9 @@ int nilfs_inode_dirty(struct inode *inode) 
	return ret;

}



int nilfs_set_file_dirty(struct nilfs_sb_info *sbi, struct inode *inode,

			 unsigned nr_dirty)

int nilfs_set_file_dirty(struct inode *inode, unsigned nr_dirty)

{

	struct nilfs_sb_info *sbi = NILFS_SB(inode->i_sb);

	struct nilfs_inode_info *ii = NILFS_I(inode);



	atomic_add(nr_dirty, &sbi->s_nilfs->ns_ndirtyblks);
@@ -870,11 +869,10 @@ int nilfs_set_file_dirty(struct nilfs_sb_info *sbi, struct inode *inode, 


int nilfs_mark_inode_dirty(struct inode *inode)

{

	struct nilfs_sb_info *sbi = NILFS_SB(inode->i_sb);

	struct buffer_head *ibh;

	int err;



	err = nilfs_load_inode_block(sbi, inode, &ibh);

	err = nilfs_load_inode_block(inode, &ibh);

	if (unlikely(err)) {

		nilfs_warning(inode->i_sb, __func__,

			      "failed to reget inode block.\n");

fs/nilfs2/nilfs.h

+2 −4
Original line number Diff line number Diff line
@@ -257,11 +257,9 @@ extern void nilfs_truncate(struct inode *); 
extern void nilfs_evict_inode(struct inode *);

extern int nilfs_setattr(struct dentry *, struct iattr *);

int nilfs_permission(struct inode *inode, int mask, unsigned int flags);

extern int nilfs_load_inode_block(struct nilfs_sb_info *, struct inode *,

				  struct buffer_head **);

int nilfs_load_inode_block(struct inode *inode, struct buffer_head **pbh);

extern int nilfs_inode_dirty(struct inode *);

extern int nilfs_set_file_dirty(struct nilfs_sb_info *, struct inode *,

				unsigned);

int nilfs_set_file_dirty(struct inode *inode, unsigned nr_dirty);

extern int nilfs_mark_inode_dirty(struct inode *);

extern void nilfs_dirty_inode(struct inode *);

int nilfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,

fs/nilfs2/recovery.c

+1 −1
Original line number Diff line number Diff line
@@ -535,7 +535,7 @@ static int nilfs_recover_dsync_blocks(struct the_nilfs *nilfs, 
		if (unlikely(err))

			goto failed_page;



		err = nilfs_set_file_dirty(sbi, inode, 1);

		err = nilfs_set_file_dirty(inode, 1);

		if (unlikely(err))

			goto failed_page;