Merge tag 'overflow-v4.18-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / fs / f2fs / xattr.c

diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c
index ae2dfa709f5dcf2f8e5b1084f5bce89377942ccc..708271871f945c63a4b11885ef2e8e3453b6bc8f 100644 (file)
--- a/fs/f2fs/xattr.c
+++ b/fs/f2fs/xattr.c
@@ -252,7 +252,7 @@ static int read_inline_xattr(struct inode *inode, struct page *ipage,
        if (ipage) {
                inline_addr = inline_xattr_addr(inode, ipage);
        } else {
-               page = get_node_page(sbi, inode->i_ino);
+               page = f2fs_get_node_page(sbi, inode->i_ino);
                if (IS_ERR(page))
                        return PTR_ERR(page);
 
@@ -273,7 +273,7 @@ static int read_xattr_block(struct inode *inode, void *txattr_addr)
        void *xattr_addr;
 
        /* The inode already has an extended attribute block. */
-       xpage = get_node_page(sbi, xnid);
+       xpage = f2fs_get_node_page(sbi, xnid);
        if (IS_ERR(xpage))
                return PTR_ERR(xpage);
 
@@ -397,7 +397,7 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize,
        int err = 0;
 
        if (hsize > inline_size && !F2FS_I(inode)->i_xattr_nid)
-               if (!alloc_nid(sbi, &new_nid))
+               if (!f2fs_alloc_nid(sbi, &new_nid))
                        return -ENOSPC;
 
        /* write to inline xattr */
@@ -405,9 +405,9 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize,
                if (ipage) {
                        inline_addr = inline_xattr_addr(inode, ipage);
                } else {
-                       in_page = get_node_page(sbi, inode->i_ino);
+                       in_page = f2fs_get_node_page(sbi, inode->i_ino);
                        if (IS_ERR(in_page)) {
-                               alloc_nid_failed(sbi, new_nid);
+                               f2fs_alloc_nid_failed(sbi, new_nid);
                                return PTR_ERR(in_page);
                        }
                        inline_addr = inline_xattr_addr(inode, in_page);
@@ -417,8 +417,8 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize,
                                                        NODE, true);
                /* no need to use xattr node block */
                if (hsize <= inline_size) {
-                       err = truncate_xattr_node(inode);
-                       alloc_nid_failed(sbi, new_nid);
+                       err = f2fs_truncate_xattr_node(inode);
+                       f2fs_alloc_nid_failed(sbi, new_nid);
                        if (err) {
                                f2fs_put_page(in_page, 1);
                                return err;
@@ -431,10 +431,10 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize,
 
        /* write to xattr node block */
        if (F2FS_I(inode)->i_xattr_nid) {
-               xpage = get_node_page(sbi, F2FS_I(inode)->i_xattr_nid);
+               xpage = f2fs_get_node_page(sbi, F2FS_I(inode)->i_xattr_nid);
                if (IS_ERR(xpage)) {
                        err = PTR_ERR(xpage);
-                       alloc_nid_failed(sbi, new_nid);
+                       f2fs_alloc_nid_failed(sbi, new_nid);
                        goto in_page_out;
                }
                f2fs_bug_on(sbi, new_nid);
@@ -442,13 +442,13 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize,
        } else {
                struct dnode_of_data dn;
                set_new_dnode(&dn, inode, NULL, NULL, new_nid);
-               xpage = new_node_page(&dn, XATTR_NODE_OFFSET);
+               xpage = f2fs_new_node_page(&dn, XATTR_NODE_OFFSET);
                if (IS_ERR(xpage)) {
                        err = PTR_ERR(xpage);
-                       alloc_nid_failed(sbi, new_nid);
+                       f2fs_alloc_nid_failed(sbi, new_nid);
                        goto in_page_out;
                }
-               alloc_nid_done(sbi, new_nid);
+               f2fs_alloc_nid_done(sbi, new_nid);
        }
        xattr_addr = page_address(xpage);
 
@@ -693,7 +693,7 @@ int f2fs_setxattr(struct inode *inode, int index, const char *name,
        if (err)
                return err;
 
-       /* this case is only from init_inode_metadata */
+       /* this case is only from f2fs_init_inode_metadata */
        if (ipage)
                return __f2fs_setxattr(inode, index, name, value,
                                                size, ipage, flags);