orangefs: truncate before updating size

Otherwise we race with orangefs_writepage/orangefs_writepages
which and does not expect i_size < page_offset.

Fixes xfstests generic/129.

Signed-off-by: Martin Brandenburg <martin@omnibond.com>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>

diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c
index 3fb671d..0c337d8 100644 (file)
--- a/fs/orangefs/inode.c
+++ b/fs/orangefs/inode.c
@@ -818,7 +818,11 @@ static int orangefs_setattr_size(struct inode *inode, struct iattr *iattr)
        }
        orig_size = i_size_read(inode);
 
-       truncate_setsize(inode, iattr->ia_size);
+       /* This is truncate_setsize in a different order. */
+       truncate_pagecache(inode, iattr->ia_size);
+       i_size_write(inode, iattr->ia_size);
+       if (iattr->ia_size > orig_size)
+               pagecache_isize_extended(inode, orig_size, iattr->ia_size);
 
        new_op = op_alloc(ORANGEFS_VFS_OP_TRUNCATE);
        if (!new_op)