1 files changed, 5 insertions, 2 deletions

diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c
index 56e33590b656..b3b7e8475359 100644
--- a/fs/gfs2/ops_address.c
+++ b/fs/gfs2/ops_address.c
@@ -266,9 +266,11 @@ skip_lock:
 out:
         return error;
 out_unlock:
-        if (error == GLR_TRYFAILED)
-                error = AOP_TRUNCATED_PAGE;
         unlock_page(page);
+        if (error == GLR_TRYFAILED) {
+                error = AOP_TRUNCATED_PAGE;
+                yield();
+        }
         if (do_unlock)
                 gfs2_holder_uninit(&gh);
         goto out;
@@ -364,6 +366,7 @@ static int gfs2_prepare_write(struct file *file, struct page *page,
                 if (error == GLR_TRYFAILED) {
                         unlock_page(page);
                         error = AOP_TRUNCATED_PAGE;
+                        yield();
                 }
                 goto out_uninit;
         }