diff options
| author | Eric Sandeen <sandeen@sandeen.net> | 2009-01-25 20:53:00 -0600 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-01-27 14:51:39 -0600 |
| commit | f0e0059b9c18426cffdcc04161062251a8f9741e (patch) | |
| tree | 961ac9a97f77e55cd76d56f1f931caf8ac6f4114 /fs/xfs | |
| parent | 74e2d06521913443c7e2697037909f5efc200ec5 (diff) | |
| download | kernel_samsung_aries-f0e0059b9c18426cffdcc04161062251a8f9741e.zip kernel_samsung_aries-f0e0059b9c18426cffdcc04161062251a8f9741e.tar.gz kernel_samsung_aries-f0e0059b9c18426cffdcc04161062251a8f9741e.tar.bz2 | |
don't reallocate sxp variable passed into xfs_swapext
fixes kernel.org bugzilla 12538, xfs_fsr fails on 2.6.29-rc kernels
Regression caused by 743bb4650da9e2595d6cedd01c680b5b9398c74a
This was an embarrasing mistake, reallocating the sxp pointer passed
in from the main ioctl switch.
Signed-off-by: Eric Sandeen <sandeen@sandeen.net
Reported-by: Paul Martin <pm@debian.org>
Tested-by: Paul Martin <pm@debian.org>
Reviewed-by: Felix Blyakher <felixb@sgi.com>
Signed-off-by: Felix Blyakher <felixb@sgi.com>
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/xfs_dfrag.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/fs/xfs/xfs_dfrag.c b/fs/xfs/xfs_dfrag.c index b4c1ee7..f8278cf 100644 --- a/fs/xfs/xfs_dfrag.c +++ b/fs/xfs/xfs_dfrag.c @@ -55,17 +55,11 @@ xfs_swapext( struct file *file, *target_file; int error = 0; - sxp = kmem_alloc(sizeof(xfs_swapext_t), KM_MAYFAIL); - if (!sxp) { - error = XFS_ERROR(ENOMEM); - goto out; - } - /* Pull information for the target fd */ file = fget((int)sxp->sx_fdtarget); if (!file) { error = XFS_ERROR(EINVAL); - goto out_free_sxp; + goto out; } if (!(file->f_mode & FMODE_WRITE) || (file->f_flags & O_APPEND)) { @@ -109,8 +103,6 @@ xfs_swapext( fput(target_file); out_put_file: fput(file); - out_free_sxp: - kmem_free(sxp); out: return error; } |