3 files changed, 7 insertions, 13 deletions

diff --git a/fs/btrfs/INSTALL b/fs/btrfs/INSTALL
index e83ff6e8c8d5..16b45a56878d 100644
--- a/fs/btrfs/INSTALL
+++ b/fs/btrfs/INSTALL
@@ -5,19 +5,16 @@ directory can only be changed by btrfsctl right now, and normal filesystem
 operations do not work on it.  The default subvolume is called 'default',
 and you can create files and directories in mount_point/default
 
-Btrfs uses the crypto manager interface in the kernel for file and
-metadata checksums.  You need to compile the kernel with:
+Btrfs uses libcrc32c in the kernel for file and metadata checksums.  You need
+to compile the kernel with:
 
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_MANAGER=m
-CONFIG_CRYPTO_CRC32C=m
+CONFIG_LIBCRC32C=m
 
-cryptomanager and crc32c can be static as well.  Once your kernel is
-setup, typing make in the btrfs module sources will build against the
-running kernel.  When the build is complete:
+libcrc32c can be static as well.  Once your kernel is setup, typing make in the
+btrfs module sources will build against the running kernel.  When the build is
+complete:
 
-modprobe crc32c
-modprobe cryptomgr
+modprobe libcrc32c
 insmod btrfs.ko
 
 The Btrfs utility programs require libuuid to build.  This can be found
diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c
index 737e5a38d17e..8b0eca042ea4 100644
--- a/fs/btrfs/root-tree.c
+++ b/fs/btrfs/root-tree.c
@@ -51,7 +51,6 @@ int btrfs_find_last_root(struct btrfs_root *root, u64 objectid,
         memcpy(item, btrfs_item_ptr(l, slot, struct btrfs_root_item),
                 sizeof(*item));
         btrfs_disk_key_to_cpu(key, &l->items[slot].key);
-printk("find last finds key %Lu %u %Lu slot %d search for obj %Lu\n", key->objectid, key->flags, key->offset, slot, objectid);
         ret = 0;
 out:
         btrfs_release_path(root, path);
@@ -141,7 +140,6 @@ int btrfs_find_dead_roots(struct btrfs_root *root)
                         ret = PTR_ERR(root);
                         goto err;
                 }
-printk("found dead root %Lu %u %Lu\n", key.objectid, key.flags, key.offset);
                 ret = btrfs_add_dead_root(dead_root,
                                           &root->fs_info->dead_roots);
                 if (ret)
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 85a2a5e27148..a5a63d471e43 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -308,7 +308,6 @@ static int drop_dirty_roots(struct btrfs_root *tree_root,
                 list_del_init(&dirty->list);
 
                 trans = btrfs_start_transaction(tree_root, 1);
-printk("deleting root %Lu %u %Lu\n", dirty->snap_key.objectid, dirty->snap_key.flags, dirty->snap_key.offset);
                 ret = btrfs_drop_snapshot(trans, dirty->root,
                                           dirty->commit_root);
                 BUG_ON(ret);