diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-11 14:19:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-11 14:19:02 -0700 |
| commit | 2d06b235815e6bd20395f3db9ada786a6f7a876e (patch) | |
| tree | 38dd49f6dabc62a8daa8c59243f148c955a7bc56 /fs/ceph/inode.c | |
| parent | 582549e3fbe137eb6ce9be591aca25c2222a36b4 (diff) | |
| parent | 272e5326c7837697882ce3162029ba893059b616 (diff) | |
| download | linux-2d06b235815e6bd20395f3db9ada786a6f7a876e.tar.bz2 | |
Merge tag 'for-5.1-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fixes from David Sterba:
- fix parsing of compression algorithm when set as a inode property,
this could end up with eg. 'zst' or 'zli' in the value
- don't allow trim on a filesystem with unreplayed log, this could
cause data loss if there are pending updates to the block groups that
would not be subject to trim after replay
* tag 'for-5.1-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
btrfs: prop: fix vanished compression property after failed set
btrfs: prop: fix zstd compression parameter validation
Btrfs: do not allow trimming when a fs is mounted with the nologreplay option
Diffstat (limited to 'fs/ceph/inode.c')
0 files changed, 0 insertions, 0 deletions