1 files changed, 8 insertions, 17 deletions

diff --git a/fs/file.c b/fs/file.c
index d34e59e51743..4ed58a32575e 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -637,16 +637,16 @@ void do_close_on_exec(struct files_struct *files)
         spin_unlock(&files->file_lock);
 }
 
-struct file *fget(unsigned int fd)
+static struct file *__fget(unsigned int fd, fmode_t mask)
 {
-        struct file *file;
         struct files_struct *files = current->files;
+        struct file *file;
 
         rcu_read_lock();
         file = fcheck_files(files, fd);
         if (file) {
                 /* File object ref couldn't be taken */
-                if (file->f_mode & FMODE_PATH ||
+                if ((file->f_mode & mask) ||
                     !atomic_long_inc_not_zero(&file->f_count))
                         file = NULL;
         }
@@ -655,25 +655,16 @@ struct file *fget(unsigned int fd)
         return file;
 }
 
+struct file *fget(unsigned int fd)
+{
+        return __fget(fd, FMODE_PATH);
+}
 EXPORT_SYMBOL(fget);
 
 struct file *fget_raw(unsigned int fd)
 {
-        struct file *file;
-        struct files_struct *files = current->files;
-
-        rcu_read_lock();
-        file = fcheck_files(files, fd);
-        if (file) {
-                /* File object ref couldn't be taken */
-                if (!atomic_long_inc_not_zero(&file->f_count))
-                        file = NULL;
-        }
-        rcu_read_unlock();
-
-        return file;
+        return __fget(fd, 0);
 }
-
 EXPORT_SYMBOL(fget_raw);
 
 /*