1 files changed, 4 insertions, 15 deletions

diff --git a/fs/file.c b/fs/file.c
index 60a45e9f5323..eb56a13dab3e 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -713,27 +713,16 @@ unsigned long __fdget_raw(unsigned int fd)
 
 unsigned long __fdget_pos(unsigned int fd)
 {
-        struct files_struct *files = current->files;
-        struct file *file;
-        unsigned long v;
-
-        if (atomic_read(&files->count) == 1) {
-                file = __fcheck_files(files, fd);
-                v = 0;
-        } else {
-                file = __fget(fd, 0);
-                v = FDPUT_FPUT;
-        }
-        if (!file)
-                return 0;
+        unsigned long v = __fdget(fd);
+        struct file *file = (struct file *)(v & ~3);
 
-        if (file->f_mode & FMODE_ATOMIC_POS) {
+        if (file && (file->f_mode & FMODE_ATOMIC_POS)) {
                 if (file_count(file) > 1) {
                         v |= FDPUT_POS_UNLOCK;
                         mutex_lock(&file->f_pos_lock);
                 }
         }
-        return v | (unsigned long)file;
+        return v;
 }
 
 /*