Merge branch develop-3.10 into develop-3.10-next

[firefly-linux-kernel-4.4.55.git] / fs / f2fs / data.c

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 91ff93b0b0f403300f951f0d26fa2698ac535c9a..c20ac9c1fb138d4e7cf47aee58d474255c52d358 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -274,9 +274,10 @@ repeat:
  *
  * Also, caller should grab and release a mutex by calling mutex_lock_op() and
  * mutex_unlock_op().
+ * Note that, npage is set only by make_empty_dir.
  */
-struct page *get_new_data_page(struct inode *inode, pgoff_t index,
-                                               bool new_i_size)
+struct page *get_new_data_page(struct inode *inode,
+               struct page *npage, pgoff_t index, bool new_i_size)
 {
        struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
        struct address_space *mapping = inode->i_mapping;
@@ -284,18 +285,20 @@ struct page *get_new_data_page(struct inode *inode, pgoff_t index,
        struct dnode_of_data dn;
        int err;
 
-       set_new_dnode(&dn, inode, NULL, NULL, 0);
+       set_new_dnode(&dn, inode, npage, npage, 0);
        err = get_dnode_of_data(&dn, index, ALLOC_NODE);
        if (err)
                return ERR_PTR(err);
 
        if (dn.data_blkaddr == NULL_ADDR) {
                if (reserve_new_block(&dn)) {
-                       f2fs_put_dnode(&dn);
+                       if (!npage)
+                               f2fs_put_dnode(&dn);
                        return ERR_PTR(-ENOSPC);
                }
        }
-       f2fs_put_dnode(&dn);
+       if (!npage)
+               f2fs_put_dnode(&dn);
 repeat:
        page = grab_cache_page(mapping, index);
        if (!page)