diff options
Diffstat (limited to 'fs/omfs')
-rw-r--r-- | fs/omfs/dir.c | 10 | ||||
-rw-r--r-- | fs/omfs/file.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/fs/omfs/dir.c b/fs/omfs/dir.c index 1b8e9e8405b2..f833bf8d5792 100644 --- a/fs/omfs/dir.c +++ b/fs/omfs/dir.c | |||
@@ -110,7 +110,7 @@ int omfs_make_empty(struct inode *inode, struct super_block *sb) | |||
110 | 110 | ||
111 | static int omfs_add_link(struct dentry *dentry, struct inode *inode) | 111 | static int omfs_add_link(struct dentry *dentry, struct inode *inode) |
112 | { | 112 | { |
113 | struct inode *dir = dentry->d_parent->d_inode; | 113 | struct inode *dir = d_inode(dentry->d_parent); |
114 | const char *name = dentry->d_name.name; | 114 | const char *name = dentry->d_name.name; |
115 | int namelen = dentry->d_name.len; | 115 | int namelen = dentry->d_name.len; |
116 | struct omfs_inode *oi; | 116 | struct omfs_inode *oi; |
@@ -155,7 +155,7 @@ out: | |||
155 | 155 | ||
156 | static int omfs_delete_entry(struct dentry *dentry) | 156 | static int omfs_delete_entry(struct dentry *dentry) |
157 | { | 157 | { |
158 | struct inode *dir = dentry->d_parent->d_inode; | 158 | struct inode *dir = d_inode(dentry->d_parent); |
159 | struct inode *dirty; | 159 | struct inode *dirty; |
160 | const char *name = dentry->d_name.name; | 160 | const char *name = dentry->d_name.name; |
161 | int namelen = dentry->d_name.len; | 161 | int namelen = dentry->d_name.len; |
@@ -237,7 +237,7 @@ static int omfs_dir_is_empty(struct inode *inode) | |||
237 | 237 | ||
238 | static int omfs_remove(struct inode *dir, struct dentry *dentry) | 238 | static int omfs_remove(struct inode *dir, struct dentry *dentry) |
239 | { | 239 | { |
240 | struct inode *inode = dentry->d_inode; | 240 | struct inode *inode = d_inode(dentry); |
241 | int ret; | 241 | int ret; |
242 | 242 | ||
243 | 243 | ||
@@ -373,8 +373,8 @@ static bool omfs_fill_chain(struct inode *dir, struct dir_context *ctx, | |||
373 | static int omfs_rename(struct inode *old_dir, struct dentry *old_dentry, | 373 | static int omfs_rename(struct inode *old_dir, struct dentry *old_dentry, |
374 | struct inode *new_dir, struct dentry *new_dentry) | 374 | struct inode *new_dir, struct dentry *new_dentry) |
375 | { | 375 | { |
376 | struct inode *new_inode = new_dentry->d_inode; | 376 | struct inode *new_inode = d_inode(new_dentry); |
377 | struct inode *old_inode = old_dentry->d_inode; | 377 | struct inode *old_inode = d_inode(old_dentry); |
378 | int err; | 378 | int err; |
379 | 379 | ||
380 | if (new_inode) { | 380 | if (new_inode) { |
diff --git a/fs/omfs/file.c b/fs/omfs/file.c index f993be7f2156..d9e26cfbb793 100644 --- a/fs/omfs/file.c +++ b/fs/omfs/file.c | |||
@@ -346,7 +346,7 @@ const struct file_operations omfs_file_operations = { | |||
346 | 346 | ||
347 | static int omfs_setattr(struct dentry *dentry, struct iattr *attr) | 347 | static int omfs_setattr(struct dentry *dentry, struct iattr *attr) |
348 | { | 348 | { |
349 | struct inode *inode = dentry->d_inode; | 349 | struct inode *inode = d_inode(dentry); |
350 | int error; | 350 | int error; |
351 | 351 | ||
352 | error = inode_change_ok(inode, attr); | 352 | error = inode_change_ok(inode, attr); |