Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 185466
b: refs/heads/master
c: 5051f76
h: refs/heads/master
v: v3
  • Loading branch information
Wengang Wang authored and Joel Becker committed Feb 28, 2010
1 parent 4263692 commit 6db9889
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6fcef3f04a1a0f8d7a086147d2f2e650c8cc2754
refs/heads/master: 5051f76883897ea3d3d034c92e7b84236da2ec57
5 changes: 2 additions & 3 deletions trunk/fs/ocfs2/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -993,10 +993,9 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr)
}

if (size_change && attr->ia_size != i_size_read(inode)) {
if (attr->ia_size > sb->s_maxbytes) {
status = -EFBIG;
status = inode_newsize_ok(inode, attr->ia_size);
if (status)
goto bail_unlock;
}

if (i_size_read(inode) > attr->ia_size) {
if (ocfs2_should_order_data(inode)) {
Expand Down

0 comments on commit 6db9889

Please sign in to comment.