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

Commit c4f1b62a authored by Fred Isaman's avatar Fred Isaman Committed by Trond Myklebust
Browse files

NFS: ncommit count is being double decremented 



The decrement is handled by each call to nfs_request_remove_commit_list,
no need to do it again in nfs_scan_commit.

Signed-off-by: default avatarFred Isaman <iisaman@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 540a0f75

fs/nfs/write.c

+1 −4
Original line number Diff line number Diff line
@@ -595,12 +595,9 @@ nfs_scan_commit(struct inode *inode, struct list_head *dst) 
	spin_lock(&inode->i_lock);

	if (nfsi->ncommit > 0) {

		const int max = INT_MAX;

		int pnfs_ret;



		ret = nfs_scan_commit_list(&nfsi->commit_list, dst, max);

		pnfs_ret = pnfs_scan_commit_lists(inode, max - ret);

		ret += pnfs_ret;

		nfsi->ncommit -= ret;

		ret += pnfs_scan_commit_lists(inode, max - ret);

	}

	spin_unlock(&inode->i_lock);

	return ret;