Commit ed90ef51 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Clean up NFS writeback flush code 



The only user of nfs_sync_mapping_range() is nfs_getattr(), which uses it
to flush out the entire inode without sending a commit. We therefore
replace nfs_sync_mapping_range with a more appropriate helper.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 90e9a3f9

fs/nfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ int nfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat) 


	/* Flush out writes to the server in order to update c/mtime */

	if (S_ISREG(inode->i_mode))

		nfs_sync_mapping_range(inode->i_mapping, 0, 0, FLUSH_NOCOMMIT);

		nfs_wb_nocommit(inode);



	/*

	 * We may force a getattr if the user cares about atime.

fs/nfs/write.c

+14 −27
Original line number Diff line number Diff line
@@ -1325,12 +1325,8 @@ long nfs_sync_mapping_wait(struct address_space *mapping, struct writeback_contr 
	return ret;

}



/*

 * flush the inode to disk.

 */

int nfs_wb_all(struct inode *inode)

static int nfs_write_mapping(struct address_space *mapping, int how)

{

	struct address_space *mapping = inode->i_mapping;

	struct writeback_control wbc = {

		.bdi = mapping->backing_dev_info,

		.sync_mode = WB_SYNC_ALL,
@@ -1343,35 +1339,26 @@ int nfs_wb_all(struct inode *inode) 
	ret = nfs_writepages(mapping, &wbc);

	if (ret < 0)

		goto out;

	ret = nfs_sync_mapping_wait(mapping, &wbc, 0);

	if (ret >= 0)

	ret = nfs_sync_mapping_wait(mapping, &wbc, how);

	if (ret < 0)

		goto out;

	return 0;

out:

	__mark_inode_dirty(mapping->host, I_DIRTY_PAGES);

	return ret;

}



int nfs_sync_mapping_range(struct address_space *mapping, loff_t range_start, loff_t range_end, int how)

/*

 * flush the inode to disk.

 */

int nfs_wb_all(struct inode *inode)

{

	struct writeback_control wbc = {

		.bdi = mapping->backing_dev_info,

		.sync_mode = WB_SYNC_ALL,

		.nr_to_write = LONG_MAX,

		.range_start = range_start,

		.range_end = range_end,

		.for_writepages = 1,

	};

	int ret;

	return nfs_write_mapping(inode->i_mapping, 0);

}



	ret = nfs_writepages(mapping, &wbc);

	if (ret < 0)

		goto out;

	ret = nfs_sync_mapping_wait(mapping, &wbc, how);

	if (ret >= 0)

		return 0;

out:

	__mark_inode_dirty(mapping->host, I_DIRTY_PAGES);

	return ret;

int nfs_wb_nocommit(struct inode *inode)

{

	return nfs_write_mapping(inode->i_mapping, FLUSH_NOCOMMIT);

}



int nfs_wb_page_cancel(struct inode *inode, struct page *page)

include/linux/nfs_fs.h

+1 −1
Original line number Diff line number Diff line
@@ -426,8 +426,8 @@ extern void nfs_writedata_release(void *); 
 * return value!)

 */

extern long nfs_sync_mapping_wait(struct address_space *, struct writeback_control *, int);

extern int nfs_sync_mapping_range(struct address_space *, loff_t, loff_t, int);

extern int nfs_wb_all(struct inode *inode);

extern int nfs_wb_nocommit(struct inode *inode);

extern int nfs_wb_page(struct inode *inode, struct page* page);

extern int nfs_wb_page_priority(struct inode *inode, struct page* page, int how);

extern int nfs_wb_page_cancel(struct inode *inode, struct page* page);

CRA Git | Maintained and supported by SUSTech CRA and CCSE