aboutsummaryrefslogtreecommitdiffstats
path: root/block/bsg.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2011-12-13 18:33:38 -0500
committerJens Axboe <axboe@kernel.dk>2011-12-13 18:33:38 -0500
commit09ac46c429464c919d04bb737b27edd84d944f02 (patch)
tree0fb3b7344ead06d08dbd77470445821817c439b7 /block/bsg.c
parent6e736be7f282fff705db7c34a15313281b372a76 (diff)
block: misc updates to blk_get_queue()
* blk_get_queue() is peculiar in that it returns 0 on success and 1 on failure instead of 0 / -errno or boolean. Update it such that it returns %true on success and %false on failure. * Make sure the caller checks for the return value. * Separate out __blk_get_queue() which doesn't check whether @q is dead and put it in blk.h. This will be used later. This patch doesn't introduce any functional changes. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/bsg.c')
-rw-r--r--block/bsg.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/block/bsg.c b/block/bsg.c
index 702f1316bb8f..167d586cece6 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -769,12 +769,10 @@ static struct bsg_device *bsg_add_device(struct inode *inode,
769 struct file *file) 769 struct file *file)
770{ 770{
771 struct bsg_device *bd; 771 struct bsg_device *bd;
772 int ret;
773#ifdef BSG_DEBUG 772#ifdef BSG_DEBUG
774 unsigned char buf[32]; 773 unsigned char buf[32];
775#endif 774#endif
776 ret = blk_get_queue(rq); 775 if (!blk_get_queue(rq))
777 if (ret)
778 return ERR_PTR(-ENXIO); 776 return ERR_PTR(-ENXIO);
779 777
780 bd = bsg_alloc_device(); 778 bd = bsg_alloc_device();