projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
btrfs
/
disk-io.c
diff --git
a/fs/btrfs/disk-io.c
b/fs/btrfs/disk-io.c
index 0e69295d0031e558eb3ebb257ff2d4bb2f79772f..5215f04260b21bee4026fbbd6132067880b0e224 100644
(file)
--- a/
fs/btrfs/disk-io.c
+++ b/
fs/btrfs/disk-io.c
@@
-26,7
+26,6
@@
#include <linux/workqueue.h>
#include <linux/kthread.h>
#include <linux/freezer.h>
#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>
#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 <asm/unaligned.h>
#include "ctree.h"
#include "disk-io.h"
+#include "hash.h"
#include "transaction.h"
#include "btrfs_inode.h"
#include "volumes.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)
{
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)
}
void btrfs_csum_final(u32 crc, char *result)