summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2013-06-13 23:37:49 +0100
committerAl Viro <viro@zeniv.linux.org.uk>2013-06-29 12:57:13 +0400
commitc77cecee52e9b599da1f8ffd9170d4374c99a345 (patch)
tree7f3b178cda88ca3e94cf2992b438ccabd7938a62 /security
parent656d09df8f73b6f2ae0c7205c6eb79f1642353f8 (diff)
downloadblackbird-obmc-linux-c77cecee52e9b599da1f8ffd9170d4374c99a345.tar.gz
blackbird-obmc-linux-c77cecee52e9b599da1f8ffd9170d4374c99a345.zip
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: David Howells <dhowells@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'security')
-rw-r--r--security/integrity/ima/ima_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
index 6c491a63128e..e9508d5bbfcf 100644
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@ -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;
OpenPOWER on IntegriCloud