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

Commit d15bc38d authored by Tom Haynes's avatar Tom Haynes Committed by Trond Myklebust
Browse files

nfs: Provide and use helper functions for marking a page as unstable 



Signed-off-by: default avatarTom Haynes <loghyr@primarydata.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 6bec0035

fs/nfs/filelayout/filelayout.c

+2 −7
Original line number Diff line number Diff line
@@ -1000,13 +1000,8 @@ filelayout_mark_request_commit(struct nfs_page *req, 
	nfs_list_add_request(req, list);

	cinfo->mds->ncommit++;

	spin_unlock(cinfo->lock);

	if (!cinfo->dreq) {

		inc_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);

		inc_bdi_stat(inode_to_bdi(page_file_mapping(req->wb_page)->host),

			     BDI_RECLAIMABLE);

		__mark_inode_dirty(req->wb_context->dentry->d_inode,

				   I_DIRTY_DATASYNC);

	}

	if (!cinfo->dreq)

		nfs_mark_page_unstable(req->wb_page);

}



static u32 calc_ds_index_from_commit(struct pnfs_layout_segment *lseg, u32 i)

fs/nfs/flexfilelayout/flexfilelayout.c

+2 −7
Original line number Diff line number Diff line
@@ -1364,13 +1364,8 @@ ff_layout_mark_request_commit(struct nfs_page *req, 
	nfs_list_add_request(req, list);

	cinfo->mds->ncommit++;

	spin_unlock(cinfo->lock);

	if (!cinfo->dreq) {

		inc_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);

		inc_bdi_stat(inode_to_bdi(page_file_mapping(req->wb_page)->host),

			     BDI_RECLAIMABLE);

		__mark_inode_dirty(req->wb_context->dentry->d_inode,

				   I_DIRTY_DATASYNC);

	}

	if (!cinfo->dreq)

		nfs_mark_page_unstable(req->wb_page);

}



static u32 calc_ds_index_from_commit(struct pnfs_layout_segment *lseg, u32 i)

fs/nfs/internal.h

+13 −0
Original line number Diff line number Diff line
@@ -597,6 +597,19 @@ void nfs_super_set_maxbytes(struct super_block *sb, __u64 maxfilesize) 
		sb->s_maxbytes = MAX_LFS_FILESIZE;

}



/*

 * Record the page as unstable and mark its inode as dirty.

 */

static inline

void nfs_mark_page_unstable(struct page *page)

{

	struct inode *inode = page_file_mapping(page)->host;



	inc_zone_page_state(page, NR_UNSTABLE_NFS);

	inc_bdi_stat(inode_to_bdi(inode), BDI_RECLAIMABLE);

	 __mark_inode_dirty(inode, I_DIRTY_DATASYNC);

}



/*

 * Determine the number of bytes of data the page contains

 */

fs/nfs/write.c

+2 −7
Original line number Diff line number Diff line
@@ -789,13 +789,8 @@ nfs_request_add_commit_list(struct nfs_page *req, struct list_head *dst, 
	nfs_list_add_request(req, dst);

	cinfo->mds->ncommit++;

	spin_unlock(cinfo->lock);

	if (!cinfo->dreq) {

		inc_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);

		inc_bdi_stat(inode_to_bdi(page_file_mapping(req->wb_page)->host),

			     BDI_RECLAIMABLE);

		__mark_inode_dirty(req->wb_context->dentry->d_inode,

				   I_DIRTY_DATASYNC);

	}

	if (!cinfo->dreq)

		nfs_mark_page_unstable(req->wb_page);

}

EXPORT_SYMBOL_GPL(nfs_request_add_commit_list);