summaryrefslogtreecommitdiffstats
path: root/fs/omfs/dir.c
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2015-03-17 18:25:59 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2015-04-15 15:06:57 -0400
commit2b0143b5c986be1ce8408b3aadc4709e0a94429d (patch)
tree98b1dee70f3d5d9ac9309f4638e41864ddcd0952 /fs/omfs/dir.c
parentce0b16ddf18df35026164fda4a642ef10c01f442 (diff)
VFS: normal filesystems (and lustre): d_inode() annotations
that's the bulk of filesystem drivers dealing with inodes of their own Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/omfs/dir.c')
-rw-r--r--fs/omfs/dir.c10
1 files changed, 5 insertions, 5 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
111static int omfs_add_link(struct dentry *dentry, struct inode *inode) 111static 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
156static int omfs_delete_entry(struct dentry *dentry) 156static 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
238static int omfs_remove(struct inode *dir, struct dentry *dentry) 238static 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,
373static int omfs_rename(struct inode *old_dir, struct dentry *old_dentry, 373static 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) {