From f3c2904b7ce8290011bb800d91ba52c26a413bc9 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Mon, 25 Feb 2008 15:20:50 +0000 Subject: [PATCH] --- yaml --- r: 92997 b: refs/heads/master c: b28ba9fa0154f78f3d36f5ae9a42f7bb01663cca h: refs/heads/master i: 92995: d22492cd074876d6a45abb4357ffe9290e0b9667 v: v3 --- [refs] | 2 +- trunk/fs/jffs2/fs.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d034cfeee59b..b2e5c73bbadd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66a10506d632051e1153e2555f4b2c820d427f64 +refs/heads/master: b28ba9fa0154f78f3d36f5ae9a42f7bb01663cca diff --git a/trunk/fs/jffs2/fs.c b/trunk/fs/jffs2/fs.c index e26ea78c7892..3f49562dc508 100644 --- a/trunk/fs/jffs2/fs.c +++ b/trunk/fs/jffs2/fs.c @@ -149,6 +149,7 @@ int jffs2_do_setattr (struct inode *inode, struct iattr *iattr) if (ivalid & ATTR_SIZE && inode->i_size < iattr->ia_size) { jffs2_add_full_dnode_to_inode(c, f, new_metadata); inode->i_size = iattr->ia_size; + inode->i_blocks = (inode->i_size + 511) >> 9; f->metadata = NULL; } else { f->metadata = new_metadata; @@ -167,8 +168,10 @@ int jffs2_do_setattr (struct inode *inode, struct iattr *iattr) We are protected from a simultaneous write() extending i_size back past iattr->ia_size, because do_truncate() holds the generic inode semaphore. */ - if (ivalid & ATTR_SIZE && inode->i_size > iattr->ia_size) - vmtruncate(inode, iattr->ia_size); + if (ivalid & ATTR_SIZE && inode->i_size > iattr->ia_size) { + vmtruncate(inode, iattr->ia_size); + inode->i_blocks = (inode->i_size + 511) >> 9; + } return 0; }