diff options
author | Chris Mason <chris.mason@oracle.com> | 2012-03-28 20:32:46 -0400 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2012-03-28 20:32:46 -0400 |
commit | 1c691b330a19a1344df89bcb0f4cacd99e8b289a (patch) | |
tree | b3143a9875a773d33b9b8f60e98c7e5fae003b6a /fs/btrfs/backref.c | |
parent | 1d4284bd6e8d7dd1d5521a6747bdb6dc1caf0225 (diff) | |
parent | 213e64da90d14537cd63f7090d6c4d1fcc75d9f8 (diff) |
Merge branch 'for-chris' of git://github.com/idryomov/btrfs-unstable into for-linus
Diffstat (limited to 'fs/btrfs/backref.c')
-rw-r--r-- | fs/btrfs/backref.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c index 0436c12da8c2..4c79547f4a0c 100644 --- a/fs/btrfs/backref.c +++ b/fs/btrfs/backref.c | |||
@@ -1342,12 +1342,6 @@ int paths_from_inode(u64 inum, struct inode_fs_paths *ipath) | |||
1342 | inode_to_path, ipath); | 1342 | inode_to_path, ipath); |
1343 | } | 1343 | } |
1344 | 1344 | ||
1345 | /* | ||
1346 | * allocates space to return multiple file system paths for an inode. | ||
1347 | * total_bytes to allocate are passed, note that space usable for actual path | ||
1348 | * information will be total_bytes - sizeof(struct inode_fs_paths). | ||
1349 | * the returned pointer must be freed with free_ipath() in the end. | ||
1350 | */ | ||
1351 | struct btrfs_data_container *init_data_container(u32 total_bytes) | 1345 | struct btrfs_data_container *init_data_container(u32 total_bytes) |
1352 | { | 1346 | { |
1353 | struct btrfs_data_container *data; | 1347 | struct btrfs_data_container *data; |
@@ -1403,5 +1397,6 @@ struct inode_fs_paths *init_ipath(s32 total_bytes, struct btrfs_root *fs_root, | |||
1403 | 1397 | ||
1404 | void free_ipath(struct inode_fs_paths *ipath) | 1398 | void free_ipath(struct inode_fs_paths *ipath) |
1405 | { | 1399 | { |
1400 | kfree(ipath->fspath); | ||
1406 | kfree(ipath); | 1401 | kfree(ipath); |
1407 | } | 1402 | } |