diff options
author | David Sterba <dsterba@suse.cz> | 2011-04-19 12:00:01 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.cz> | 2011-05-02 07:57:20 -0400 |
commit | c704005d886cf0bc9bc3974eb009b22fe0da32c7 (patch) | |
tree | b9effb8d686af95ca92782697b75a70bf34a3964 /fs/btrfs/file.c | |
parent | 4891aca2dac612a2f21a3278d9906ade13b55788 (diff) |
btrfs: unify checking of IS_ERR and null
use IS_ERR_OR_NULL when possible, done by this coccinelle script:
@ match @
identifier id;
@@
(
- BUG_ON(IS_ERR(id) || !id);
+ BUG_ON(IS_ERR_OR_NULL(id));
|
- IS_ERR(id) || !id
+ IS_ERR_OR_NULL(id)
|
- !id || IS_ERR(id)
+ IS_ERR_OR_NULL(id)
)
Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'fs/btrfs/file.c')
-rw-r--r-- | fs/btrfs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 75899a01dded..83abd274370b 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c | |||
@@ -1375,7 +1375,7 @@ static long btrfs_fallocate(struct file *file, int mode, | |||
1375 | while (1) { | 1375 | while (1) { |
1376 | em = btrfs_get_extent(inode, NULL, 0, cur_offset, | 1376 | em = btrfs_get_extent(inode, NULL, 0, cur_offset, |
1377 | alloc_end - cur_offset, 0); | 1377 | alloc_end - cur_offset, 0); |
1378 | BUG_ON(IS_ERR(em) || !em); | 1378 | BUG_ON(IS_ERR_OR_NULL(em)); |
1379 | last_byte = min(extent_map_end(em), alloc_end); | 1379 | last_byte = min(extent_map_end(em), alloc_end); |
1380 | last_byte = (last_byte + mask) & ~mask; | 1380 | last_byte = (last_byte + mask) & ~mask; |
1381 | if (em->block_start == EXTENT_MAP_HOLE || | 1381 | if (em->block_start == EXTENT_MAP_HOLE || |