From 6db9889df1104b983f1944014d11bd82e99b2161 Mon Sep 17 00:00:00 2001 From: Wengang Wang Date: Fri, 26 Feb 2010 18:18:25 +0800 Subject: [PATCH] --- yaml --- r: 185466 b: refs/heads/master c: 5051f76883897ea3d3d034c92e7b84236da2ec57 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/file.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1fe40ce24b25..4db6c968ba11 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6fcef3f04a1a0f8d7a086147d2f2e650c8cc2754 +refs/heads/master: 5051f76883897ea3d3d034c92e7b84236da2ec57 diff --git a/trunk/fs/ocfs2/file.c b/trunk/fs/ocfs2/file.c index c8a4a2939e55..5b52547d6299 100644 --- a/trunk/fs/ocfs2/file.c +++ b/trunk/fs/ocfs2/file.c @@ -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)) {