---

yaml --- r: 128527 b: refs/heads/master c: dcfec0d h: refs/heads/master i: 128525: f00bad9 128523: aa05919 128519: 6ab19c1 128511: 6650f35 v: v3
git-mirror · Sep 25, 2008 · 1e0d32d · 1e0d32d
1 parent 6f6b6bc
commit 1e0d32d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 081e95736d9118a96e9f6dcc5cec02dc75c9e1cb
+refs/heads/master: dcfec0dcb1b1a037fb26177789e8f108bc429cb3
diff --git a/trunk/fs/btrfs/file.c b/trunk/fs/btrfs/file.c
@@ -239,9 +239,8 @@ static int dirty_and_release_pages(struct btrfs_trans_handle *trans,
 	u64 start_pos;
 	u64 end_of_last_block;
 	u64 end_pos = pos + write_bytes;
-	u32 inline_size;
+	u64 inline_size;
 	loff_t isize = i_size_read(inode);
-
 	em = alloc_extent_map(GFP_NOFS);
 	if (!em)
 		return -ENOMEM;
@@ -328,9 +327,11 @@ static int dirty_and_release_pages(struct btrfs_trans_handle *trans,
 					 aligned_end, aligned_end, &hint_byte);
 		if (err)
 			goto failed;
+		if (isize > inline_size)
+			inline_size = min_t(u64, isize, aligned_end);
+		inline_size -= start_pos;
 		err = insert_inline_extent(trans, root, inode, start_pos,
-					   end_pos - start_pos, pages, 0,
-					   num_pages);
+					   inline_size, pages, 0, num_pages);
 		BUG_ON(err);
 	}
 	if (end_pos > isize) {