git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
444bd6f
)
Merge refs/heads/for-linus from master.kernel.org:/pub/scm/linux/kernel/git/shaggy...
author
Linus Torvalds
<torvalds@g5.osdl.org>
Tue, 30 Aug 2005 14:47:42 +0000
(07:47 -0700)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Tue, 30 Aug 2005 14:47:42 +0000
(07:47 -0700)
fs/jfs/namei.c
patch
|
blob
|
history
diff --git
a/fs/jfs/namei.c
b/fs/jfs/namei.c
index
1cae14e
..
49ccde3
100644
(file)
--- 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))