[PATCH] USB: ub 02 remove diag
Remove the "diag" file from the sysfs. The usbmon is good enough these days so I do not need this feature anymore. Also, sysfs is a pain. Al Viro caught a race in this, which I thought too bothersome to fix. Signed-off-by: Pete Zaitcev <zaitcev@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Pete Zaitcev
Greg Kroah-Hartman
parent
4d69581929
commit
952ba22296
|
|
@ -180,6 +180,7 @@ struct ub_dev;
|
|||
#define UB_DIR_ILLEGAL2 2
|
||||
#define UB_DIR_WRITE 3
|
||||
|
||||
/* P3 */
|
||||
#define UB_DIR_CHAR(c) (((c)==UB_DIR_WRITE)? 'w': \
|
||||
(((c)==UB_DIR_READ)? 'r': 'n'))
|
||||
|
||||
|
|
@ -195,24 +196,11 @@ enum ub_scsi_cmd_state {
|
|||
UB_CMDST_DONE /* Final state */
|
||||
};
|
||||
|
||||
static char *ub_scsi_cmd_stname[] = {
|
||||
". ",
|
||||
"Cmd",
|
||||
"dat",
|
||||
"c2s",
|
||||
"sts",
|
||||
"clr",
|
||||
"crs",
|
||||
"Sen",
|
||||
"fin"
|
||||
};
|
||||
|
||||
struct ub_scsi_cmd {
|
||||
unsigned char cdb[UB_MAX_CDB_SIZE];
|
||||
unsigned char cdb_len;
|
||||
|
||||
unsigned char dir; /* 0 - none, 1 - read, 3 - write. */
|
||||
unsigned char trace_index;
|
||||
enum ub_scsi_cmd_state state;
|
||||
unsigned int tag;
|
||||
struct ub_scsi_cmd *next;
|
||||
|
|
@ -248,28 +236,6 @@ struct ub_capacity {
|
|||
unsigned int bshift; /* Shift between 512 and hard sects */
|
||||
};
|
||||
|
||||
/*
|
||||
* The SCSI command tracing structure.
|
||||
*/
|
||||
|
||||
#define SCMD_ST_HIST_SZ 8
|
||||
#define SCMD_TRACE_SZ 63 /* Less than 4KB of 61-byte lines */
|
||||
|
||||
struct ub_scsi_cmd_trace {
|
||||
int hcur;
|
||||
unsigned int tag;
|
||||
unsigned int req_size, act_size;
|
||||
unsigned char op;
|
||||
unsigned char dir;
|
||||
unsigned char key, asc, ascq;
|
||||
char st_hst[SCMD_ST_HIST_SZ];
|
||||
};
|
||||
|
||||
struct ub_scsi_trace {
|
||||
int cur;
|
||||
struct ub_scsi_cmd_trace vec[SCMD_TRACE_SZ];
|
||||
};
|
||||
|
||||
/*
|
||||
* This is a direct take-off from linux/include/completion.h
|
||||
* The difference is that I do not wait on this thing, just poll.
|
||||
|
|
@ -388,7 +354,6 @@ struct ub_dev {
|
|||
wait_queue_head_t reset_wait;
|
||||
|
||||
int sg_stat[6];
|
||||
struct ub_scsi_trace tr;
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
@ -457,137 +422,6 @@ static int ub_qlock_next = 0;
|
|||
|
||||
static DEFINE_SPINLOCK(ub_lock); /* Locks globals and ->openc */
|
||||
|
||||
/*
|
||||
* The SCSI command tracing procedures.
|
||||
*/
|
||||
|
||||
static void ub_cmdtr_new(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
|
||||
{
|
||||
int n;
|
||||
struct ub_scsi_cmd_trace *t;
|
||||
|
||||
if ((n = sc->tr.cur + 1) == SCMD_TRACE_SZ) n = 0;
|
||||
t = &sc->tr.vec[n];
|
||||
|
||||
memset(t, 0, sizeof(struct ub_scsi_cmd_trace));
|
||||
t->tag = cmd->tag;
|
||||
t->op = cmd->cdb[0];
|
||||
t->dir = cmd->dir;
|
||||
t->req_size = cmd->len;
|
||||
t->st_hst[0] = cmd->state;
|
||||
|
||||
sc->tr.cur = n;
|
||||
cmd->trace_index = n;
|
||||
}
|
||||
|
||||
static void ub_cmdtr_state(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
|
||||
{
|
||||
int n;
|
||||
struct ub_scsi_cmd_trace *t;
|
||||
|
||||
t = &sc->tr.vec[cmd->trace_index];
|
||||
if (t->tag == cmd->tag) {
|
||||
if ((n = t->hcur + 1) == SCMD_ST_HIST_SZ) n = 0;
|
||||
t->st_hst[n] = cmd->state;
|
||||
t->hcur = n;
|
||||
}
|
||||
}
|
||||
|
||||
static void ub_cmdtr_act_len(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
|
||||
{
|
||||
struct ub_scsi_cmd_trace *t;
|
||||
|
||||
t = &sc->tr.vec[cmd->trace_index];
|
||||
if (t->tag == cmd->tag)
|
||||
t->act_size = cmd->act_len;
|
||||
}
|
||||
|
||||
static void ub_cmdtr_sense(struct ub_dev *sc, struct ub_scsi_cmd *cmd,
|
||||
unsigned char *sense)
|
||||
{
|
||||
struct ub_scsi_cmd_trace *t;
|
||||
|
||||
t = &sc->tr.vec[cmd->trace_index];
|
||||
if (t->tag == cmd->tag) {
|
||||
t->key = sense[2] & 0x0F;
|
||||
t->asc = sense[12];
|
||||
t->ascq = sense[13];
|
||||
}
|
||||
}
|
||||
|
||||
static ssize_t ub_diag_show(struct device *dev, struct device_attribute *attr,
|
||||
char *page)
|
||||
{
|
||||
struct usb_interface *intf;
|
||||
struct ub_dev *sc;
|
||||
struct list_head *p;
|
||||
struct ub_lun *lun;
|
||||
int cnt;
|
||||
unsigned long flags;
|
||||
int nc, nh;
|
||||
int i, j;
|
||||
struct ub_scsi_cmd_trace *t;
|
||||
|
||||
intf = to_usb_interface(dev);
|
||||
sc = usb_get_intfdata(intf);
|
||||
if (sc == NULL)
|
||||
return 0;
|
||||
|
||||
cnt = 0;
|
||||
spin_lock_irqsave(sc->lock, flags);
|
||||
|
||||
cnt += sprintf(page + cnt,
|
||||
"poison %d reset %d\n",
|
||||
atomic_read(&sc->poison), sc->reset);
|
||||
cnt += sprintf(page + cnt,
|
||||
"qlen %d qmax %d\n",
|
||||
sc->cmd_queue.qlen, sc->cmd_queue.qmax);
|
||||
cnt += sprintf(page + cnt,
|
||||
"sg %d %d %d %d %d .. %d\n",
|
||||
sc->sg_stat[0],
|
||||
sc->sg_stat[1],
|
||||
sc->sg_stat[2],
|
||||
sc->sg_stat[3],
|
||||
sc->sg_stat[4],
|
||||
sc->sg_stat[5]);
|
||||
|
||||
list_for_each (p, &sc->luns) {
|
||||
lun = list_entry(p, struct ub_lun, link);
|
||||
cnt += sprintf(page + cnt,
|
||||
"lun %u changed %d removable %d readonly %d\n",
|
||||
lun->num, lun->changed, lun->removable, lun->readonly);
|
||||
}
|
||||
|
||||
if ((nc = sc->tr.cur + 1) == SCMD_TRACE_SZ) nc = 0;
|
||||
for (j = 0; j < SCMD_TRACE_SZ; j++) {
|
||||
t = &sc->tr.vec[nc];
|
||||
|
||||
cnt += sprintf(page + cnt, "%08x %02x", t->tag, t->op);
|
||||
if (t->op == REQUEST_SENSE) {
|
||||
cnt += sprintf(page + cnt, " [sense %x %02x %02x]",
|
||||
t->key, t->asc, t->ascq);
|
||||
} else {
|
||||
cnt += sprintf(page + cnt, " %c", UB_DIR_CHAR(t->dir));
|
||||
cnt += sprintf(page + cnt, " [%5d %5d]",
|
||||
t->req_size, t->act_size);
|
||||
}
|
||||
if ((nh = t->hcur + 1) == SCMD_ST_HIST_SZ) nh = 0;
|
||||
for (i = 0; i < SCMD_ST_HIST_SZ; i++) {
|
||||
cnt += sprintf(page + cnt, " %s",
|
||||
ub_scsi_cmd_stname[(int)t->st_hst[nh]]);
|
||||
if (++nh == SCMD_ST_HIST_SZ) nh = 0;
|
||||
}
|
||||
cnt += sprintf(page + cnt, "\n");
|
||||
|
||||
if (++nc == SCMD_TRACE_SZ) nc = 0;
|
||||
}
|
||||
|
||||
spin_unlock_irqrestore(sc->lock, flags);
|
||||
return cnt;
|
||||
}
|
||||
|
||||
static DEVICE_ATTR(diag, S_IRUGO, ub_diag_show, NULL); /* N.B. World readable */
|
||||
|
||||
/*
|
||||
* The id allocator.
|
||||
*
|
||||
|
|
@ -1090,7 +924,6 @@ static int ub_scsi_cmd_start(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
|
|||
add_timer(&sc->work_timer);
|
||||
|
||||
cmd->state = UB_CMDST_CMD;
|
||||
ub_cmdtr_state(sc, cmd);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -1143,12 +976,10 @@ static void ub_scsi_dispatch(struct ub_dev *sc)
|
|||
ub_cmdq_pop(sc);
|
||||
(*cmd->done)(sc, cmd);
|
||||
} else if (cmd->state == UB_CMDST_INIT) {
|
||||
ub_cmdtr_new(sc, cmd);
|
||||
if ((rc = ub_scsi_cmd_start(sc, cmd)) == 0)
|
||||
break;
|
||||
cmd->error = rc;
|
||||
cmd->state = UB_CMDST_DONE;
|
||||
ub_cmdtr_state(sc, cmd);
|
||||
} else {
|
||||
if (!ub_is_completed(&sc->work_done))
|
||||
break;
|
||||
|
|
@ -1245,7 +1076,6 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
|
|||
return;
|
||||
}
|
||||
cmd->state = UB_CMDST_CLEAR;
|
||||
ub_cmdtr_state(sc, cmd);
|
||||
return;
|
||||
case -ESHUTDOWN: /* unplug */
|
||||
case -EILSEQ: /* unplug timeout on uhci */
|
||||
|
|
@ -1277,7 +1107,6 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
|
|||
return;
|
||||
}
|
||||
cmd->state = UB_CMDST_CLR2STS;
|
||||
ub_cmdtr_state(sc, cmd);
|
||||
return;
|
||||
}
|
||||
if (urb->status == -EOVERFLOW) {
|
||||
|
|
@ -1302,7 +1131,6 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
|
|||
if (urb->status != 0 ||
|
||||
len != cmd->sgv[cmd->current_sg].length) {
|
||||
cmd->act_len += len;
|
||||
ub_cmdtr_act_len(sc, cmd);
|
||||
|
||||
cmd->error = -EIO;
|
||||
ub_state_stat(sc, cmd);
|
||||
|
|
@ -1329,7 +1157,6 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
|
|||
}
|
||||
|
||||
cmd->act_len += urb->actual_length;
|
||||
ub_cmdtr_act_len(sc, cmd);
|
||||
|
||||
if (++cmd->current_sg < cmd->nsg) {
|
||||
ub_data_start(sc, cmd);
|
||||
|
|
@ -1355,7 +1182,6 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
|
|||
cmd->error = -EIO; /* A cheap trick... */
|
||||
|
||||
cmd->state = UB_CMDST_CLRRS;
|
||||
ub_cmdtr_state(sc, cmd);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -1439,7 +1265,6 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
|
|||
return;
|
||||
}
|
||||
cmd->state = UB_CMDST_DONE;
|
||||
ub_cmdtr_state(sc, cmd);
|
||||
ub_cmdq_pop(sc);
|
||||
(*cmd->done)(sc, cmd);
|
||||
|
||||
|
|
@ -1494,7 +1319,6 @@ static void ub_data_start(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
|
|||
add_timer(&sc->work_timer);
|
||||
|
||||
cmd->state = UB_CMDST_DATA;
|
||||
ub_cmdtr_state(sc, cmd);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -1506,7 +1330,6 @@ static void ub_state_done(struct ub_dev *sc, struct ub_scsi_cmd *cmd, int rc)
|
|||
|
||||
cmd->error = rc;
|
||||
cmd->state = UB_CMDST_DONE;
|
||||
ub_cmdtr_state(sc, cmd);
|
||||
ub_cmdq_pop(sc);
|
||||
(*cmd->done)(sc, cmd);
|
||||
}
|
||||
|
|
@ -1552,7 +1375,6 @@ static void ub_state_stat(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
|
|||
|
||||
cmd->stat_count = 0;
|
||||
cmd->state = UB_CMDST_STAT;
|
||||
ub_cmdtr_state(sc, cmd);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -1571,7 +1393,6 @@ static void ub_state_stat_counted(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
|
|||
return;
|
||||
|
||||
cmd->state = UB_CMDST_STAT;
|
||||
ub_cmdtr_state(sc, cmd);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -1609,7 +1430,6 @@ static void ub_state_sense(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
|
|||
scmd->tag = sc->tagcnt++;
|
||||
|
||||
cmd->state = UB_CMDST_SENSE;
|
||||
ub_cmdtr_state(sc, cmd);
|
||||
|
||||
ub_cmdq_insert(sc, scmd);
|
||||
return;
|
||||
|
|
@ -1665,11 +1485,6 @@ static void ub_top_sense_done(struct ub_dev *sc, struct ub_scsi_cmd *scmd)
|
|||
unsigned char *sense = sc->top_sense;
|
||||
struct ub_scsi_cmd *cmd;
|
||||
|
||||
/*
|
||||
* Ignoring scmd->act_len, because the buffer was pre-zeroed.
|
||||
*/
|
||||
ub_cmdtr_sense(sc, scmd, sense);
|
||||
|
||||
/*
|
||||
* Find the command which triggered the unit attention or a check,
|
||||
* save the sense into it, and advance its state machine.
|
||||
|
|
@ -1691,6 +1506,9 @@ static void ub_top_sense_done(struct ub_dev *sc, struct ub_scsi_cmd *scmd)
|
|||
return;
|
||||
}
|
||||
|
||||
/*
|
||||
* Ignoring scmd->act_len, because the buffer was pre-zeroed.
|
||||
*/
|
||||
cmd->key = sense[2] & 0x0F;
|
||||
cmd->asc = sense[12];
|
||||
cmd->ascq = sense[13];
|
||||
|
|
@ -2413,9 +2231,6 @@ static int ub_probe(struct usb_interface *intf,
|
|||
if (ub_get_pipes(sc, sc->dev, intf) != 0)
|
||||
goto err_dev_desc;
|
||||
|
||||
if (device_create_file(&sc->intf->dev, &dev_attr_diag) != 0)
|
||||
goto err_diag;
|
||||
|
||||
/*
|
||||
* At this point, all USB initialization is done, do upper layer.
|
||||
* We really hate halfway initialized structures, so from the
|
||||
|
|
@ -2480,8 +2295,6 @@ static int ub_probe(struct usb_interface *intf,
|
|||
}
|
||||
return 0;
|
||||
|
||||
/* device_remove_file(&sc->intf->dev, &dev_attr_diag); */
|
||||
err_diag:
|
||||
err_dev_desc:
|
||||
usb_set_intfdata(intf, NULL);
|
||||
// usb_put_intf(sc->intf);
|
||||
|
|
@ -2609,7 +2422,6 @@ static void ub_disconnect(struct usb_interface *intf)
|
|||
while ((cmd = ub_cmdq_peek(sc)) != NULL) {
|
||||
cmd->error = -ENOTCONN;
|
||||
cmd->state = UB_CMDST_DONE;
|
||||
ub_cmdtr_state(sc, cmd);
|
||||
ub_cmdq_pop(sc);
|
||||
(*cmd->done)(sc, cmd);
|
||||
cnt++;
|
||||
|
|
@ -2660,7 +2472,6 @@ static void ub_disconnect(struct usb_interface *intf)
|
|||
* and no URBs left in transit.
|
||||
*/
|
||||
|
||||
device_remove_file(&sc->intf->dev, &dev_attr_diag);
|
||||
usb_set_intfdata(intf, NULL);
|
||||
// usb_put_intf(sc->intf);
|
||||
sc->intf = NULL;
|
||||
|
|
|
|||
Reference in New Issue