---

yaml --- r: 217475 b: refs/heads/master c: 0116651 h: refs/heads/master i: 217473: 48e0b34 217471: 094a9c4 v: v3
git-mirror · Oct 26, 2010 · 1d61bf7 · 1d61bf7
1 parent eb31f1b
commit 1d61bf7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68da336a14e16c2de95e987f3200995b707d7038
+refs/heads/master: 0116651c85e671a693dd2f56e95dd651f746c973
diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c
@@ -2193,12 +2193,12 @@ generic_file_direct_write(struct kiocb *iocb, const struct iovec *iov,
 	}
 
 	if (written > 0) {
-		loff_t end = pos + written;
-		if (end > i_size_read(inode) && !S_ISBLK(inode->i_mode)) {
-			i_size_write(inode,  end);
+		pos += written;
+		if (pos > i_size_read(inode) && !S_ISBLK(inode->i_mode)) {
+			i_size_write(inode, pos);
 			mark_inode_dirty(inode);
 		}
-		*ppos = end;
+		*ppos = pos;
 	}
 out:
 	return written;