From 08dab29bec469d946c7cf5c9ba2083755632ba92 Mon Sep 17 00:00:00 2001
From: "Yan, Zheng" <yanzheng@21cn.com>
Date: Mon, 28 Dec 2009 05:01:58 +0000
Subject: [PATCH] --- yaml --- r: 179622 b: refs/heads/master c:
 a038fab0cb873c75d6675e2bcffce8a3935bdce7 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/fs/btrfs/ordered-data.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 995885cbc8ab..74a44ab08349 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 406266ab9ac8ed8b085c58aacd9e3161480dc5d5
+refs/heads/master: a038fab0cb873c75d6675e2bcffce8a3935bdce7
diff --git a/trunk/fs/btrfs/ordered-data.c b/trunk/fs/btrfs/ordered-data.c
index b10a49d4bc6a..5c2a9e78a949 100644
--- a/trunk/fs/btrfs/ordered-data.c
+++ b/trunk/fs/btrfs/ordered-data.c
@@ -626,6 +626,8 @@ int btrfs_ordered_update_i_size(struct inode *inode, u64 offset,
 
 	if (ordered)
 		offset = entry_end(ordered);
+	else
+		offset = ALIGN(offset, BTRFS_I(inode)->root->sectorsize);
 
 	mutex_lock(&tree->mutex);
 	disk_i_size = BTRFS_I(inode)->disk_i_size;