diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-16 03:08:35 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-16 03:08:35 +0200 |
commit | e37563bb6c59a6948aa09beb77ba263600d19792 (patch) | |
tree | 2e59d5bfafb1d90a63192710da7c3ad998330bd3 /fs/btrfs/export.h | |
parent | Merge tag '4.17-rc1SMB3-Fixes' of git://git.samba.org/sfrench/cifs-2.6 (diff) | |
parent | btrfs: Only check first key for committed tree blocks (diff) | |
download | linux-e37563bb6c59a6948aa09beb77ba263600d19792.tar.xz linux-e37563bb6c59a6948aa09beb77ba263600d19792.zip |
Merge tag 'for-4.17-part2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull more btrfs updates from David Sterba:
"We have queued a few more fixes (error handling, log replay,
softlockup) and the rest is SPDX updates that touche almost all files
so the diffstat is long"
* tag 'for-4.17-part2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
btrfs: Only check first key for committed tree blocks
btrfs: add SPDX header to Kconfig
btrfs: replace GPL boilerplate by SPDX -- sources
btrfs: replace GPL boilerplate by SPDX -- headers
Btrfs: fix loss of prealloc extents past i_size after fsync log replay
Btrfs: clean up resources during umount after trans is aborted
btrfs: Fix possible softlock on single core machines
Btrfs: bail out on error during replay_dir_deletes
Btrfs: fix NULL pointer dereference in log_dir_items
Diffstat (limited to 'fs/btrfs/export.h')
-rw-r--r-- | fs/btrfs/export.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/export.h b/fs/btrfs/export.h index 91b3908e7c54..57488ecd7d4e 100644 --- a/fs/btrfs/export.h +++ b/fs/btrfs/export.h @@ -1,4 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ + #ifndef BTRFS_EXPORT_H #define BTRFS_EXPORT_H |