---

yaml --- r: 128341 b: refs/heads/master c: 48ddc6f h: refs/heads/master i: 128339: 58f4413 v: v3
git-mirror · Apr 10, 2007 · c11cc42 · c11cc42
1 parent 900c472
commit c11cc42
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0dbc6245cefa36e19dff49c557ccf05e3063e9c
+refs/heads/master: 48ddc6f44b5a167c00573b6012727d674e9c667a
diff --git a/trunk/fs/btrfs/super.c b/trunk/fs/btrfs/super.c
@@ -1020,7 +1020,7 @@ static int btrfs_get_block_lock(struct inode *inode, sector_t iblock,
 
 	ret = btrfs_lookup_file_extent(trans, root, path,
 				       inode->i_ino,
-				       iblock << inode->i_blkbits, 0);
+				       iblock << inode->i_blkbits, 1);
 	if (ret < 0) {
 		err = ret;
 		goto out;
@@ -1040,9 +1040,25 @@ static int btrfs_get_block_lock(struct inode *inode, sector_t iblock,
 	blocknr = btrfs_file_extent_disk_blocknr(item);
 	blocknr += btrfs_file_extent_offset(item);
 
-	/* exact match found, use it */
+	/* exact match found, use it, FIXME, deal with extents
+	 * other than the page size
+	 */
 	if (ret == 0) {
 		err = 0;
+		BUG_ON(btrfs_file_extent_disk_num_blocks(item) != 1);
+		if (btrfs_file_extent_generation(item) != trans->transid) {
+			struct btrfs_key ins;
+			ret = btrfs_alloc_extent(trans, root, 1,
+						 blocknr, (u64)-1, &ins);
+			BUG_ON(ret);
+			btrfs_set_file_extent_disk_blocknr(item, ins.objectid);
+			mark_buffer_dirty(path->nodes[0]);
+			ret = btrfs_free_extent(trans, root,
+						blocknr, 1, 0);
+			BUG_ON(ret);
+			blocknr = ins.objectid;
+
+		}
 		map_bh(result, inode->i_sb, blocknr);
 		goto out;
 	}