Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c77cecee authored by David Howells's avatar David Howells Committed by Al Viro
Browse files

Replace a bunch of file->dentry->d_inode refs with file_inode() 



Replace a bunch of file->dentry->d_inode refs with file_inode().

In __fput(), use file->f_inode instead so as not to be affected by any tricks
that file_inode() might grow.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 656d09df

fs/file_table.c

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ static void __fput(struct file *file) 
{

	struct dentry *dentry = file->f_path.dentry;

	struct vfsmount *mnt = file->f_path.mnt;

	struct inode *inode = dentry->d_inode;

	struct inode *inode = file->f_inode;



	might_sleep();

include/linux/fsnotify.h

+4 −4
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static inline int fsnotify_parent(struct path *path, struct dentry *dentry, __u3 
static inline int fsnotify_perm(struct file *file, int mask)

{

	struct path *path = &file->f_path;

	struct inode *inode = path->dentry->d_inode;

	struct inode *inode = file_inode(file);

	__u32 fsnotify_mask = 0;

	int ret;
@@ -192,7 +192,7 @@ static inline void fsnotify_mkdir(struct inode *inode, struct dentry *dentry) 
static inline void fsnotify_access(struct file *file)

{

	struct path *path = &file->f_path;

	struct inode *inode = path->dentry->d_inode;

	struct inode *inode = file_inode(file);

	__u32 mask = FS_ACCESS;



	if (S_ISDIR(inode->i_mode))
@@ -210,7 +210,7 @@ static inline void fsnotify_access(struct file *file) 
static inline void fsnotify_modify(struct file *file)

{

	struct path *path = &file->f_path;

	struct inode *inode = path->dentry->d_inode;

	struct inode *inode = file_inode(file);

	__u32 mask = FS_MODIFY;



	if (S_ISDIR(inode->i_mode))
@@ -228,7 +228,7 @@ static inline void fsnotify_modify(struct file *file) 
static inline void fsnotify_open(struct file *file)

{

	struct path *path = &file->f_path;

	struct inode *inode = path->dentry->d_inode;

	struct inode *inode = file_inode(file);

	__u32 mask = FS_OPEN;



	if (S_ISDIR(inode->i_mode))

security/integrity/ima/ima_main.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ __setup("ima_hash=", hash_setup); 
static void ima_rdwr_violation_check(struct file *file)

{

	struct dentry *dentry = file->f_path.dentry;

	struct inode *inode = dentry->d_inode;

	struct inode *inode = file_inode(file);

	fmode_t mode = file->f_mode;

	int must_measure;

	bool send_tomtou = false, send_writers = false;