diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-13 22:34:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-13 22:34:14 -0700 |
| commit | a2648ebb7ed69ef209d9c8a76fadeb3252d9a023 (patch) | |
| tree | 9a8e75db208395b8de1a2e6e5045abf56e8677a0 /fs/btrfs/inode.c | |
| parent | 33c929c06eb4a483a3e4ffbff58f6e4f31ae4565 (diff) | |
| parent | 13e6c37b989859e70b0d73d3f2cb0aa022159b17 (diff) | |
| download | linux-a2648ebb7ed69ef209d9c8a76fadeb3252d9a023.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"This is an assortment of crash fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: stop all workers before cleaning up roots
Btrfs: fix use-after-free bug during umount
Btrfs: init relocate extent_io_tree with a mapping
btrfs: Drop inode if inode root is NULL
Btrfs: don't delete fs_roots until after we cleanup the transaction
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index af978f7682b3..17f3064b4a3e 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -8012,6 +8012,9 @@ int btrfs_drop_inode(struct inode *inode) { struct btrfs_root *root = BTRFS_I(inode)->root; + if (root == NULL) + return 1; + /* the snap/subvol tree is on deleting */ if (btrfs_root_refs(&root->root_item) == 0 && root != root->fs_info->tree_root) |