---

yaml --- r: 254591 b: refs/heads/master c: d7f124f h: refs/heads/master i: 254589: 8d7a6a8 254587: 1da639e 254583: 194d458 254575: a699762 254559: d0c8659 254527: c6afc74 254463: 5f432e8 v: v3
git-mirror · Jun 13, 2011 · b32d156 · b32d156
1 parent 17cc6c9
commit b32d156
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9bb0ce2b0b734f3325ea5cd6b351856eeac94f78
+refs/heads/master: d7f124f129a6aea99938e0d4172c741b56fefeda
diff --git a/trunk/fs/ceph/file.c b/trunk/fs/ceph/file.c
@@ -476,9 +476,6 @@ static ssize_t ceph_sync_write(struct file *file, const char __user *data,
 	else
 		pos = *offset;
 
-	io_align = pos & ~PAGE_MASK;
-	buf_align = (unsigned long)data & ~PAGE_MASK;
-
 	ret = filemap_write_and_wait_range(inode->i_mapping, pos, pos + left);
 	if (ret < 0)
 		return ret;
@@ -502,6 +499,8 @@ static ssize_t ceph_sync_write(struct file *file, const char __user *data,
 	 * boundary.  this isn't atomic, unfortunately.  :(
 	 */
 more:
+	io_align = pos & ~PAGE_MASK;
+	buf_align = (unsigned long)data & ~PAGE_MASK;
 	len = left;
 	if (file->f_flags & O_DIRECT) {
 		/* write from beginning of first page, regardless of
@@ -591,6 +590,7 @@ static ssize_t ceph_sync_write(struct file *file, const char __user *data,
 		pos += len;
 		written += len;
 		left -= len;
+		data += written;
 		if (left)
 			goto more;