projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v3.17' into next
[linux-2.6-block.git]
/
fs
/
namei.c
diff --git
a/fs/namei.c
b/fs/namei.c
index a7b05bf82d31ad2e8eacbac999a049cab1f8d446..3ddb044f370273079674c189461fb21dca2c597f 100644
(file)
--- a/
fs/namei.c
+++ b/
fs/namei.c
@@
-3074,7
+3074,7
@@
opened:
error = open_check_o_direct(file);
if (error)
goto exit_fput;
- error = ima_file_check(file, op->acc_mode);
+ error = ima_file_check(file, op->acc_mode
, *opened
);
if (error)
goto exit_fput;