diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-22 09:08:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-22 09:08:38 -0700 |
| commit | 21c730d7347126886c40453feb973161f4ae3fb3 (patch) | |
| tree | 58a90e5a1f4e322d2933e058454b8fa867be6d67 /fs/btrfs/Kconfig | |
| parent | c92f0380673bd295c9ac73030a17c16b9df3e702 (diff) | |
| parent | 373c3b80e459cb57c34381b928588a3794eb5bbd (diff) | |
Merge tag 'for-5.3-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fixes from David Sterba:
- fixes for leaks caused by recently merged patches
- one build fix
- a fix to prevent mixing of incompatible features
* tag 'for-5.3-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
btrfs: don't leak extent_map in btrfs_get_io_geometry()
btrfs: free checksum hash on in close_ctree
btrfs: Fix build error while LIBCRC32C is module
btrfs: inode: Don't compress if NODATASUM or NODATACOW set
Diffstat (limited to 'fs/btrfs/Kconfig')
| -rw-r--r-- | fs/btrfs/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/Kconfig b/fs/btrfs/Kconfig index 212b4a854f2c..38651fae7f21 100644 --- a/fs/btrfs/Kconfig +++ b/fs/btrfs/Kconfig @@ -4,6 +4,7 @@ config BTRFS_FS tristate "Btrfs filesystem support" select CRYPTO select CRYPTO_CRC32C + select LIBCRC32C select ZLIB_INFLATE select ZLIB_DEFLATE select LZO_COMPRESS |