alloc_file(): simplify handling of mnt_clone_write() errors
authorRoland Dreier <rdreier@cisco.com>
Wed, 16 Dec 2009 20:48:44 +0000 (12:48 -0800)
committerAl Viro <viro@zeniv.linux.org.uk>
Tue, 22 Dec 2009 17:27:33 +0000 (12:27 -0500)
When alloc_file() and init_file() were combined, the error handling of
mnt_clone_write() was taken into alloc_file() in a somewhat obfuscated
way.  Since we don't use the error code for anything except warning,
we might as well warn directly without an extra variable.

Signed-off-by: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/file_table.c

index 0afacf654398c9417dbe8bf170d9faa2605be24e..69652c5bd5f0ad83b983324d4dc2d31b7a1cd689 100644 (file)
@@ -186,10 +186,8 @@ struct file *alloc_file(struct path *path, fmode_t mode,
         * that we can do debugging checks at __fput()
         */
        if ((mode & FMODE_WRITE) && !special_file(path->dentry->d_inode->i_mode)) {
-               int error = 0;
                file_take_write(file);
-               error = mnt_clone_write(path->mnt);
-               WARN_ON(error);
+               WARN_ON(mnt_clone_write(path->mnt));
        }
        ima_counts_get(file);
        return file;