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

NFS: Use the correct commit info in nfs_join_page_group() 



Ensure that nfs_clear_request_commit() updates the correct counters when
it removes them from the commit list.

Fixes: ed5d588f ("NFS: Try to join page groups before an O_DIRECT retransmission")
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 8982f7af

fs/nfs/direct.c

+5 −3
Original line number Diff line number Diff line
@@ -498,7 +498,9 @@ static void nfs_direct_add_page_head(struct list_head *list, 
	kref_get(&head->wb_kref);

}



static void nfs_direct_join_group(struct list_head *list, struct inode *inode)

static void nfs_direct_join_group(struct list_head *list,

				  struct nfs_commit_info *cinfo,

				  struct inode *inode)

{

	struct nfs_page *req, *subreq;
@@ -520,7 +522,7 @@ static void nfs_direct_join_group(struct list_head *list, struct inode *inode) 
				nfs_release_request(subreq);

			}

		} while ((subreq = subreq->wb_this_page) != req);

		nfs_join_page_group(req, inode);

		nfs_join_page_group(req, cinfo, inode);

	}

}
@@ -545,7 +547,7 @@ static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq) 
	nfs_init_cinfo_from_dreq(&cinfo, dreq);

	nfs_direct_write_scan_commit_list(dreq->inode, &reqs, &cinfo);



	nfs_direct_join_group(&reqs, dreq->inode);

	nfs_direct_join_group(&reqs, &cinfo, dreq->inode);



	nfs_clear_pnfs_ds_commit_verifiers(&dreq->ds_cinfo);

	get_dreq(dreq);

fs/nfs/write.c

+12 −11
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@ static const struct nfs_pgio_completion_ops nfs_async_write_completion_ops; 
static const struct nfs_commit_completion_ops nfs_commit_completion_ops;

static const struct nfs_rw_ops nfs_rw_write_ops;

static void nfs_inode_remove_request(struct nfs_page *req);

static void nfs_clear_request_commit(struct nfs_page *req);

static void nfs_clear_request_commit(struct nfs_commit_info *cinfo,

				     struct nfs_page *req);

static void nfs_init_cinfo_from_inode(struct nfs_commit_info *cinfo,

				      struct inode *inode);

static struct nfs_page *
@@ -502,8 +503,8 @@ nfs_destroy_unlinked_subrequests(struct nfs_page *destroy_list, 
 * the (former) group.  All subrequests are removed from any write or commit

 * lists, unlinked from the group and destroyed.

 */

void

nfs_join_page_group(struct nfs_page *head, struct inode *inode)

void nfs_join_page_group(struct nfs_page *head, struct nfs_commit_info *cinfo,

			 struct inode *inode)

{

	struct nfs_page *subreq;

	struct nfs_page *destroy_list = NULL;
@@ -533,7 +534,7 @@ nfs_join_page_group(struct nfs_page *head, struct inode *inode) 
	 * Commit list removal accounting is done after locks are dropped */

	subreq = head;

	do {

		nfs_clear_request_commit(subreq);

		nfs_clear_request_commit(cinfo, subreq);

		subreq = subreq->wb_this_page;

	} while (subreq != head);
@@ -566,8 +567,10 @@ static struct nfs_page *nfs_lock_and_join_requests(struct folio *folio) 
{

	struct inode *inode = folio_file_mapping(folio)->host;

	struct nfs_page *head;

	struct nfs_commit_info cinfo;

	int ret;



	nfs_init_cinfo_from_inode(&cinfo, inode);

	/*

	 * A reference is taken only on the head request which acts as a

	 * reference to the whole page group - the group will not be destroyed
@@ -584,7 +587,7 @@ static struct nfs_page *nfs_lock_and_join_requests(struct folio *folio) 
		return ERR_PTR(ret);

	}



	nfs_join_page_group(head, inode);

	nfs_join_page_group(head, &cinfo, inode);



	return head;

}
@@ -955,18 +958,16 @@ static void nfs_folio_clear_commit(struct folio *folio) 
}



/* Called holding the request lock on @req */

static void

nfs_clear_request_commit(struct nfs_page *req)

static void nfs_clear_request_commit(struct nfs_commit_info *cinfo,

				     struct nfs_page *req)

{

	if (test_bit(PG_CLEAN, &req->wb_flags)) {

		struct nfs_open_context *ctx = nfs_req_openctx(req);

		struct inode *inode = d_inode(ctx->dentry);

		struct nfs_commit_info cinfo;



		nfs_init_cinfo_from_inode(&cinfo, inode);

		mutex_lock(&NFS_I(inode)->commit_mutex);

		if (!pnfs_clear_request_commit(req, &cinfo)) {

			nfs_request_remove_commit_list(req, &cinfo);

		if (!pnfs_clear_request_commit(req, cinfo)) {

			nfs_request_remove_commit_list(req, cinfo);

		}

		mutex_unlock(&NFS_I(inode)->commit_mutex);

		nfs_folio_clear_commit(nfs_page_to_folio(req));

include/linux/nfs_page.h

+3 −1
Original line number Diff line number Diff line
@@ -157,7 +157,9 @@ extern void nfs_unlock_request(struct nfs_page *req); 
extern	void nfs_unlock_and_release_request(struct nfs_page *);

extern	struct nfs_page *nfs_page_group_lock_head(struct nfs_page *req);

extern	int nfs_page_group_lock_subrequests(struct nfs_page *head);

extern	void nfs_join_page_group(struct nfs_page *head, struct inode *inode);

extern void nfs_join_page_group(struct nfs_page *head,

				struct nfs_commit_info *cinfo,

				struct inode *inode);

extern int nfs_page_group_lock(struct nfs_page *);

extern void nfs_page_group_unlock(struct nfs_page *);

extern bool nfs_page_group_sync_on_bit(struct nfs_page *, unsigned int);