From 98e9978d8a4d96e32649b5fc4d763c81d16778c8 Mon Sep 17 00:00:00 2001
From: Yan <yanzheng@21cn.com>
Date: Wed, 30 Jan 2008 11:54:04 -0500
Subject: [PATCH] --- yaml --- r: 128638 b: refs/heads/master c:
 b1632b10c0133992fd0290b4836c47661bed4396 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 8e8643e086c0..15484e81e5d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a01a2e3a9d4dc9cb4871dde4d832a3b8de9f748
+refs/heads/master: b1632b10c0133992fd0290b4836c47661bed4396
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index 5a38443a24ee..de17c61dfa0a 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -823,6 +823,8 @@ static int btrfs_truncate_in_trans(struct btrfs_trans_handle *trans,
 					btrfs_file_extent_num_bytes(leaf, fi);
 				extent_num_bytes = inode->i_size -
 					found_key.offset + root->sectorsize - 1;
+				extent_num_bytes = extent_num_bytes &
+					~((u64)root->sectorsize - 1);
 				btrfs_set_file_extent_num_bytes(leaf, fi,
 							 extent_num_bytes);
 				num_dec = (orig_num_bytes -