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

Commit 6272dcc6 authored by Anna Schumaker's avatar Anna Schumaker Committed by Trond Myklebust
Browse files

NFS: Simplify nfs_request_add_commit_list() arguments 



I noticed that all the callers of this function pass cinfo->mds->list as
an argument in addition to the cinfo structure itself.  Let's get rid of
the extra argument, since it doesn't seem to be adding anything.

Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 44aab3e0

fs/nfs/filelayout/filelayout.c

+1 −1
Original line number Diff line number Diff line
@@ -971,7 +971,7 @@ filelayout_mark_request_commit(struct nfs_page *req, 
	u32 i, j;



	if (fl->commit_through_mds) {

		nfs_request_add_commit_list(req, &cinfo->mds->list, cinfo);

		nfs_request_add_commit_list(req, cinfo);

	} else {

		/* Note that we are calling nfs4_fl_calc_j_index on each page

		 * that ends up being committed to a data server.  An attractive

fs/nfs/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -484,7 +484,7 @@ void nfs_retry_commit(struct list_head *page_list, 
		      struct nfs_commit_info *cinfo,

		      u32 ds_commit_idx);

void nfs_commitdata_release(struct nfs_commit_data *data);

void nfs_request_add_commit_list(struct nfs_page *req, struct list_head *dst,

void nfs_request_add_commit_list(struct nfs_page *req,

				 struct nfs_commit_info *cinfo);

void nfs_request_add_commit_list_locked(struct nfs_page *req,

		struct list_head *dst,

fs/nfs/write.c

+3 −4
Original line number Diff line number Diff line
@@ -830,11 +830,10 @@ EXPORT_SYMBOL_GPL(nfs_request_add_commit_list_locked); 
 * holding the nfs_page lock.

 */

void

nfs_request_add_commit_list(struct nfs_page *req, struct list_head *dst,

			    struct nfs_commit_info *cinfo)

nfs_request_add_commit_list(struct nfs_page *req, struct nfs_commit_info *cinfo)

{

	spin_lock(cinfo->lock);

	nfs_request_add_commit_list_locked(req, dst, cinfo);

	nfs_request_add_commit_list_locked(req, &cinfo->mds->list, cinfo);

	spin_unlock(cinfo->lock);

	nfs_mark_page_unstable(req->wb_page, cinfo);

}
@@ -892,7 +891,7 @@ nfs_mark_request_commit(struct nfs_page *req, struct pnfs_layout_segment *lseg, 
{

	if (pnfs_mark_request_commit(req, lseg, cinfo, ds_commit_idx))

		return;

	nfs_request_add_commit_list(req, &cinfo->mds->list, cinfo);

	nfs_request_add_commit_list(req, cinfo);

}



static void