diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-22 20:42:42 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-22 20:42:42 -1000 |
| commit | 3f3211e755f329c56acf55faa0dbf91befd7b5ca (patch) | |
| tree | 786ef2efaee7f25657d31129eb6dda0827afbcf3 /fs/xfs/libxfs/xfs_iext_tree.c | |
| parent | 275327851e5c3e71bc73eaee7f065f22b2d1fe6c (diff) | |
| parent | 274e0a1f4777b9362fc03a34e86358cc36003e48 (diff) | |
Merge tag 'xfs-4.15-merge-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
Pull xfs fixes from Darrick Wong:
- Fix a memory leak in the new in-core extent map
- Refactor the xfs_dev_t conversions for easier xfsprogs porting
* tag 'xfs-4.15-merge-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
xfs: abstract out dev_t conversions
xfs: fix memory leak in xfs_iext_free_last_leaf
Diffstat (limited to 'fs/xfs/libxfs/xfs_iext_tree.c')
| -rw-r--r-- | fs/xfs/libxfs/xfs_iext_tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/libxfs/xfs_iext_tree.c b/fs/xfs/libxfs/xfs_iext_tree.c index 19e546a41251..89bf16b4d937 100644 --- a/fs/xfs/libxfs/xfs_iext_tree.c +++ b/fs/xfs/libxfs/xfs_iext_tree.c @@ -850,9 +850,9 @@ static void xfs_iext_free_last_leaf( struct xfs_ifork *ifp) { - ifp->if_u1.if_root = NULL; ifp->if_height--; kmem_free(ifp->if_u1.if_root); + ifp->if_u1.if_root = NULL; } void |