summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2015-03-17 23:26:15 +0100
committerAl Viro <viro@zeniv.linux.org.uk>2015-04-15 21:06:59 +0200
commitdf2b1afde178f01c6a1b2ec285ca8bcfd4c66640 (patch)
tree0e2fc2d4479fb53c157cedc302d7c0dbeaea62aa
parentVFS: fs/cachefiles: d_backing_inode() annotations (diff)
downloadlinux-df2b1afde178f01c6a1b2ec285ca8bcfd4c66640.tar.xz
linux-df2b1afde178f01c6a1b2ec285ca8bcfd4c66640.zip
VFS: fs/inode.c helpers: d_inode() annotations
these should be used on objects already in top layer Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/inode.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/inode.c b/fs/inode.c
index f00b16f45507..94886f9fbb06 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1587,7 +1587,7 @@ static int update_time(struct inode *inode, struct timespec *time, int flags)
void touch_atime(const struct path *path)
{
struct vfsmount *mnt = path->mnt;
- struct inode *inode = path->dentry->d_inode;
+ struct inode *inode = d_inode(path->dentry);
struct timespec now;
if (inode->i_flags & S_NOATIME)
@@ -1639,7 +1639,7 @@ EXPORT_SYMBOL(touch_atime);
*/
int should_remove_suid(struct dentry *dentry)
{
- umode_t mode = dentry->d_inode->i_mode;
+ umode_t mode = d_inode(dentry)->i_mode;
int kill = 0;
/* suid always must be killed */
@@ -1675,7 +1675,7 @@ static int __remove_suid(struct dentry *dentry, int kill)
int file_remove_suid(struct file *file)
{
struct dentry *dentry = file->f_path.dentry;
- struct inode *inode = dentry->d_inode;
+ struct inode *inode = d_inode(dentry);
int killsuid;
int killpriv;
int error = 0;