Commit 878a876b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs 

Pull btrfs fixes from Chris Mason:
 "Filipe is fixing compile and boot problems with our crc32c rework, and
  Josef has disabled snapshot aware defrag for now.

  As the number of snapshots increases, we're hitting OOM.  For the
  short term we're disabling things until a bigger fix is ready"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: use late_initcall instead of module_init
  Btrfs: use btrfs_crc32c everywhere instead of libcrc32c
  Btrfs: disable snapshot aware defrag for now
parents d7512f79 60efa5eb

fs/btrfs/check-integrity.c

+2 −2
Original line number Diff line number Diff line
@@ -92,11 +92,11 @@ 
#include <linux/slab.h>

#include <linux/buffer_head.h>

#include <linux/mutex.h>

#include <linux/crc32c.h>

#include <linux/genhd.h>

#include <linux/blkdev.h>

#include "ctree.h"

#include "disk-io.h"

#include "hash.h"

#include "transaction.h"

#include "extent_io.h"

#include "volumes.h"
@@ -1823,7 +1823,7 @@ static int btrfsic_test_for_metadata(struct btrfsic_state *state, 
		size_t sublen = i ? PAGE_CACHE_SIZE :

				    (PAGE_CACHE_SIZE - BTRFS_CSUM_SIZE);



		crc = crc32c(crc, data, sublen);

		crc = btrfs_crc32c(crc, data, sublen);

	}

	btrfs_csum_final(crc, csum);

	if (memcmp(csum, h->csum, state->csum_size))

fs/btrfs/disk-io.c

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/workqueue.h>

#include <linux/kthread.h>

#include <linux/freezer.h>

#include <linux/crc32c.h>

#include <linux/slab.h>

#include <linux/migrate.h>

#include <linux/ratelimit.h>
@@ -35,6 +34,7 @@ 
#include <asm/unaligned.h>

#include "ctree.h"

#include "disk-io.h"

#include "hash.h"

#include "transaction.h"

#include "btrfs_inode.h"

#include "volumes.h"
@@ -244,7 +244,7 @@ out: 


u32 btrfs_csum_data(char *data, u32 seed, size_t len)

{

	return crc32c(seed, data, len);

	return btrfs_crc32c(seed, data, len);

}



void btrfs_csum_final(u32 crc, char *result)

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -2629,7 +2629,7 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent) 
			EXTENT_DEFRAG, 1, cached_state);

	if (ret) {

		u64 last_snapshot = btrfs_root_last_snapshot(&root->root_item);

		if (last_snapshot >= BTRFS_I(inode)->generation)

		if (0 && last_snapshot >= BTRFS_I(inode)->generation)

			/* the inode is shared */

			new = record_old_file_extents(inode, ordered_extent);

fs/btrfs/send.c

+2 −2
Original line number Diff line number Diff line
@@ -24,12 +24,12 @@ 
#include <linux/xattr.h>

#include <linux/posix_acl_xattr.h>

#include <linux/radix-tree.h>

#include <linux/crc32c.h>

#include <linux/vmalloc.h>

#include <linux/string.h>



#include "send.h"

#include "backref.h"

#include "hash.h"

#include "locking.h"

#include "disk-io.h"

#include "btrfs_inode.h"
@@ -620,7 +620,7 @@ static int send_cmd(struct send_ctx *sctx) 
	hdr->len = cpu_to_le32(sctx->send_size - sizeof(*hdr));

	hdr->crc = 0;



	crc = crc32c(0, (unsigned char *)sctx->send_buf, sctx->send_size);

	crc = btrfs_crc32c(0, (unsigned char *)sctx->send_buf, sctx->send_size);

	hdr->crc = cpu_to_le32(crc);



	ret = write_buf(sctx->send_filp, sctx->send_buf, sctx->send_size,

fs/btrfs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -1996,7 +1996,7 @@ static void __exit exit_btrfs_fs(void) 
	btrfs_hash_exit();

}



module_init(init_btrfs_fs)

late_initcall(init_btrfs_fs);

module_exit(exit_btrfs_fs)



MODULE_LICENSE("GPL");

CRA Git | Maintained and supported by SUSTech CRA and CCSE