fold put_filp() into fput()

[linux-block.git] / fs / open.c

diff --git a/fs/open.c b/fs/open.c
index f3c6cb6a57b9c140d5ef8ab6c2f1d43916160012..3d09b823f12b100654275b1d6dcb933dc63d303a 100644 (file)
--- a/fs/open.c
+++ b/fs/open.c
@@ -921,15 +921,10 @@ struct file *dentry_open(const struct path *path, int flags,
        f = alloc_empty_file(flags, cred);
        if (!IS_ERR(f)) {
                error = vfs_open(path, f);
-               if (!error) {
-                       /* from now on we need fput() to dispose of f */
+               if (!error)
                        error = open_check_o_direct(f);
-                       if (error) {
-                               fput(f);
-                               f = ERR_PTR(error);
-                       }
-               } else { 
-                       put_filp(f);
+               if (error) {
+                       fput(f);
                        f = ERR_PTR(error);
                }
        }