summaryrefslogtreecommitdiffstats
path: root/fs/logfs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2010-06-04 11:30:03 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2010-08-09 16:47:38 -0400
commitdb78b877f7744bec4a9d9f9e7d10da3931d7cd39 (patch)
treefd9ee2fbe0998218b6d90322f85b285887e6fe9d /fs/logfs
parent1025774ce411f2bd4b059ad7b53f0003569b74fa (diff)
downloadlinux-stable-db78b877f7744bec4a9d9f9e7d10da3931d7cd39.tar.gz
linux-stable-db78b877f7744bec4a9d9f9e7d10da3931d7cd39.tar.bz2
linux-stable-db78b877f7744bec4a9d9f9e7d10da3931d7cd39.zip
always call inode_change_ok early in ->setattr
Make sure we call inode_change_ok before doing any changes in ->setattr, and make sure to call it even if our fs wants to ignore normal UNIX permissions, but use the ATTR_FORCE to skip those. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/logfs')
-rw-r--r--fs/logfs/file.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/logfs/file.c b/fs/logfs/file.c
index 23b4d03bbd26..4dd0f7c06e39 100644
--- a/fs/logfs/file.c
+++ b/fs/logfs/file.c
@@ -232,16 +232,16 @@ static int logfs_setattr(struct dentry *dentry, struct iattr *attr)
struct inode *inode = dentry->d_inode;
int err = 0;
+ err = inode_change_ok(inode, attr);
+ if (err)
+ return err;
+
if (attr->ia_valid & ATTR_SIZE) {
err = logfs_truncate(inode, attr->ia_size);
if (err)
return err;
}
- err = inode_change_ok(inode, attr);
- if (err)
- return err;
-
setattr_copy(inode, attr);
mark_inode_dirty(inode);
return 0;