Merge tag 'hwlock-v4.21' of git://github.com/andersson/remoteproc

[sfrench/cifs-2.6.git] / fs / f2fs / namei.c

diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index 99299ede7429997c0fe0f2bb825de62ee94c0f9b..62d9829f3a6a7ea23746e04891a819dddb221c8a 100644 (file)
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -61,7 +61,7 @@ static struct inode *f2fs_new_inode(struct inode *dir, umode_t mode)
                goto fail;
        }
 
-       if (f2fs_sb_has_project_quota(sbi->sb) &&
+       if (f2fs_sb_has_project_quota(sbi) &&
                (F2FS_I(dir)->i_flags & F2FS_PROJINHERIT_FL))
                F2FS_I(inode)->i_projid = F2FS_I(dir)->i_projid;
        else
@@ -79,7 +79,7 @@ static struct inode *f2fs_new_inode(struct inode *dir, umode_t mode)
                                f2fs_may_encrypt(inode))
                f2fs_set_encrypted_inode(inode);
 
-       if (f2fs_sb_has_extra_attr(sbi->sb)) {
+       if (f2fs_sb_has_extra_attr(sbi)) {
                set_inode_flag(inode, FI_EXTRA_ATTR);
                F2FS_I(inode)->i_extra_isize = F2FS_TOTAL_EXTRA_ATTR_SIZE;
        }
@@ -92,7 +92,7 @@ static struct inode *f2fs_new_inode(struct inode *dir, umode_t mode)
        if (f2fs_may_inline_dentry(inode))
                set_inode_flag(inode, FI_INLINE_DENTRY);
 
-       if (f2fs_sb_has_flexible_inline_xattr(sbi->sb)) {
+       if (f2fs_sb_has_flexible_inline_xattr(sbi)) {
                f2fs_bug_on(sbi, !f2fs_has_extra_attr(inode));
                if (f2fs_has_inline_xattr(inode))
                        xattr_size = F2FS_OPTION(sbi).inline_xattr_size;
@@ -635,7 +635,7 @@ out_f2fs_handle_failed_inode:
        f2fs_handle_failed_inode(inode);
 out_free_encrypted_link:
        if (disk_link.name != (unsigned char *)symname)
-               kfree(disk_link.name);
+               kvfree(disk_link.name);
        return err;
 }