git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cfq-iosched: move cfqq initialization out of cfq_find_alloc_queue()
[safe/jmp/linux-2.6]
/
block
/
bsg.c
diff --git
a/block/bsg.c
b/block/bsg.c
index
206060e
..
e7d4752
100644
(file)
--- a/
block/bsg.c
+++ b/
block/bsg.c
@@
-445,14
+445,14
@@
static int blk_complete_sgv4_hdr_rq(struct request *rq, struct sg_io_v4 *hdr,
}
if (rq->next_rq) {
}
if (rq->next_rq) {
- hdr->dout_resid = rq->
data
_len;
- hdr->din_resid = rq->next_rq->
data
_len;
+ hdr->dout_resid = rq->
resid
_len;
+ hdr->din_resid = rq->next_rq->
resid
_len;
blk_rq_unmap_user(bidi_bio);
blk_put_request(rq->next_rq);
} else if (rq_data_dir(rq) == READ)
blk_rq_unmap_user(bidi_bio);
blk_put_request(rq->next_rq);
} else if (rq_data_dir(rq) == READ)
- hdr->din_resid = rq->
data
_len;
+ hdr->din_resid = rq->
resid
_len;
else
else
- hdr->dout_resid = rq->
data
_len;
+ hdr->dout_resid = rq->
resid
_len;
/*
* If the request generated a negative error number, return it
/*
* If the request generated a negative error number, return it
@@
-1062,6
+1062,11
@@
EXPORT_SYMBOL_GPL(bsg_register_queue);
static struct cdev bsg_cdev;
static struct cdev bsg_cdev;
+static char *bsg_nodename(struct device *dev)
+{
+ return kasprintf(GFP_KERNEL, "bsg/%s", dev_name(dev));
+}
+
static int __init bsg_init(void)
{
int ret, i;
static int __init bsg_init(void)
{
int ret, i;
@@
-1082,6
+1087,7
@@
static int __init bsg_init(void)
ret = PTR_ERR(bsg_class);
goto destroy_kmemcache;
}
ret = PTR_ERR(bsg_class);
goto destroy_kmemcache;
}
+ bsg_class->nodename = bsg_nodename;
ret = alloc_chrdev_region(&devid, 0, BSG_MAX_DEVS, "bsg");
if (ret)
ret = alloc_chrdev_region(&devid, 0, BSG_MAX_DEVS, "bsg");
if (ret)