projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
[firefly-linux-kernel-4.4.55.git]
/
block
/
bsg.c
diff --git
a/block/bsg.c
b/block/bsg.c
index e73e50daf3d0a36df8977cad29b550e3139fbef0..0ce8806dd0c1a3786b6cd86ba8a90b743ca81b8d 100644
(file)
--- a/
block/bsg.c
+++ b/
block/bsg.c
@@
-42,7
+42,7
@@
struct bsg_device {
int done_cmds;
wait_queue_head_t wq_done;
wait_queue_head_t wq_free;
int done_cmds;
wait_queue_head_t wq_done;
wait_queue_head_t wq_free;
- char name[
BUS_ID_SIZE
];
+ char name[
20
];
int max_queue;
unsigned long flags;
};
int max_queue;
unsigned long flags;
};
@@
-244,7
+244,8
@@
bsg_validate_sgv4_hdr(struct request_queue *q, struct sg_io_v4 *hdr, int *rw)
* map sg_io_v4 to a request.
*/
static struct request *
* map sg_io_v4 to a request.
*/
static struct request *
-bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr, fmode_t has_write_perm)
+bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr, fmode_t has_write_perm,
+ u8 *sense)
{
struct request_queue *q = bd->queue;
struct request *rq, *next_rq = NULL;
{
struct request_queue *q = bd->queue;
struct request *rq, *next_rq = NULL;
@@
-306,6
+307,10
@@
bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr, fmode_t has_write_perm)
if (ret)
goto out;
}
if (ret)
goto out;
}
+
+ rq->sense = sense;
+ rq->sense_len = 0;
+
return rq;
out:
if (rq->cmd != rq->__cmd)
return rq;
out:
if (rq->cmd != rq->__cmd)
@@
-348,9
+353,6
@@
static void bsg_rq_end_io(struct request *rq, int uptodate)
static void bsg_add_command(struct bsg_device *bd, struct request_queue *q,
struct bsg_command *bc, struct request *rq)
{
static void bsg_add_command(struct bsg_device *bd, struct request_queue *q,
struct bsg_command *bc, struct request *rq)
{
- rq->sense = bc->sense;
- rq->sense_len = 0;
-
/*
* add bc command to busy queue and submit rq for io
*/
/*
* add bc command to busy queue and submit rq for io
*/
@@
-419,7
+421,7
@@
static int blk_complete_sgv4_hdr_rq(struct request *rq, struct sg_io_v4 *hdr,
{
int ret = 0;
{
int ret = 0;
- dprintk("rq %p bio %p
%u
\n", rq, bio, rq->errors);
+ dprintk("rq %p bio %p
0x%x
\n", rq, bio, rq->errors);
/*
* fill in all the output members
*/
/*
* fill in all the output members
*/
@@
-635,7
+637,7
@@
static int __bsg_write(struct bsg_device *bd, const char __user *buf,
/*
* get a request, fill in the blanks, and add to request queue
*/
/*
* get a request, fill in the blanks, and add to request queue
*/
- rq = bsg_map_hdr(bd, &bc->hdr, has_write_perm);
+ rq = bsg_map_hdr(bd, &bc->hdr, has_write_perm
, bc->sense
);
if (IS_ERR(rq)) {
ret = PTR_ERR(rq);
rq = NULL;
if (IS_ERR(rq)) {
ret = PTR_ERR(rq);
rq = NULL;
@@
-781,7
+783,7
@@
static struct bsg_device *bsg_add_device(struct inode *inode,
mutex_lock(&bsg_mutex);
hlist_add_head(&bd->dev_list, bsg_dev_idx_hash(iminor(inode)));
mutex_lock(&bsg_mutex);
hlist_add_head(&bd->dev_list, bsg_dev_idx_hash(iminor(inode)));
- strncpy(bd->name,
rq->bsg_dev.class_dev->bus_id
, sizeof(bd->name) - 1);
+ strncpy(bd->name,
dev_name(rq->bsg_dev.class_dev)
, sizeof(bd->name) - 1);
dprintk("bound to <%s>, max queue %d\n",
format_dev_t(buf, inode->i_rdev), bd->max_queue);
dprintk("bound to <%s>, max queue %d\n",
format_dev_t(buf, inode->i_rdev), bd->max_queue);
@@
-922,11
+924,12
@@
static long bsg_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
struct request *rq;
struct bio *bio, *bidi_bio = NULL;
struct sg_io_v4 hdr;
struct request *rq;
struct bio *bio, *bidi_bio = NULL;
struct sg_io_v4 hdr;
+ u8 sense[SCSI_SENSE_BUFFERSIZE];
if (copy_from_user(&hdr, uarg, sizeof(hdr)))
return -EFAULT;
if (copy_from_user(&hdr, uarg, sizeof(hdr)))
return -EFAULT;
- rq = bsg_map_hdr(bd, &hdr, file->f_mode & FMODE_WRITE);
+ rq = bsg_map_hdr(bd, &hdr, file->f_mode & FMODE_WRITE
, sense
);
if (IS_ERR(rq))
return PTR_ERR(rq);
if (IS_ERR(rq))
return PTR_ERR(rq);
@@
-992,7
+995,7
@@
int bsg_register_queue(struct request_queue *q, struct device *parent,
if (name)
devname = name;
else
if (name)
devname = name;
else
- devname =
parent->bus_id
;
+ devname =
dev_name(parent)
;
/*
* we need a proper transport to send commands, not a stacked device
/*
* we need a proper transport to send commands, not a stacked device