Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac12b4e2 authored by Eric Sandeen's avatar Eric Sandeen Committed by Felix Blyakher
Browse files

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 743bb465

This was an embarrasing mistake, reallocating the sxp pointer passed
in from the main ioctl switch.

Signed-off-by: default avatarEric Sandeen <sandeen@sandeen.net>
Reported-by: default avatarPaul Martin <pm@debian.org>
Tested-by: default avatarPaul Martin <pm@debian.org>
Reviewed-by: default avatarFelix Blyakher <felixb@sgi.com>
Signed-off-by: default avatarFelix Blyakher <felixb@sgi.com>
parent 5e106572

fs/xfs/xfs_dfrag.c

+1 −9
Original line number Diff line number Diff line
@@ -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;

}