projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
btrfs: Make btrfs_mark_extent_written take btrfs_inode
[linux-2.6-block.git]
/
fs
/
btrfs
/
file.c
diff --git
a/fs/btrfs/file.c
b/fs/btrfs/file.c
index ef4ecd003742c62c385a0dad67aa966344d9b3b4..e704b6ce2058ff08910f610c22a7bbccb520c70c 100644
(file)
--- a/
fs/btrfs/file.c
+++ b/
fs/btrfs/file.c
@@
-1082,10
+1082,10
@@
static int extent_mergeable(struct extent_buffer *leaf, int slot,
* two or three.
*/
int btrfs_mark_extent_written(struct btrfs_trans_handle *trans,
* two or three.
*/
int btrfs_mark_extent_written(struct btrfs_trans_handle *trans,
- struct inode *inode, u64 start, u64 end)
+ struct
btrfs_
inode *inode, u64 start, u64 end)
{
{
- struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
- struct btrfs_root *root =
BTRFS_I(inode)
->root;
+ struct btrfs_fs_info *fs_info = btrfs_sb(inode->
vfs_inode.
i_sb);
+ struct btrfs_root *root =
inode
->root;
struct extent_buffer *leaf;
struct btrfs_path *path;
struct btrfs_file_extent_item *fi;
struct extent_buffer *leaf;
struct btrfs_path *path;
struct btrfs_file_extent_item *fi;
@@
-1102,7
+1102,7
@@
int btrfs_mark_extent_written(struct btrfs_trans_handle *trans,
int del_slot = 0;
int recow;
int ret;
int del_slot = 0;
int recow;
int ret;
- u64 ino = btrfs_ino(
BTRFS_I(inode)
);
+ u64 ino = btrfs_ino(
inode
);
path = btrfs_alloc_path();
if (!path)
path = btrfs_alloc_path();
if (!path)