summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Brandenburg <martin@omnibond.com>2017-04-25 15:38:04 -0400
committerMike Marshall <hubcap@omnibond.com>2017-04-26 14:33:00 -0400
commit53950ef541675df48c219a8d665111a0e68dfc2f (patch)
tree5234b4d30b50d3a1991a35531e2c408a4a16be6b
parent68a24a6cc4a6025e111c282186a2506281d79b4b (diff)
downloadop-kernel-dev-53950ef541675df48c219a8d665111a0e68dfc2f.zip
op-kernel-dev-53950ef541675df48c219a8d665111a0e68dfc2f.tar.gz
orangefs: do not check possibly stale size on truncate
Let the server figure this out because our size might be out of date or not present. The bug was that xfs_io -f -t -c "pread -v 0 100" /mnt/foo echo "Test" > /mnt/foo xfs_io -f -t -c "pread -v 0 100" /mnt/foo fails because the second truncate did not happen if nothing had requested the size after the write in echo. Thus i_size was zero (not present) and the orangefs_setattr though i_size was zero and there was nothing to do. Signed-off-by: Martin Brandenburg <martin@omnibond.com> Cc: stable@vger.kernel.org Signed-off-by: Mike Marshall <hubcap@omnibond.com>
-rw-r--r--fs/orangefs/inode.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c
index 8baf545..9428ea0 100644
--- a/fs/orangefs/inode.c
+++ b/fs/orangefs/inode.c
@@ -218,8 +218,7 @@ int orangefs_setattr(struct dentry *dentry, struct iattr *iattr)
if (ret)
goto out;
- if ((iattr->ia_valid & ATTR_SIZE) &&
- iattr->ia_size != i_size_read(inode)) {
+ if (iattr->ia_valid & ATTR_SIZE) {
ret = orangefs_setattr_size(inode, iattr);
if (ret)
goto out;
OpenPOWER on IntegriCloud