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 | |
parent | 3d23985d6cfa7908e46fd0c62a2ee84faffe4d8b (diff) |
switch jfs to ->s_d_op, close exportfs races
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/jfs/namei.c | 10 | ||||
-rw-r--r-- | fs/jfs/super.c | 6 |
2 files changed, 4 insertions, 12 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 | |||
1465 | 1465 | ||
1466 | jfs_info("jfs_lookup: name = %s", name); | 1466 | jfs_info("jfs_lookup: name = %s", name); |
1467 | 1467 | ||
1468 | if (JFS_SBI(dip->i_sb)->mntflag & JFS_OS2) | ||
1469 | d_set_d_op(dentry, &jfs_ci_dentry_operations); | ||
1470 | |||
1471 | if ((name[0] == '.') && (len == 1)) | 1468 | if ((name[0] == '.') && (len == 1)) |
1472 | inum = dip->i_ino; | 1469 | inum = dip->i_ino; |
1473 | else if (strcmp(name, "..") == 0) | 1470 | else if (strcmp(name, "..") == 0) |
@@ -1492,12 +1489,7 @@ static struct dentry *jfs_lookup(struct inode *dip, struct dentry *dentry, struc | |||
1492 | return ERR_CAST(ip); | 1489 | return ERR_CAST(ip); |
1493 | } | 1490 | } |
1494 | 1491 | ||
1495 | dentry = d_splice_alias(ip, dentry); | 1492 | return d_splice_alias(ip, dentry); |
1496 | |||
1497 | if (dentry && (JFS_SBI(dip->i_sb)->mntflag & JFS_OS2)) | ||
1498 | d_set_d_op(dentry, &jfs_ci_dentry_operations); | ||
1499 | |||
1500 | return dentry; | ||
1501 | } | 1493 | } |
1502 | 1494 | ||
1503 | static struct inode *jfs_nfs_get_inode(struct super_block *sb, | 1495 | static struct inode *jfs_nfs_get_inode(struct super_block *sb, |
diff --git a/fs/jfs/super.c b/fs/jfs/super.c index 3150d766e0d4..eeca48a031ab 100644 --- a/fs/jfs/super.c +++ b/fs/jfs/super.c | |||
@@ -515,6 +515,9 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent) | |||
515 | 515 | ||
516 | sb->s_magic = JFS_SUPER_MAGIC; | 516 | sb->s_magic = JFS_SUPER_MAGIC; |
517 | 517 | ||
518 | if (sbi->mntflag & JFS_OS2) | ||
519 | sb->s_d_op = &jfs_ci_dentry_operations; | ||
520 | |||
518 | inode = jfs_iget(sb, ROOT_I); | 521 | inode = jfs_iget(sb, ROOT_I); |
519 | if (IS_ERR(inode)) { | 522 | if (IS_ERR(inode)) { |
520 | ret = PTR_ERR(inode); | 523 | ret = PTR_ERR(inode); |
@@ -524,9 +527,6 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent) | |||
524 | if (!sb->s_root) | 527 | if (!sb->s_root) |
525 | goto out_no_root; | 528 | goto out_no_root; |
526 | 529 | ||
527 | if (sbi->mntflag & JFS_OS2) | ||
528 | d_set_d_op(sb->s_root, &jfs_ci_dentry_operations); | ||
529 | |||
530 | /* logical blocks are represented by 40 bits in pxd_t, etc. */ | 530 | /* logical blocks are represented by 40 bits in pxd_t, etc. */ |
531 | sb->s_maxbytes = ((u64) sb->s_blocksize) << 40; | 531 | sb->s_maxbytes = ((u64) sb->s_blocksize) << 40; |
532 | #if BITS_PER_LONG == 32 | 532 | #if BITS_PER_LONG == 32 |