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

Commit e94af02a authored by Eric Sandeen's avatar Eric Sandeen Committed by Nathan Scott
Browse files

[XFS] fix old xfs_setattr mis-merge from irix; mostly harmless esp if not 


using xfs rt

SGI-PV: 944632
SGI-Modid: xfs-linux:xfs-kern:200983a

Signed-off-by: default avatarEric Sandeen <sandeen@sgi.com>
Signed-off-by: default avatarNathan Scott <nathans@sgi.com>
parent 91e11088

fs/xfs/xfs_vnodeops.c

+3 −3
Original line number Diff line number Diff line
@@ -533,8 +533,7 @@ xfs_setattr( 
		/*

		 * Can't change extent size if any extents are allocated.

		 */

		if ((ip->i_d.di_nextents || ip->i_delayed_blks) &&

		    (mask & XFS_AT_EXTSIZE) &&

		if (ip->i_d.di_nextents && (mask & XFS_AT_EXTSIZE) &&

		    ((ip->i_d.di_extsize << mp->m_sb.sb_blocklog) !=

		     vap->va_extsize) ) {

			code = XFS_ERROR(EINVAL);	/* EFBIG? */
@@ -562,7 +561,8 @@ xfs_setattr( 
		/*

		 * Can't change realtime flag if any extents are allocated.

		 */

		if (ip->i_d.di_nextents && (mask & XFS_AT_XFLAGS) &&

		if ((ip->i_d.di_nextents || ip->i_delayed_blks) &&

		    (mask & XFS_AT_XFLAGS) &&

		    (ip->i_d.di_flags & XFS_DIFLAG_REALTIME) !=

		    (vap->va_xflags & XFS_XFLAG_REALTIME)) {

			code = XFS_ERROR(EINVAL);	/* EFBIG? */