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/inode-map.h | |
parent | 09c9b0eaa0773264b795c9e1bbb2c9816732573f (diff) | |
parent | 5d41be6f702f19f72db816c17175caf9dbdcdfa6 (diff) | |
download | linux-e37563bb6c59a6948aa09beb77ba263600d19792.tar.gz |
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/inode-map.h')
-rw-r--r-- | fs/btrfs/inode-map.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/btrfs/inode-map.h b/fs/btrfs/inode-map.h index 6734ec92a1e9..7a962811dffe 100644 --- a/fs/btrfs/inode-map.h +++ b/fs/btrfs/inode-map.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __BTRFS_INODE_MAP -#define __BTRFS_INODE_MAP + +#ifndef BTRFS_INODE_MAP_H +#define BTRFS_INODE_MAP_H void btrfs_init_free_ino_ctl(struct btrfs_root *root); void btrfs_unpin_free_ino(struct btrfs_root *root); |