Merge by hand (whitespace conflicts in libata.h)

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c
index 8ae0db6cd69c..2568eb41cb3a 100644
--- a/fs/binfmt_misc.c
+++ b/fs/binfmt_misc.c
@@ -150,7 +150,7 @@ static int load_misc_binary(struct linux_binprm *bprm, struct pt_regs *regs)
 
                 /* if the binary is not readable than enforce mm->dumpable=0
                    regardless of the interpreter's permissions */
-                if (permission(bprm->file->f_dentry->d_inode, MAY_READ, NULL))
+                if (file_permission(bprm->file, MAY_READ))
                         bprm->interp_flags |= BINPRM_FLAGS_ENFORCE_NONDUMP;
 
                 allow_write_access(bprm->file);