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

Commit 4157fd85 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs 

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: prevent deadlock in xfs_qm_shake()
  xfs: fix overflow in xfs_growfs_data_private
  xfs: fix double unlock in xfs_swap_extents()
parents e7c4f03b 1b17d766

fs/xfs/linux-2.6/kmem.h

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ extern void *kmem_zone_zalloc(kmem_zone_t *, unsigned int __nocast); 
static inline int

kmem_shake_allow(gfp_t gfp_mask)

{

	return (gfp_mask & __GFP_WAIT) != 0;

	return ((gfp_mask & __GFP_WAIT) && (gfp_mask & __GFP_FS));

}



#endif /* __XFS_SUPPORT_KMEM_H__ */

fs/xfs/xfs_dfrag.c

+5 −3
Original line number Diff line number Diff line
@@ -347,13 +347,15 @@ xfs_swap_extents( 


	error = xfs_trans_commit(tp, XFS_TRANS_SWAPEXT);



out_unlock:

	xfs_iunlock(ip,  XFS_ILOCK_EXCL | XFS_IOLOCK_EXCL);

	xfs_iunlock(tip, XFS_ILOCK_EXCL | XFS_IOLOCK_EXCL);

out:

	kmem_free(tempifp);

	return error;



out_unlock:

	xfs_iunlock(ip,  XFS_ILOCK_EXCL | XFS_IOLOCK_EXCL);

	xfs_iunlock(tip, XFS_ILOCK_EXCL | XFS_IOLOCK_EXCL);

	goto out;



out_trans_cancel:

	xfs_trans_cancel(tp, 0);

	goto out_unlock;

fs/xfs/xfs_fsops.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ xfs_growfs_data_private( 
	nagcount = new + (nb_mod != 0);

	if (nb_mod && nb_mod < XFS_MIN_AG_BLOCKS) {

		nagcount--;

		nb = nagcount * mp->m_sb.sb_agblocks;

		nb = (xfs_rfsblock_t)nagcount * mp->m_sb.sb_agblocks;

		if (nb < mp->m_sb.sb_dblocks)

			return XFS_ERROR(EINVAL);

	}