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>

2 files changed, 5 insertions, 5 deletions

diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
index 6acc9648f986..f131fc23ffc4 100644
--- a/fs/kernfs/dir.c
+++ b/fs/kernfs/dir.c
@@ -444,7 +444,7 @@ static int kernfs_dop_revalidate(struct dentry *dentry, unsigned int flags)
                 return -ECHILD;
 
         /* Always perform fresh lookup for negatives */
-        if (!dentry->d_inode)
+        if (d_really_is_negative(dentry))
                 goto out_bad_unlocked;
 
         kn = dentry->d_fsdata;
diff --git a/fs/kernfs/inode.c b/fs/kernfs/inode.c
index 9000874a945b..2da8493a380b 100644
--- a/fs/kernfs/inode.c
+++ b/fs/kernfs/inode.c
@@ -111,7 +111,7 @@ int kernfs_setattr(struct kernfs_node *kn, const struct iattr *iattr)
 
 int kernfs_iop_setattr(struct dentry *dentry, struct iattr *iattr)
 {
-        struct inode *inode = dentry->d_inode;
+        struct inode *inode = d_inode(dentry);
         struct kernfs_node *kn = dentry->d_fsdata;
         int error;
 
@@ -172,11 +172,11 @@ int kernfs_iop_setxattr(struct dentry *dentry, const char *name,
 
         if (!strncmp(name, XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN)) {
                 const char *suffix = name + XATTR_SECURITY_PREFIX_LEN;
-                error = security_inode_setsecurity(dentry->d_inode, suffix,
+                error = security_inode_setsecurity(d_inode(dentry), suffix,
                                                 value, size, flags);
                 if (error)
                         return error;
-                error = security_inode_getsecctx(dentry->d_inode,
+                error = security_inode_getsecctx(d_inode(dentry),
                                                 &secdata, &secdata_len);
                 if (error)
                         return error;
@@ -271,7 +271,7 @@ int kernfs_iop_getattr(struct vfsmount *mnt, struct dentry *dentry,
                    struct kstat *stat)
 {
         struct kernfs_node *kn = dentry->d_fsdata;
-        struct inode *inode = dentry->d_inode;
+        struct inode *inode = d_inode(dentry);
 
         mutex_lock(&kernfs_mutex);
         kernfs_refresh_inode(kn, inode);