diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2009-08-09 00:52:35 +0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-12-16 12:16:42 -0500 |
| commit | 2c48b9c45579a9b5e3e74694eebf3d2451f3dbd3 (patch) | |
| tree | cecbf786ae0650368a8136bdd90910e05d9b95c3 /ipc/shm.c | |
| parent | a95161aaa801c18c52b2e7cf3d6b4b141c00a20a (diff) | |
| download | linux-2c48b9c45579a9b5e3e74694eebf3d2451f3dbd3.tar.gz linux-2c48b9c45579a9b5e3e74694eebf3d2451f3dbd3.tar.bz2 linux-2c48b9c45579a9b5e3e74694eebf3d2451f3dbd3.zip | |
switch alloc_file() to passing struct path
... and have the caller grab both mnt and dentry; kill
leak in infiniband, while we are at it.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'ipc/shm.c')
| -rw-r--r-- | ipc/shm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ipc/shm.c b/ipc/shm.c index 11bec626c228..16e39230aa0d 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -878,8 +878,8 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr) if (err) goto out_unlock; - path.dentry = dget(shp->shm_file->f_path.dentry); - path.mnt = shp->shm_file->f_path.mnt; + path = shp->shm_file->f_path; + path_get(&path); shp->shm_nattch++; size = i_size_read(path.dentry->d_inode); shm_unlock(shp); @@ -889,8 +889,8 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr) if (!sfd) goto out_put_dentry; - file = alloc_file(path.mnt, path.dentry, f_mode, - is_file_hugepages(shp->shm_file) ? + file = alloc_file(&path, f_mode, + is_file_hugepages(shp->shm_file) ? &shm_file_operations_huge : &shm_file_operations); if (!file) @@ -950,7 +950,7 @@ out_unlock: out_free: kfree(sfd); out_put_dentry: - dput(path.dentry); + path_put(&path); goto out_nattch; } |