Commit 13d1ea9a 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: check if device support discard in xfs_ioc_trim()
  xfs: prevent leaking uninitialized stack memory in FSGEOMETRY_V1
parents f19e0eec be715140

fs/xfs/linux-2.6/xfs_discard.c

+2 −0
Original line number Diff line number Diff line
@@ -152,6 +152,8 @@ xfs_ioc_trim( 


	if (!capable(CAP_SYS_ADMIN))

		return -XFS_ERROR(EPERM);

	if (!blk_queue_discard(q))

		return -XFS_ERROR(EOPNOTSUPP);

	if (copy_from_user(&range, urange, sizeof(range)))

		return -XFS_ERROR(EFAULT);

fs/xfs/xfs_fsops.c

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ xfs_fs_geometry( 
	xfs_fsop_geom_t		*geo,

	int			new_version)

{



	memset(geo, 0, sizeof(*geo));



	geo->blocksize = mp->m_sb.sb_blocksize;

	geo->rtextsize = mp->m_sb.sb_rextsize;

	geo->agblocks = mp->m_sb.sb_agblocks;