f2fs: retry ENOMEM for quota_read|write
authorJaegeuk Kim <jaegeuk@kernel.org>
Thu, 19 Oct 2017 16:43:56 +0000 (09:43 -0700)
committerJaegeuk Kim <jaegeuk@kernel.org>
Thu, 26 Oct 2017 08:44:22 +0000 (10:44 +0200)
This gives another chance to read or write quota data.

Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/super.c

index 21e524e..c32a1e1 100644 (file)
@@ -1321,8 +1321,13 @@ static ssize_t f2fs_quota_read(struct super_block *sb, int type, char *data,
                tocopy = min_t(unsigned long, sb->s_blocksize - offset, toread);
 repeat:
                page = read_mapping_page(mapping, blkidx, NULL);
-               if (IS_ERR(page))
+               if (IS_ERR(page)) {
+                       if (PTR_ERR(page) == -ENOMEM) {
+                               congestion_wait(BLK_RW_ASYNC, HZ/50);
+                               goto repeat;
+                       }
                        return PTR_ERR(page);
+               }
 
                lock_page(page);
 
@@ -1365,11 +1370,16 @@ static ssize_t f2fs_quota_write(struct super_block *sb, int type,
        while (towrite > 0) {
                tocopy = min_t(unsigned long, sb->s_blocksize - offset,
                                                                towrite);
-
+retry:
                err = a_ops->write_begin(NULL, mapping, off, tocopy, 0,
                                                        &page, NULL);
-               if (unlikely(err))
+               if (unlikely(err)) {
+                       if (err == -ENOMEM) {
+                               congestion_wait(BLK_RW_ASYNC, HZ/50);
+                               goto retry;
+                       }
                        break;
+               }
 
                kaddr = kmap_atomic(page);
                memcpy(kaddr + offset, data, tocopy);