diff options
| author | Chris Mason <chris.mason@oracle.com> | 2012-03-29 02:32:46 +0200 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2012-03-29 02:32:46 +0200 |
| commit | 1c691b330a19a1344df89bcb0f4cacd99e8b289a (patch) | |
| tree | b3143a9875a773d33b9b8f60e98c7e5fae003b6a /fs/btrfs/backref.c | |
| parent | Merge branch 'error-handling' into for-linus (diff) | |
| parent | Btrfs: fix infinite loop in btrfs_shrink_device() (diff) | |
| download | linux-1c691b330a19a1344df89bcb0f4cacd99e8b289a.tar.xz linux-1c691b330a19a1344df89bcb0f4cacd99e8b289a.zip | |
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) inode_to_path, ipath); } -/* - * allocates space to return multiple file system paths for an inode. - * total_bytes to allocate are passed, note that space usable for actual path - * information will be total_bytes - sizeof(struct inode_fs_paths). - * the returned pointer must be freed with free_ipath() in the end. - */ struct btrfs_data_container *init_data_container(u32 total_bytes) { struct btrfs_data_container *data; @@ -1403,5 +1397,6 @@ struct inode_fs_paths *init_ipath(s32 total_bytes, struct btrfs_root *fs_root, void free_ipath(struct inode_fs_paths *ipath) { + kfree(ipath->fspath); kfree(ipath); } |