vfs: do_last(): clean up error handling

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 8 insertions, 15 deletions

diff --git a/fs/namei.c b/fs/namei.c
index 0ed876259f8b..044215a7bb0c 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2634,21 +2634,14 @@ common:
         if (error)
                 goto exit_fput;
 opened:
-        if (!IS_ERR(filp)) {
-                error = ima_file_check(filp, op->acc_mode);
-                if (error) {
-                        fput(filp);
-                        filp = ERR_PTR(error);
-                }
-        }
-        if (!IS_ERR(filp)) {
-                if (will_truncate) {
-                        error = handle_truncate(filp);
-                        if (error) {
-                                fput(filp);
-                                filp = ERR_PTR(error);
-                        }
-                }
+        error = ima_file_check(filp, op->acc_mode);
+        if (error)
+                goto exit_fput;
+
+        if (will_truncate) {
+                error = handle_truncate(filp);
+                if (error)
+                        goto exit_fput;
         }
 out:
         if (want_write)