1 files changed, 11 insertions, 1 deletions

diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index e056f617adf2..175d5d073ccf 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -478,13 +478,23 @@ try_again:
                 return NULL;
         }
 
-        /* lock each request in the page group */
+        /* holding inode lock, so always make a non-blocking call to try the
+         * page group lock */
         ret = nfs_page_group_lock(head, true);
         if (ret < 0) {
                 spin_unlock(&inode->i_lock);
+
+                if (!nonblock && ret == -EAGAIN) {
+                        nfs_page_group_lock_wait(head);
+                        nfs_release_request(head);
+                        goto try_again;
+                }
+
                 nfs_release_request(head);
                 return ERR_PTR(ret);
         }
+
+        /* lock each request in the page group */
         subreq = head;
         do {
                 /*