From: Linus Torvalds Date: Tue, 30 Aug 2005 14:47:42 +0000 (-0700) Subject: Merge refs/heads/for-linus from master.kernel.org:/pub/scm/linux/kernel/git/shaggy... X-Git-Tag: v2.6.14-rc1~1028 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=ae11be6f37dfa140b6c2d1a53b307ef57da69a04;hp=444bd6fc18e4788f701a119cdfefe4f02444d9cb Merge refs/heads/for-linus from /linux/kernel/git/shaggy/jfs-2.6.git --- diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c index 1cae14e741eb..49ccde3937f9 100644 --- a/fs/jfs/namei.c +++ b/fs/jfs/namei.c @@ -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))