Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c126dea7 authored by Chris Mason's avatar Chris Mason
Browse files

Merge branch 'integrity-check-patch-v2' of git://btrfs.giantdisaster.de/git/btrfs into integration 



Conflicts:
	fs/btrfs/ctree.h
	fs/btrfs/super.c

Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parents 9785dbdf 21adbd5c

fs/btrfs/Kconfig

+19 −0
Original line number Diff line number Diff line
@@ -31,3 +31,22 @@ config BTRFS_FS_POSIX_ACL 
	  Linux website <http://acl.bestbits.at/>.



	  If you don't know what Access Control Lists are, say N



config BTRFS_FS_CHECK_INTEGRITY

	bool "Btrfs with integrity check tool compiled in (DANGEROUS)"

	depends on BTRFS_FS

	help

	  Adds code that examines all block write requests (including

	  writes of the super block). The goal is to verify that the

	  state of the filesystem on disk is always consistent, i.e.,

	  after a power-loss or kernel panic event the filesystem is

	  in a consistent state.



	  If the integrity check tool is included and activated in

	  the mount options, plenty of kernel memory is used, and

	  plenty of additional CPU cycles are spent. Enabling this

	  functionality is not intended for normal use.



	  In most cases, unless you are a btrfs developer who needs

	  to verify the integrity of (super)-block write requests

	  during the run of a regression test, say N

fs/btrfs/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -11,3 +11,4 @@ btrfs-y += super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \ 
	   reada.o backref.o ulist.o



btrfs-$(CONFIG_BTRFS_FS_POSIX_ACL) += acl.o

btrfs-$(CONFIG_BTRFS_FS_CHECK_INTEGRITY) += check-integrity.o