Эх сурвалжийг харах

[JFFS2] Set i_blocks when truncating files

Addresses OLPC trac #6480

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
David Woodhouse 17 жил өмнө
parent
commit
b28ba9fa01
1 өөрчлөгдсөн 5 нэмэгдсэн , 2 устгасан
  1. 5 2
      fs/jffs2/fs.c

+ 5 - 2
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) {
 	if (ivalid & ATTR_SIZE && inode->i_size < iattr->ia_size) {
 		jffs2_add_full_dnode_to_inode(c, f, new_metadata);
 		jffs2_add_full_dnode_to_inode(c, f, new_metadata);
 		inode->i_size = iattr->ia_size;
 		inode->i_size = iattr->ia_size;
+		inode->i_blocks = (inode->i_size + 511) >> 9;
 		f->metadata = NULL;
 		f->metadata = NULL;
 	} else {
 	} else {
 		f->metadata = new_metadata;
 		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
 	   We are protected from a simultaneous write() extending i_size
 	   back past iattr->ia_size, because do_truncate() holds the
 	   back past iattr->ia_size, because do_truncate() holds the
 	   generic inode semaphore. */
 	   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;
 	return 0;
 }
 }