diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-28 03:36:21 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-28 03:36:21 -0500 |
| commit | 38a5d6736e7f714cc56d58692001e66dcbb98799 (patch) | |
| tree | 337d32375e10b04642013710c2c424514474b32c /fs/btrfs/extent_map.c | |
| parent | 0bfd95a2a104dfc2469d68de52df99939371c0d4 (diff) | |
| parent | f5412be599602124d2bdd49947b231dd77c0bf99 (diff) | |
Merge commit 'v2.6.38-rc6' into devicetree/next
Conflicts:
drivers/spi/pxa2xx_spi_pci.c
Diffstat (limited to 'fs/btrfs/extent_map.c')
| -rw-r--r-- | fs/btrfs/extent_map.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c index b0e1fce12530..2b6c12e983b3 100644 --- a/fs/btrfs/extent_map.c +++ b/fs/btrfs/extent_map.c | |||
| @@ -51,8 +51,8 @@ struct extent_map *alloc_extent_map(gfp_t mask) | |||
| 51 | { | 51 | { |
| 52 | struct extent_map *em; | 52 | struct extent_map *em; |
| 53 | em = kmem_cache_alloc(extent_map_cache, mask); | 53 | em = kmem_cache_alloc(extent_map_cache, mask); |
| 54 | if (!em || IS_ERR(em)) | 54 | if (!em) |
| 55 | return em; | 55 | return NULL; |
| 56 | em->in_tree = 0; | 56 | em->in_tree = 0; |
| 57 | em->flags = 0; | 57 | em->flags = 0; |
| 58 | em->compress_type = BTRFS_COMPRESS_NONE; | 58 | em->compress_type = BTRFS_COMPRESS_NONE; |