aboutsummaryrefslogtreecommitdiffstats
path: root/fs/inode.c
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2015-03-17 18:26:15 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2015-04-15 15:06:59 -0400
commitdf2b1afde178f01c6a1b2ec285ca8bcfd4c66640 (patch)
tree0e2fc2d4479fb53c157cedc302d7c0dbeaea62aa /fs/inode.c
parent466b77bc954c23c5741ea7dd02f20212a72acdb2 (diff)
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>
Diffstat (limited to 'fs/inode.c')
-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)
1587void touch_atime(const struct path *path) 1587void touch_atime(const struct path *path)
1588{ 1588{
1589 struct vfsmount *mnt = path->mnt; 1589 struct vfsmount *mnt = path->mnt;
1590 struct inode *inode = path->dentry->d_inode; 1590 struct inode *inode = d_inode(path->dentry);
1591 struct timespec now; 1591 struct timespec now;
1592 1592
1593 if (inode->i_flags & S_NOATIME) 1593 if (inode->i_flags & S_NOATIME)
@@ -1639,7 +1639,7 @@ EXPORT_SYMBOL(touch_atime);
1639 */ 1639 */
1640int should_remove_suid(struct dentry *dentry) 1640int should_remove_suid(struct dentry *dentry)
1641{ 1641{
1642 umode_t mode = dentry->d_inode->i_mode; 1642 umode_t mode = d_inode(dentry)->i_mode;
1643 int kill = 0; 1643 int kill = 0;
1644 1644
1645 /* suid always must be killed */ 1645 /* suid always must be killed */
@@ -1675,7 +1675,7 @@ static int __remove_suid(struct dentry *dentry, int kill)
1675int file_remove_suid(struct file *file) 1675int file_remove_suid(struct file *file)
1676{ 1676{
1677 struct dentry *dentry = file->f_path.dentry; 1677 struct dentry *dentry = file->f_path.dentry;
1678 struct inode *inode = dentry->d_inode; 1678 struct inode *inode = d_inode(dentry);
1679 int killsuid; 1679 int killsuid;
1680 int killpriv; 1680 int killpriv;
1681 int error = 0; 1681 int error = 0;