summaryrefslogtreecommitdiffstats
path: root/fs/nfs/write.c
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2017-09-09 18:40:38 +0200
committerTrond Myklebust <trond.myklebust@primarydata.com>2017-09-09 18:51:40 +0200
commit5d2a9d9dac902f438daa1334540398aec6c8dcfa (patch)
tree6cfb977feec2645f5eb7a24c8e6cc03a1a9babe1 /fs/nfs/write.c
parentNFS: nfs_lock_and_join_requests and nfs_scan_commit_list can deadlock (diff)
downloadlinux-5d2a9d9dac902f438daa1334540398aec6c8dcfa.tar.xz
linux-5d2a9d9dac902f438daa1334540398aec6c8dcfa.zip
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: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/write.c')
-rw-r--r--fs/nfs/write.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index c3f627b08ec6..121218d4e5ed 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -1052,6 +1052,7 @@ restart:
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 @@ restart:
}
return ret;
}
+EXPORT_SYMBOL_GPL(nfs_scan_commit_list);
/*
* nfs_scan_commit - Scan an inode for commit requests