1 files changed, 5 insertions, 8 deletions

diff --git a/ipc/shm.c b/ipc/shm.c
index b8884c288ecc..5fc5cf50cf1b 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -907,7 +907,7 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
                 goto out_unlock;
 
         path.dentry = dget(shp->shm_file->f_path.dentry);
-        path.mnt    = mntget(shp->shm_file->f_path.mnt);
+        path.mnt    = shp->shm_file->f_path.mnt;
         shp->shm_nattch++;
         size = i_size_read(path.dentry->d_inode);
         shm_unlock(shp);
@@ -915,18 +915,16 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
         err = -ENOMEM;
         sfd = kzalloc(sizeof(*sfd), GFP_KERNEL);
         if (!sfd)
-                goto out_put_path;
+                goto out_put_dentry;
 
         err = -ENOMEM;
-        file = get_empty_filp();
+
+        file = alloc_file(path.mnt, path.dentry, f_mode, &shm_file_operations);
         if (!file)
                 goto out_free;
 
-        file->f_op = &shm_file_operations;
         file->private_data = sfd;
-        file->f_path = path;
         file->f_mapping = shp->shm_file->f_mapping;
-        file->f_mode = f_mode;
         sfd->id = shp->id;
         sfd->ns = get_ipc_ns(ns);
         sfd->file = shp->shm_file;
@@ -977,9 +975,8 @@ out_unlock:
 
 out_free:
         kfree(sfd);
-out_put_path:
+out_put_dentry:
         dput(path.dentry);
-        mntput(path.mnt);
         goto out_nattch;
 }