diff --git a/[refs] b/[refs] index 6c749445b1ee..03f7bb33a182 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8844355df7f4e091b03cc131e1549631238b397b +refs/heads/master: 4b72029dc3fd6ba7dc45ccd1cf0aa0ebfa209bd3 diff --git a/trunk/fs/btrfs/zlib.c b/trunk/fs/btrfs/zlib.c index e5b8b22e07d6..b01558661e3b 100644 --- a/trunk/fs/btrfs/zlib.c +++ b/trunk/fs/btrfs/zlib.c @@ -225,6 +225,10 @@ int btrfs_zlib_compress_pages(struct address_space *mapping, data_in = kmap(in_page); out_page = alloc_page(GFP_NOFS | __GFP_HIGHMEM); + if (out_page == NULL) { + ret = -1; + goto out; + } cpage_out = kmap(out_page); pages[0] = out_page; nr_pages = 1; @@ -263,6 +267,10 @@ int btrfs_zlib_compress_pages(struct address_space *mapping, goto out; } out_page = alloc_page(GFP_NOFS | __GFP_HIGHMEM); + if (out_page == NULL) { + ret = -1; + goto out; + } cpage_out = kmap(out_page); pages[nr_pages] = out_page; nr_pages++;