浏览代码

simple_write_end(): don't zero in short copy into uptodate

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Al Viro 9 年之前
父节点
当前提交
04fff6416c
共有 1 个文件被更改,包括 8 次插入6 次删除
  1. 8 6
      fs/libfs.c

+ 8 - 6
fs/libfs.c

@@ -465,6 +465,8 @@ EXPORT_SYMBOL(simple_write_begin);
  * is not called, so a filesystem that actually does store data in .write_inode
  * is not called, so a filesystem that actually does store data in .write_inode
  * should extend on what's done here with a call to mark_inode_dirty() in the
  * should extend on what's done here with a call to mark_inode_dirty() in the
  * case that i_size has changed.
  * case that i_size has changed.
+ *
+ * Use *ONLY* with simple_readpage()
  */
  */
 int simple_write_end(struct file *file, struct address_space *mapping,
 int simple_write_end(struct file *file, struct address_space *mapping,
 			loff_t pos, unsigned len, unsigned copied,
 			loff_t pos, unsigned len, unsigned copied,
@@ -474,14 +476,14 @@ int simple_write_end(struct file *file, struct address_space *mapping,
 	loff_t last_pos = pos + copied;
 	loff_t last_pos = pos + copied;
 
 
 	/* zero the stale part of the page if we did a short copy */
 	/* zero the stale part of the page if we did a short copy */
-	if (copied < len) {
-		unsigned from = pos & (PAGE_SIZE - 1);
-
-		zero_user(page, from + copied, len - copied);
-	}
+	if (!PageUptodate(page)) {
+		if (copied < len) {
+			unsigned from = pos & (PAGE_SIZE - 1);
 
 
-	if (!PageUptodate(page))
+			zero_user(page, from + copied, len - copied);
+		}
 		SetPageUptodate(page);
 		SetPageUptodate(page);
+	}
 	/*
 	/*
 	 * No need to use i_size_read() here, the i_size
 	 * No need to use i_size_read() here, the i_size
 	 * cannot change under us because we hold the i_mutex.
 	 * cannot change under us because we hold the i_mutex.