1 files changed, 3 insertions, 0 deletions

diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c
index 6073f9f88416..1f546b4b6b61 100644
--- a/fs/f2fs/xattr.c
+++ b/fs/f2fs/xattr.c
@@ -349,6 +349,7 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize,
 
                 if (ipage) {
                         inline_addr = inline_xattr_addr(ipage);
+                        f2fs_wait_on_page_writeback(ipage, NODE);
                 } else {
                         page = get_node_page(sbi, inode->i_ino);
                         if (IS_ERR(page)) {
@@ -356,6 +357,7 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize,
                                 return PTR_ERR(page);
                         }
                         inline_addr = inline_xattr_addr(page);
+                        f2fs_wait_on_page_writeback(page, NODE);
                 }
                 memcpy(inline_addr, txattr_addr, inline_size);
                 f2fs_put_page(page, 1);
@@ -376,6 +378,7 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize,
                         return PTR_ERR(xpage);
                 }
                 f2fs_bug_on(new_nid);
+                f2fs_wait_on_page_writeback(xpage, NODE);
         } else {
                 struct dnode_of_data dn;
                 set_new_dnode(&dn, inode, NULL, NULL, new_nid);