Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[karo-tx-linux.git] / fs / f2fs / data.c

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index ea3cb29018e95b6749ba4615cd78bc5b64ecbeb3..941f9b9ca3a5b41fa9208f1d929b20212e08dfcb 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -117,7 +117,8 @@ void update_extent_cache(block_t blk_addr, struct dnode_of_data *dn)
        block_t start_blkaddr, end_blkaddr;
 
        BUG_ON(blk_addr == NEW_ADDR);
-       fofs = start_bidx_of_node(ofs_of_node(dn->node_page)) + dn->ofs_in_node;
+       fofs = start_bidx_of_node(ofs_of_node(dn->node_page), fi) +
+                                                       dn->ofs_in_node;
 
        /* Update the page address in the parent node */
        __set_data_blkaddr(dn, blk_addr);
@@ -259,8 +260,17 @@ repeat:
        if (PageUptodate(page))
                return page;
 
-       BUG_ON(dn.data_blkaddr == NEW_ADDR);
-       BUG_ON(dn.data_blkaddr == NULL_ADDR);
+       /*
+        * A new dentry page is allocated but not able to be written, since its
+        * new inode page couldn't be allocated due to -ENOSPC.
+        * In such the case, its blkaddr can be remained as NEW_ADDR.
+        * see, f2fs_add_link -> get_new_data_page -> init_inode_metadata.
+        */
+       if (dn.data_blkaddr == NEW_ADDR) {
+               zero_user_segment(page, 0, PAGE_CACHE_SIZE);
+               SetPageUptodate(page);
+               return page;
+       }
 
        err = f2fs_readpage(sbi, page, dn.data_blkaddr, READ_SYNC);
        if (err)
@@ -439,7 +449,7 @@ static int get_data_block_ro(struct inode *inode, sector_t iblock,
                unsigned int end_offset;
 
                end_offset = IS_INODE(dn.node_page) ?
-                               ADDRS_PER_INODE :
+                               ADDRS_PER_INODE(F2FS_I(inode)) :
                                ADDRS_PER_BLOCK;
 
                clear_buffer_new(bh_result);