diff options
| author | Martin Brandenburg <martin@omnibond.com> | 2016-03-23 17:06:25 -0400 |
|---|---|---|
| committer | Mike Marshall <hubcap@omnibond.com> | 2016-03-23 17:36:16 -0400 |
| commit | fecd86aac5a7621635b61e7491f0ed73610d76fa (patch) | |
| tree | f8268df67637c7eee0d2d84b531006849880b4ef /fs/orangefs | |
| parent | e8da254c415475d3df67966a198523bfe3ac0576 (diff) | |
| download | linux-stable-fecd86aac5a7621635b61e7491f0ed73610d76fa.tar.gz linux-stable-fecd86aac5a7621635b61e7491f0ed73610d76fa.tar.bz2 linux-stable-fecd86aac5a7621635b61e7491f0ed73610d76fa.zip | |
ornagefs: ensure that truncate has an up to date inode size
Signed-off-by: Martin Brandenburg <martin@omnibond.com>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
Diffstat (limited to 'fs/orangefs')
| -rw-r--r-- | fs/orangefs/inode.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c index 2e521ec734c4..2382e267b49e 100644 --- a/fs/orangefs/inode.c +++ b/fs/orangefs/inode.c @@ -157,7 +157,7 @@ static int orangefs_setattr_size(struct inode *inode, struct iattr *iattr) { struct orangefs_inode_s *orangefs_inode = ORANGEFS_I(inode); struct orangefs_kernel_op_s *new_op; - loff_t orig_size = i_size_read(inode); + loff_t orig_size; int ret = -EINVAL; gossip_debug(GOSSIP_INODE_DEBUG, @@ -168,6 +168,17 @@ static int orangefs_setattr_size(struct inode *inode, struct iattr *iattr) orangefs_inode->refn.fs_id, iattr->ia_size); + /* Ensure that we have a up to date size, so we know if it changed. */ + ret = orangefs_inode_getattr(inode, 0, 1); + if (ret == -ESTALE) + ret = -EIO; + if (ret) { + gossip_err("%s: orangefs_inode_getattr failed, ret:%d:.\n", + __func__, ret); + return ret; + } + orig_size = i_size_read(inode); + truncate_setsize(inode, iattr->ia_size); new_op = op_alloc(ORANGEFS_VFS_OP_TRUNCATE); |