diff --git a/[refs] b/[refs] index 6d426cf0fc05..cb6416194a43 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a48ddf08ba9bab91efd95e458737afa9d7699623 +refs/heads/master: 3f3420df505e47751ef76a652b5cb660e5360d6f diff --git a/trunk/fs/btrfs/volumes.c b/trunk/fs/btrfs/volumes.c index bcd14ebccae1..c793b6f50d8d 100644 --- a/trunk/fs/btrfs/volumes.c +++ b/trunk/fs/btrfs/volumes.c @@ -2894,10 +2894,6 @@ static int read_one_chunk(struct btrfs_root *root, struct btrfs_key *key, free_extent_map(em); } - map = kzalloc(sizeof(*map), GFP_NOFS); - if (!map) - return -ENOMEM; - em = alloc_extent_map(GFP_NOFS); if (!em) return -ENOMEM;