diff options
Diffstat (limited to 'fs/affs/amigaffs.c')
-rw-r--r-- | fs/affs/amigaffs.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/affs/amigaffs.c b/fs/affs/amigaffs.c index 5022ac96aa40..a8f463c028ce 100644 --- a/fs/affs/amigaffs.c +++ b/fs/affs/amigaffs.c | |||
@@ -138,7 +138,7 @@ affs_fix_dcache(struct inode *inode, u32 entry_ino) | |||
138 | static int | 138 | static int |
139 | affs_remove_link(struct dentry *dentry) | 139 | affs_remove_link(struct dentry *dentry) |
140 | { | 140 | { |
141 | struct inode *dir, *inode = dentry->d_inode; | 141 | struct inode *dir, *inode = d_inode(dentry); |
142 | struct super_block *sb = inode->i_sb; | 142 | struct super_block *sb = inode->i_sb; |
143 | struct buffer_head *bh = NULL, *link_bh = NULL; | 143 | struct buffer_head *bh = NULL, *link_bh = NULL; |
144 | u32 link_ino, ino; | 144 | u32 link_ino, ino; |
@@ -268,11 +268,11 @@ affs_remove_header(struct dentry *dentry) | |||
268 | struct buffer_head *bh = NULL; | 268 | struct buffer_head *bh = NULL; |
269 | int retval; | 269 | int retval; |
270 | 270 | ||
271 | dir = dentry->d_parent->d_inode; | 271 | dir = d_inode(dentry->d_parent); |
272 | sb = dir->i_sb; | 272 | sb = dir->i_sb; |
273 | 273 | ||
274 | retval = -ENOENT; | 274 | retval = -ENOENT; |
275 | inode = dentry->d_inode; | 275 | inode = d_inode(dentry); |
276 | if (!inode) | 276 | if (!inode) |
277 | goto done; | 277 | goto done; |
278 | 278 | ||
@@ -471,10 +471,9 @@ affs_warning(struct super_block *sb, const char *function, const char *fmt, ...) | |||
471 | bool | 471 | bool |
472 | affs_nofilenametruncate(const struct dentry *dentry) | 472 | affs_nofilenametruncate(const struct dentry *dentry) |
473 | { | 473 | { |
474 | struct inode *inode = dentry->d_inode; | 474 | struct inode *inode = d_inode(dentry); |
475 | 475 | ||
476 | return affs_test_opt(AFFS_SB(inode->i_sb)->s_flags, SF_NO_TRUNCATE); | 476 | return affs_test_opt(AFFS_SB(inode->i_sb)->s_flags, SF_NO_TRUNCATE); |
477 | |||
478 | } | 477 | } |
479 | 478 | ||
480 | /* Check if the name is valid for a affs object. */ | 479 | /* Check if the name is valid for a affs object. */ |