diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2007-01-24 03:05:54 -0500 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2007-07-16 02:52:45 -0400 |
commit | 7e75d73080d822d2bbbd5b0f7f293719dd1f9109 (patch) | |
tree | e4f352255de5dd985727486c4f922c38d5414782 /block | |
parent | 264a0472183ce7ad05eea3360f5907880a1e5e78 (diff) |
bsg: simplify __bsg_alloc_command failpath
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block')
-rw-r--r-- | block/bsg.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/block/bsg.c b/block/bsg.c index e97e3ec08ffc..c85d961ee41e 100644 --- a/block/bsg.c +++ b/block/bsg.c | |||
@@ -128,7 +128,8 @@ static struct bsg_command *__bsg_alloc_command(struct bsg_device *bd) | |||
128 | bc = kmem_cache_alloc(bsg_cmd_cachep, GFP_USER); | 128 | bc = kmem_cache_alloc(bsg_cmd_cachep, GFP_USER); |
129 | if (unlikely(!bc)) { | 129 | if (unlikely(!bc)) { |
130 | spin_lock_irq(&bd->lock); | 130 | spin_lock_irq(&bd->lock); |
131 | goto alloc_fail; | 131 | bd->queued_cmds--; |
132 | goto out; | ||
132 | } | 133 | } |
133 | 134 | ||
134 | memset(bc, 0, sizeof(*bc)); | 135 | memset(bc, 0, sizeof(*bc)); |
@@ -136,8 +137,6 @@ static struct bsg_command *__bsg_alloc_command(struct bsg_device *bd) | |||
136 | INIT_LIST_HEAD(&bc->list); | 137 | INIT_LIST_HEAD(&bc->list); |
137 | dprintk("%s: returning free cmd %p\n", bd->name, bc); | 138 | dprintk("%s: returning free cmd %p\n", bd->name, bc); |
138 | return bc; | 139 | return bc; |
139 | alloc_fail: | ||
140 | bd->queued_cmds--; | ||
141 | out: | 140 | out: |
142 | spin_unlock_irq(&bd->lock); | 141 | spin_unlock_irq(&bd->lock); |
143 | return bc; | 142 | return bc; |