1 files changed, 2 insertions, 15 deletions

diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 767e46c09074..010733c8bdcd 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -1037,25 +1037,11 @@ nfs_scan_commit_list(struct list_head *src, struct list_head *dst,
         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;
+                        continue;
                 }
                 nfs_request_remove_commit_list(req, cinfo);
                 clear_bit(PG_COMMIT_TO_DS, &req->wb_flags);
@@ -1904,6 +1890,7 @@ static int __nfs_commit_inode(struct inode *inode, int how,
         int may_wait = how & FLUSH_SYNC;
         int ret, nscan;
 
+        how &= ~FLUSH_SYNC;
         nfs_init_cinfo_from_inode(&cinfo, inode);
         nfs_commit_begin(cinfo.mds);
         for (;;) {