| Message ID | 20161027075233.4050-1-domagoj.trsan@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Thu, Oct 27, 2016 at 08:52:33AM +0100, Domagoj Tršan wrote: > csum member of struct btrfs_super_block has array type of u8. It makes sense > that function btrfs_csum_final should be also declared to accept u8 *. I > changed the declaration of method void btrfs_csum_final(u32 crc, char *result); > to void btrfs_csum_final(u32 crc, u8 *result); Sorry, I've noticed it just now, several callers of btrfs_csum_final cast the 2nd argument to (char *), which gets change to u8. Can you please fix the callers? Thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Oct 31, 2016 at 05:47:24PM +0100, David Sterba wrote: > On Thu, Oct 27, 2016 at 08:52:33AM +0100, Domagoj Tršan wrote: > > csum member of struct btrfs_super_block has array type of u8. It makes sense > > that function btrfs_csum_final should be also declared to accept u8 *. I > > changed the declaration of method void btrfs_csum_final(u32 crc, char *result); > > to void btrfs_csum_final(u32 crc, u8 *result); > > Sorry, I've noticed it just now, several callers of btrfs_csum_final > cast the 2nd argument to (char *), which gets change to u8. Can you > please fix the callers? Thanks. Done and committed. -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 50bed6c..95bd34f 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -273,7 +273,7 @@ u32 btrfs_csum_data(char *data, u32 seed, size_t len) return btrfs_crc32c(seed, data, len); } -void btrfs_csum_final(u32 crc, char *result) +void btrfs_csum_final(u32 crc, u8 *result) { put_unaligned_le32(~crc, result); } diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h index 8e79d00..e849845 100644 --- a/fs/btrfs/disk-io.h +++ b/fs/btrfs/disk-io.h @@ -118,7 +118,7 @@ int btrfs_buffer_uptodate(struct extent_buffer *buf, u64 parent_transid, int atomic); int btrfs_read_buffer(struct extent_buffer *buf, u64 parent_transid); u32 btrfs_csum_data(char *data, u32 seed, size_t len); -void btrfs_csum_final(u32 crc, char *result); +void btrfs_csum_final(u32 crc, u8 *result); int btrfs_bio_wq_end_io(struct btrfs_fs_info *info, struct bio *bio, enum btrfs_wq_endio_type metadata); int btrfs_wq_submit_bio(struct btrfs_fs_info *fs_info, struct inode *inode,
csum member of struct btrfs_super_block has array type of u8. It makes sense that function btrfs_csum_final should be also declared to accept u8 *. I changed the declaration of method void btrfs_csum_final(u32 crc, char *result); to void btrfs_csum_final(u32 crc, u8 *result); Signed-off-by: Domagoj Tršan <domagoj.trsan@gmail.com> --- fs/btrfs/disk-io.c | 2 +- fs/btrfs/disk-io.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)