diff options
| author | Eric Sandeen <sandeen@sgi.com> | 2005-11-02 15:10:41 +1100 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2005-11-02 15:10:41 +1100 |
| commit | e94af02a9cd7b6590bec81df9d6ab857d6cf322f (patch) | |
| tree | 32b9f0f93eb3f357cae54c4bd6c2578c244acb16 /fs | |
| parent | 91e11088f88e07f5f42c88608329bc0756c183f9 (diff) | |
| download | linux-stable-e94af02a9cd7b6590bec81df9d6ab857d6cf322f.tar.gz linux-stable-e94af02a9cd7b6590bec81df9d6ab857d6cf322f.tar.bz2 linux-stable-e94af02a9cd7b6590bec81df9d6ab857d6cf322f.zip | |
[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: Eric Sandeen <sandeen@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/xfs/xfs_vnodeops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c index b564c1b25e5e..7c1f74531463 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c @@ -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? */ |