diff options
author | Christoph Hellwig <hch@lst.de> | 2010-06-04 05:30:04 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-08-09 16:47:39 -0400 |
commit | 2c27c65ed0696f0b5df2dad2cf6462d72164d547 (patch) | |
tree | 7d9036e3dea98938f7fd7074366ee73929e9b2e5 /fs/gfs2/aops.c | |
parent | db78b877f7744bec4a9d9f9e7d10da3931d7cd39 (diff) |
check ATTR_SIZE contraints in inode_change_ok
Make sure we check the truncate constraints early on in ->setattr by adding
those checks to inode_change_ok. Also clean up and document inode_change_ok
to make this obvious.
As a fallout we don't have to call inode_newsize_ok from simple_setsize and
simplify it down to a truncate_setsize which doesn't return an error. This
simplifies a lot of setattr implementations and means we use truncate_setsize
almost everywhere. Get rid of fat_setsize now that it's trivial and mark
ext2_setsize static to make the calling convention obvious.
Keep the inode_newsize_ok in vmtruncate for now as all callers need an
audit for its removal anyway.
Note: setattr code in ecryptfs doesn't call inode_change_ok at all and
needs a deeper audit, but that is left for later.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/gfs2/aops.c')
-rw-r--r-- | fs/gfs2/aops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c index 703000d6e4d2..54fe087bf54c 100644 --- a/fs/gfs2/aops.c +++ b/fs/gfs2/aops.c | |||
@@ -702,12 +702,12 @@ out: | |||
702 | page_cache_release(page); | 702 | page_cache_release(page); |
703 | 703 | ||
704 | /* | 704 | /* |
705 | * XXX(hch): the call below should probably be replaced with | 705 | * XXX(truncate): the call below should probably be replaced with |
706 | * a call to the gfs2-specific truncate blocks helper to actually | 706 | * a call to the gfs2-specific truncate blocks helper to actually |
707 | * release disk blocks.. | 707 | * release disk blocks.. |
708 | */ | 708 | */ |
709 | if (pos + len > ip->i_inode.i_size) | 709 | if (pos + len > ip->i_inode.i_size) |
710 | simple_setsize(&ip->i_inode, ip->i_inode.i_size); | 710 | truncate_setsize(&ip->i_inode, ip->i_inode.i_size); |
711 | out_endtrans: | 711 | out_endtrans: |
712 | gfs2_trans_end(sdp); | 712 | gfs2_trans_end(sdp); |
713 | out_trans_fail: | 713 | out_trans_fail: |