diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-30 16:47:42 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-30 16:47:42 +0200 |
| commit | ae11be6f37dfa140b6c2d1a53b307ef57da69a04 (patch) | |
| tree | e6957b1373c077f36e5e791bf3d59d6cd78fe214 /fs/jfs | |
| parent | Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa (diff) | |
| parent | Merge with /home/shaggy/git/linus-clean/ (diff) | |
| download | linux-ae11be6f37dfa140b6c2d1a53b307ef57da69a04.tar.xz linux-ae11be6f37dfa140b6c2d1a53b307ef57da69a04.zip | |
Merge refs/heads/for-linus from master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git
Diffstat (limited to 'fs/jfs')
| -rw-r--r-- | fs/jfs/namei.c | 5 |
1 files changed, 2 insertions, 3 deletions
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)) |