xfs: run an eofblocks scan on ENOSPC/EDQUOT

[firefly-linux-kernel-4.4.55.git] / fs / xfs / xfs_file.c

diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index 181605da08e4b84b1b11b25c76efb1e61271f1b2..fcf91a22f5d861b25f6d4f060ecfeb4899d7077a 100644 (file)
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -38,6 +38,7 @@
 #include "xfs_trace.h"
 #include "xfs_log.h"
 #include "xfs_dinode.h"
+#include "xfs_icache.h"
 
 #include <linux/aio.h>
 #include <linux/dcache.h>
@@ -689,14 +690,28 @@ write_retry:
        ret = generic_perform_write(file, from, pos);
        if (likely(ret >= 0))
                iocb->ki_pos = pos + ret;
+
        /*
-        * If we just got an ENOSPC, try to write back all dirty inodes to
-        * convert delalloc space to free up some of the excess reserved
-        * metadata space.
+        * If we hit a space limit, try to free up some lingering preallocated
+        * space before returning an error. In the case of ENOSPC, first try to
+        * write back all dirty inodes to free up some of the excess reserved
+        * metadata space. This reduces the chances that the eofblocks scan
+        * waits on dirty mappings. Since xfs_flush_inodes() is serialized, this
+        * also behaves as a filter to prevent too many eofblocks scans from
+        * running at the same time.
         */
-       if (ret == -ENOSPC && !enospc) {
+       if (ret == -EDQUOT && !enospc) {
+               enospc = xfs_inode_free_quota_eofblocks(ip);
+               if (enospc)
+                       goto write_retry;
+       } else if (ret == -ENOSPC && !enospc) {
+               struct xfs_eofblocks eofb = {0};
+
                enospc = 1;
                xfs_flush_inodes(ip->i_mount);
+               eofb.eof_scan_owner = ip->i_ino; /* for locking */
+               eofb.eof_flags = XFS_EOF_FLAGS_SYNC;
+               xfs_icache_free_eofblocks(ip->i_mount, &eofb);
                goto write_retry;
        }