diff options
Diffstat (limited to 'fs/jfs/namei.c')
-rw-r--r-- | fs/jfs/namei.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c index 38fdc533f4ec..66db7bc0ed10 100644 --- a/fs/jfs/namei.c +++ b/fs/jfs/namei.c | |||
@@ -346,7 +346,7 @@ static int jfs_rmdir(struct inode *dip, struct dentry *dentry) | |||
346 | { | 346 | { |
347 | int rc; | 347 | int rc; |
348 | tid_t tid; /* transaction id */ | 348 | tid_t tid; /* transaction id */ |
349 | struct inode *ip = dentry->d_inode; | 349 | struct inode *ip = d_inode(dentry); |
350 | ino_t ino; | 350 | ino_t ino; |
351 | struct component_name dname; | 351 | struct component_name dname; |
352 | struct inode *iplist[2]; | 352 | struct inode *iplist[2]; |
@@ -472,7 +472,7 @@ static int jfs_unlink(struct inode *dip, struct dentry *dentry) | |||
472 | { | 472 | { |
473 | int rc; | 473 | int rc; |
474 | tid_t tid; /* transaction id */ | 474 | tid_t tid; /* transaction id */ |
475 | struct inode *ip = dentry->d_inode; | 475 | struct inode *ip = d_inode(dentry); |
476 | ino_t ino; | 476 | ino_t ino; |
477 | struct component_name dname; /* object name */ | 477 | struct component_name dname; /* object name */ |
478 | struct inode *iplist[2]; | 478 | struct inode *iplist[2]; |
@@ -791,7 +791,7 @@ static int jfs_link(struct dentry *old_dentry, | |||
791 | { | 791 | { |
792 | int rc; | 792 | int rc; |
793 | tid_t tid; | 793 | tid_t tid; |
794 | struct inode *ip = old_dentry->d_inode; | 794 | struct inode *ip = d_inode(old_dentry); |
795 | ino_t ino; | 795 | ino_t ino; |
796 | struct component_name dname; | 796 | struct component_name dname; |
797 | struct btstack btstack; | 797 | struct btstack btstack; |
@@ -879,7 +879,7 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry, | |||
879 | struct component_name dname; | 879 | struct component_name dname; |
880 | int ssize; /* source pathname size */ | 880 | int ssize; /* source pathname size */ |
881 | struct btstack btstack; | 881 | struct btstack btstack; |
882 | struct inode *ip = dentry->d_inode; | 882 | struct inode *ip = d_inode(dentry); |
883 | unchar *i_fastsymlink; | 883 | unchar *i_fastsymlink; |
884 | s64 xlen = 0; | 884 | s64 xlen = 0; |
885 | int bmask = 0, xsize; | 885 | int bmask = 0, xsize; |
@@ -1086,8 +1086,8 @@ static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
1086 | dquot_initialize(old_dir); | 1086 | dquot_initialize(old_dir); |
1087 | dquot_initialize(new_dir); | 1087 | dquot_initialize(new_dir); |
1088 | 1088 | ||
1089 | old_ip = old_dentry->d_inode; | 1089 | old_ip = d_inode(old_dentry); |
1090 | new_ip = new_dentry->d_inode; | 1090 | new_ip = d_inode(new_dentry); |
1091 | 1091 | ||
1092 | if ((rc = get_UCSname(&old_dname, old_dentry))) | 1092 | if ((rc = get_UCSname(&old_dname, old_dentry))) |
1093 | goto out1; | 1093 | goto out1; |
@@ -1500,9 +1500,9 @@ struct dentry *jfs_get_parent(struct dentry *dentry) | |||
1500 | unsigned long parent_ino; | 1500 | unsigned long parent_ino; |
1501 | 1501 | ||
1502 | parent_ino = | 1502 | parent_ino = |
1503 | le32_to_cpu(JFS_IP(dentry->d_inode)->i_dtroot.header.idotdot); | 1503 | le32_to_cpu(JFS_IP(d_inode(dentry))->i_dtroot.header.idotdot); |
1504 | 1504 | ||
1505 | return d_obtain_alias(jfs_iget(dentry->d_inode->i_sb, parent_ino)); | 1505 | return d_obtain_alias(jfs_iget(d_inode(dentry)->i_sb, parent_ino)); |
1506 | } | 1506 | } |
1507 | 1507 | ||
1508 | const struct inode_operations jfs_dir_inode_operations = { | 1508 | const struct inode_operations jfs_dir_inode_operations = { |
@@ -1578,7 +1578,7 @@ static int jfs_ci_revalidate(struct dentry *dentry, unsigned int flags) | |||
1578 | * positive dentry isn't good idea. So it's unsupported like | 1578 | * positive dentry isn't good idea. So it's unsupported like |
1579 | * rename("filename", "FILENAME") for now. | 1579 | * rename("filename", "FILENAME") for now. |
1580 | */ | 1580 | */ |
1581 | if (dentry->d_inode) | 1581 | if (d_really_is_positive(dentry)) |
1582 | return 1; | 1582 | return 1; |
1583 | 1583 | ||
1584 | /* | 1584 | /* |