From: Josef Bacik <jbacik@fusionio.com> Date: Mon, 15 Oct 2012 17:39:33 +0000 (-0400) Subject: Btrfs: don't memset new tokens X-Git-Tag: firefly_0821_release~3680^2~1158^2~17 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ad9145596986b672d8c8235c92ed5307f82d045d;p=firefly-linux-kernel-4.4.55.git Btrfs: don't memset new tokens Our token logic depends on token->kaddr being set, and if it is not it sets everything properly as needed. So instead of memsetting just set token->kaddr to NULL. Thanks, Signed-off-by: Josef Bacik <jbacik@fusionio.com> Signed-off-by: Chris Mason <chris.mason@fusionio.com> --- diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 55aff6764bb9..cd02205f13c8 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -1860,7 +1860,7 @@ struct btrfs_map_token { static inline void btrfs_init_map_token (struct btrfs_map_token *token) { - memset(token, 0, sizeof(*token)); + token->kaddr = NULL; } /* some macros to generate set/get funcs for the struct fields. This