Merge tag 'v3.10.93' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / mm / filemap.c

diff --git a/mm/filemap.c b/mm/filemap.c
index c622424ff4d7f7102894d079fedc4483ec79951a..9d9b705ac0e7ea5d8d3f186e4e01b07f5d88502a 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2344,6 +2344,11 @@ again:
                        break;
                }
 
+               if (fatal_signal_pending(current)) {
+                       status = -EINTR;
+                       break;
+               }
+
                status = a_ops->write_begin(file, mapping, pos, bytes, flags,
                                                &page, &fsdata);
                if (unlikely(status))
@@ -2384,10 +2389,6 @@ again:
                written += copied;
 
                balance_dirty_pages_ratelimited(mapping);
-               if (fatal_signal_pending(current)) {
-                       status = -EINTR;
-                       break;
-               }
        } while (iov_iter_count(i));
 
        return written ? written : status;