From: Chao Yu Date: Tue, 8 Aug 2017 11:09:08 +0000 (+0800) Subject: f2fs: retry to revoke atomic commit in -ENOMEM case X-Git-Tag: v4.14-rc1~46^2~30 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7f2b4e8ea5b49846f7d20f1694dbca81f88b8d50;p=thirdparty%2Flinux.git f2fs: retry to revoke atomic commit in -ENOMEM case During atomic committing, if we encounter -ENOMEM in revoke path, it's better to give a chance to retry revoking. Signed-off-by: Chao Yu Signed-off-by: Jaegeuk Kim --- diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 95267630c8c46..05144b3a7f622 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -213,9 +213,15 @@ static int __revoke_inmem_pages(struct inode *inode, struct node_info ni; trace_f2fs_commit_inmem_page(page, INMEM_REVOKE); - +retry: set_new_dnode(&dn, inode, NULL, NULL, 0); - if (get_dnode_of_data(&dn, page->index, LOOKUP_NODE)) { + err = get_dnode_of_data(&dn, page->index, LOOKUP_NODE); + if (err) { + if (err == -ENOMEM) { + congestion_wait(BLK_RW_ASYNC, HZ/50); + cond_resched(); + goto retry; + } err = -EAGAIN; goto next; }