diff --git a/[refs] b/[refs] index 5c164c84903a..9693408212b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1042d60f917d78ef1a6eaea297a1020484d4bf74 +refs/heads/master: 61412b64b965af72798000c3c921e88db31216b1 diff --git a/trunk/fs/f2fs/namei.c b/trunk/fs/f2fs/namei.c index 63efd77fab92..2d720ca47071 100644 --- a/trunk/fs/f2fs/namei.c +++ b/trunk/fs/f2fs/namei.c @@ -287,9 +287,8 @@ static int f2fs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) int err; inode = f2fs_new_inode(dir, S_IFDIR | mode); - err = PTR_ERR(inode); if (IS_ERR(inode)) - return err; + return PTR_ERR(inode); inode->i_op = &f2fs_dir_inode_operations; inode->i_fop = &f2fs_dir_operations;