Skip to content

L
linux
Commit 52e012b5 authored by Charles Fumuso's avatar Charles Fumuso Committed by Christoph Hellwig
Browse files
Options

[XFS] Merge over an irix fix 

SGI Modid: 2.5.x-xfs:slinx:132737a
parent b2677e18
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
fs/xfs/xfs_vnodeops.c
View file @ 52e012b5
...@@ -658,7 +658,7 @@ xfs_setattr( ...@@ -658,7 +658,7 @@ xfs_setattr(
if (vap->va_size > ip->i_d.di_size) { if (vap->va_size > ip->i_d.di_size) {
code = xfs_igrow_start(ip, vap->va_size, credp); code = xfs_igrow_start(ip, vap->va_size, credp);
xfs_iunlock(ip, XFS_ILOCK_EXCL); xfs_iunlock(ip, XFS_ILOCK_EXCL);
} else if (vap->va_size < ip->i_d.di_size) { } else if (vap->va_size <= ip->i_d.di_size) {
xfs_iunlock(ip, XFS_ILOCK_EXCL); xfs_iunlock(ip, XFS_ILOCK_EXCL);
xfs_itruncate_start(ip, XFS_ITRUNC_DEFINITE, xfs_itruncate_start(ip, XFS_ITRUNC_DEFINITE,
(xfs_fsize_t)vap->va_size); (xfs_fsize_t)vap->va_size);
...@@ -701,7 +701,7 @@ xfs_setattr( ...@@ -701,7 +701,7 @@ xfs_setattr(
if (vap->va_size > ip->i_d.di_size) { if (vap->va_size > ip->i_d.di_size) {
xfs_igrow_finish(tp, ip, vap->va_size, xfs_igrow_finish(tp, ip, vap->va_size,
!(flags & ATTR_DMI)); !(flags & ATTR_DMI));
} else if ((vap->va_size < ip->i_d.di_size) || } else if ((vap->va_size <= ip->i_d.di_size) ||
((vap->va_size == 0) && ip->i_d.di_nextents)) { ((vap->va_size == 0) && ip->i_d.di_nextents)) {
/* /*
* signal a sync transaction unless * signal a sync transaction unless
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7