Commit 5d2a9d9d authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Remove pnfs_generic_transfer_commit_list() 



It's pretty much a duplicate of nfs_scan_commit_list() that also
clears the PG_COMMIT_TO_DS flag.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 137da553

fs/nfs/pnfs_nfs.c

+2 −41
Original line number Diff line number Diff line
@@ -87,44 +87,6 @@ pnfs_generic_clear_request_commit(struct nfs_page *req, 
}

EXPORT_SYMBOL_GPL(pnfs_generic_clear_request_commit);



static int

pnfs_generic_transfer_commit_list(struct list_head *src, struct list_head *dst,

				  struct nfs_commit_info *cinfo, int max)

{

	struct nfs_page *req, *tmp;

	int ret = 0;



restart:

	list_for_each_entry_safe(req, tmp, src, wb_list) {

		kref_get(&req->wb_kref);

		if (!nfs_lock_request(req)) {

			int status;



			/* Prevent deadlock with nfs_lock_and_join_requests */

			if (!list_empty(dst)) {

				nfs_release_request(req);

				continue;

			}

			/* Ensure we make progress to prevent livelock */

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

			status = nfs_wait_on_request(req);

			nfs_release_request(req);

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

			if (status < 0)

				break;

			goto restart;

		}

		nfs_request_remove_commit_list(req, cinfo);

		clear_bit(PG_COMMIT_TO_DS, &req->wb_flags);

		nfs_list_add_request(req, dst);

		ret++;

		if ((ret == max) && !cinfo->dreq)

			break;

		cond_resched();

	}

	return ret;

}



static int

pnfs_generic_scan_ds_commit_list(struct pnfs_commit_bucket *bucket,

				 struct nfs_commit_info *cinfo,
@@ -135,7 +97,7 @@ pnfs_generic_scan_ds_commit_list(struct pnfs_commit_bucket *bucket, 
	int ret;



	lockdep_assert_held(&NFS_I(cinfo->inode)->commit_mutex);

	ret = pnfs_generic_transfer_commit_list(src, dst, cinfo, max);

	ret = nfs_scan_commit_list(src, dst, cinfo, max);

	if (ret) {

		cinfo->ds->nwritten -= ret;

		cinfo->ds->ncommitting += ret;
@@ -180,8 +142,7 @@ void pnfs_generic_recover_commit_reqs(struct list_head *dst, 
	lockdep_assert_held(&NFS_I(cinfo->inode)->commit_mutex);

restart:

	for (i = 0, b = cinfo->ds->buckets; i < cinfo->ds->nbuckets; i++, b++) {

		nwritten = pnfs_generic_transfer_commit_list(&b->written,

				dst, cinfo, 0);

		nwritten = nfs_scan_commit_list(&b->written, dst, cinfo, 0);

		if (!nwritten)

			continue;

		cinfo->ds->nwritten -= nwritten;

fs/nfs/write.c

+2 −0
Original line number Diff line number Diff line
@@ -1052,6 +1052,7 @@ nfs_scan_commit_list(struct list_head *src, struct list_head *dst, 
			goto restart;

		}

		nfs_request_remove_commit_list(req, cinfo);

		clear_bit(PG_COMMIT_TO_DS, &req->wb_flags);

		nfs_list_add_request(req, dst);

		ret++;

		if ((ret == max) && !cinfo->dreq)
@@ -1060,6 +1061,7 @@ nfs_scan_commit_list(struct list_head *src, struct list_head *dst, 
	}

	return ret;

}

EXPORT_SYMBOL_GPL(nfs_scan_commit_list);



/*

 * nfs_scan_commit - Scan an inode for commit requests