diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-15 18:08:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-15 18:08:35 -0700 |
| commit | e37563bb6c59a6948aa09beb77ba263600d19792 (patch) | |
| tree | 2e59d5bfafb1d90a63192710da7c3ad998330bd3 /fs/btrfs/sysfs.h | |
| parent | 09c9b0eaa0773264b795c9e1bbb2c9816732573f (diff) | |
| parent | 5d41be6f702f19f72db816c17175caf9dbdcdfa6 (diff) | |
| download | kernel_replicant_linux-e37563bb6c59a6948aa09beb77ba263600d19792.tar.gz kernel_replicant_linux-e37563bb6c59a6948aa09beb77ba263600d19792.tar.bz2 kernel_replicant_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/sysfs.h')
| -rw-r--r-- | fs/btrfs/sysfs.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/btrfs/sysfs.h b/fs/btrfs/sysfs.h index 80457f31c29f..b567560d9aa9 100644 --- a/fs/btrfs/sysfs.h +++ b/fs/btrfs/sysfs.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _BTRFS_SYSFS_H_ -#define _BTRFS_SYSFS_H_ + +#ifndef BTRFS_SYSFS_H +#define BTRFS_SYSFS_H /* * Data exported through sysfs @@ -90,4 +91,4 @@ void btrfs_sysfs_remove_fsid(struct btrfs_fs_devices *fs_devs); void btrfs_sysfs_feature_update(struct btrfs_fs_info *fs_info, u64 bit, enum btrfs_feature_set set); -#endif /* _BTRFS_SYSFS_H_ */ +#endif |