diff options
| author | David Sterba <dsterba@suse.cz> | 2014-09-29 19:20:37 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2014-10-02 16:06:19 +0200 |
| commit | 5d99a998f375b7bff7ddff0162a6eed4d4ca1318 (patch) | |
| tree | 29b629d44ad9001fd7d8d283e4a9c4f6164747d0 /fs | |
| parent | 1d52c78afbbf80b58299e076a159617d6b42fe3c (diff) | |
| download | linux-stable-5d99a998f375b7bff7ddff0162a6eed4d4ca1318.tar.gz linux-stable-5d99a998f375b7bff7ddff0162a6eed4d4ca1318.tar.bz2 linux-stable-5d99a998f375b7bff7ddff0162a6eed4d4ca1318.zip | |
btrfs: remove unlikely from NULL checks
Unlikely is implicit for NULL checks of pointers.
Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/async-thread.c | 10 | ||||
| -rw-r--r-- | fs/btrfs/inode.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/fs/btrfs/async-thread.c b/fs/btrfs/async-thread.c index 2da0a66790ba..4dabeb893b7c 100644 --- a/fs/btrfs/async-thread.c +++ b/fs/btrfs/async-thread.c @@ -92,7 +92,7 @@ __btrfs_alloc_workqueue(const char *name, int flags, int max_active, { struct __btrfs_workqueue *ret = kzalloc(sizeof(*ret), GFP_NOFS); - if (unlikely(!ret)) + if (!ret) return NULL; ret->max_active = max_active; @@ -116,7 +116,7 @@ __btrfs_alloc_workqueue(const char *name, int flags, int max_active, ret->normal_wq = alloc_workqueue("%s-%s", flags, ret->max_active, "btrfs", name); - if (unlikely(!ret->normal_wq)) { + if (!ret->normal_wq) { kfree(ret); return NULL; } @@ -138,12 +138,12 @@ struct btrfs_workqueue *btrfs_alloc_workqueue(const char *name, { struct btrfs_workqueue *ret = kzalloc(sizeof(*ret), GFP_NOFS); - if (unlikely(!ret)) + if (!ret) return NULL; ret->normal = __btrfs_alloc_workqueue(name, flags & ~WQ_HIGHPRI, max_active, thresh); - if (unlikely(!ret->normal)) { + if (!ret->normal) { kfree(ret); return NULL; } @@ -151,7 +151,7 @@ struct btrfs_workqueue *btrfs_alloc_workqueue(const char *name, if (flags & WQ_HIGHPRI) { ret->high = __btrfs_alloc_workqueue(name, flags, max_active, thresh); - if (unlikely(!ret->high)) { + if (!ret->high) { __btrfs_destroy_workqueue(ret->normal); kfree(ret); return NULL; diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 344a322eb386..998e67fdf2f6 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -9013,7 +9013,7 @@ static int __start_delalloc_inodes(struct btrfs_root *root, int delay_iput, spin_unlock(&root->delalloc_lock); work = btrfs_alloc_delalloc_work(inode, 0, delay_iput); - if (unlikely(!work)) { + if (!work) { if (delay_iput) btrfs_add_delayed_iput(inode); else |