2 files changed, 13 insertions, 5 deletions

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 598bfa617a7e..45abd60e2bff 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -942,13 +942,19 @@ inline_data:
         if (dn.data_blkaddr == NEW_ADDR) {
                 zero_user_segment(page, 0, PAGE_CACHE_SIZE);
         } else {
-                if (f2fs_has_inline_data(inode))
+                if (f2fs_has_inline_data(inode)) {
                         err = f2fs_read_inline_data(inode, page);
-                else
+                        if (err) {
+                                page_cache_release(page);
+                                return err;
+                        }
+                } else {
                         err = f2fs_submit_page_bio(sbi, page, dn.data_blkaddr,
                                                         READ_SYNC);
-                if (err)
-                        return err;
+                        if (err)
+                                return err;
+                }
+
                 lock_page(page);
                 if (unlikely(!PageUptodate(page))) {
                         f2fs_put_page(page, 1);
diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index 31ee5b164ff9..383db1fabcf4 100644
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -45,8 +45,10 @@ int f2fs_read_inline_data(struct inode *inode, struct page *page)
         }
 
         ipage = get_node_page(sbi, inode->i_ino);
-        if (IS_ERR(ipage))
+        if (IS_ERR(ipage)) {
+                unlock_page(page);
                 return PTR_ERR(ipage);
+        }
 
         zero_user_segment(page, MAX_INLINE_DATA, PAGE_CACHE_SIZE);