Merge refs/heads/for-linus from master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git (ae11be6f) · Commits · e / devices / android_kernel_oneplus_sm8150

fs/jfs/namei.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -1390,6 +1390,8 @@ static struct dentry jfs_lookup(struct inode dip, struct dentry *dentry, struc

		jfs_info("jfs_lookup: name = %s", name);

		if (JFS_SBI(dip->i_sb)->mntflag & JFS_OS2)
		dentry->d_op = &jfs_ci_dentry_operations;

		if ((name[0] == '.') && (len == 1))
		inum = dip->i_ino;
		@@ -1417,9 +1419,6 @@ static struct dentry jfs_lookup(struct inode dip, struct dentry *dentry, struc
		return ERR_PTR(-EACCES);
		}

		if (JFS_SBI(dip->i_sb)->mntflag & JFS_OS2)
		dentry->d_op = &jfs_ci_dentry_operations;

		dentry = d_splice_alias(ip, dentry);

		if (dentry && (JFS_SBI(dip->i_sb)->mntflag & JFS_OS2))