diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2010-12-18 10:59:31 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-01-12 20:02:43 -0500 |
| commit | 94b77bd86f8ad458fa7870def78ec3a8a7caa986 (patch) | |
| tree | 2f123159e6db0fa5545baeb4c9b158f2c0fc75a1 /fs/jfs/namei.c | |
| parent | 3d23985d6cfa7908e46fd0c62a2ee84faffe4d8b (diff) | |
| download | linux-stable-94b77bd86f8ad458fa7870def78ec3a8a7caa986.tar.gz linux-stable-94b77bd86f8ad458fa7870def78ec3a8a7caa986.tar.bz2 linux-stable-94b77bd86f8ad458fa7870def78ec3a8a7caa986.zip | |
switch jfs to ->s_d_op, close exportfs races
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/jfs/namei.c')
| -rw-r--r-- | fs/jfs/namei.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c index 4414e3a42264..81ead850ddb6 100644 --- a/fs/jfs/namei.c +++ b/fs/jfs/namei.c @@ -1465,9 +1465,6 @@ 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) - d_set_d_op(dentry, &jfs_ci_dentry_operations); - if ((name[0] == '.') && (len == 1)) inum = dip->i_ino; else if (strcmp(name, "..") == 0) @@ -1492,12 +1489,7 @@ static struct dentry *jfs_lookup(struct inode *dip, struct dentry *dentry, struc return ERR_CAST(ip); } - dentry = d_splice_alias(ip, dentry); - - if (dentry && (JFS_SBI(dip->i_sb)->mntflag & JFS_OS2)) - d_set_d_op(dentry, &jfs_ci_dentry_operations); - - return dentry; + return d_splice_alias(ip, dentry); } static struct inode *jfs_nfs_get_inode(struct super_block *sb, |