projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
drivers
/
scsi
/
scsi_trace.c
diff --git
a/drivers/scsi/scsi_trace.c
b/drivers/scsi/scsi_trace.c
index
2bea4f0
..
503594e
100644
(file)
--- a/
drivers/scsi/scsi_trace.c
+++ b/
drivers/scsi/scsi_trace.c
@@
-28,7
+28,7
@@
scsi_trace_misc(struct trace_seq *, unsigned char *, int);
static const char *
scsi_trace_rw6(struct trace_seq *p, unsigned char *cdb, int len)
{
static const char *
scsi_trace_rw6(struct trace_seq *p, unsigned char *cdb, int len)
{
- const char *ret =
p->buffer + p->len
;
+ const char *ret =
trace_seq_buffer_ptr(p)
;
sector_t lba = 0, txlen = 0;
lba |= ((cdb[1] & 0x1F) << 16);
sector_t lba = 0, txlen = 0;
lba |= ((cdb[1] & 0x1F) << 16);
@@
-46,7
+46,7
@@
scsi_trace_rw6(struct trace_seq *p, unsigned char *cdb, int len)
static const char *
scsi_trace_rw10(struct trace_seq *p, unsigned char *cdb, int len)
{
static const char *
scsi_trace_rw10(struct trace_seq *p, unsigned char *cdb, int len)
{
- const char *ret =
p->buffer + p->len
;
+ const char *ret =
trace_seq_buffer_ptr(p)
;
sector_t lba = 0, txlen = 0;
lba |= (cdb[2] << 24);
sector_t lba = 0, txlen = 0;
lba |= (cdb[2] << 24);
@@
-71,7
+71,7
@@
scsi_trace_rw10(struct trace_seq *p, unsigned char *cdb, int len)
static const char *
scsi_trace_rw12(struct trace_seq *p, unsigned char *cdb, int len)
{
static const char *
scsi_trace_rw12(struct trace_seq *p, unsigned char *cdb, int len)
{
- const char *ret =
p->buffer + p->len
;
+ const char *ret =
trace_seq_buffer_ptr(p)
;
sector_t lba = 0, txlen = 0;
lba |= (cdb[2] << 24);
sector_t lba = 0, txlen = 0;
lba |= (cdb[2] << 24);
@@
-94,7
+94,7
@@
scsi_trace_rw12(struct trace_seq *p, unsigned char *cdb, int len)
static const char *
scsi_trace_rw16(struct trace_seq *p, unsigned char *cdb, int len)
{
static const char *
scsi_trace_rw16(struct trace_seq *p, unsigned char *cdb, int len)
{
- const char *ret =
p->buffer + p->len
;
+ const char *ret =
trace_seq_buffer_ptr(p)
;
sector_t lba = 0, txlen = 0;
lba |= ((u64)cdb[2] << 56);
sector_t lba = 0, txlen = 0;
lba |= ((u64)cdb[2] << 56);
@@
-125,7
+125,7
@@
scsi_trace_rw16(struct trace_seq *p, unsigned char *cdb, int len)
static const char *
scsi_trace_rw32(struct trace_seq *p, unsigned char *cdb, int len)
{
static const char *
scsi_trace_rw32(struct trace_seq *p, unsigned char *cdb, int len)
{
- const char *ret =
p->buffer + p->len
, *cmd;
+ const char *ret =
trace_seq_buffer_ptr(p)
, *cmd;
sector_t lba = 0, txlen = 0;
u32 ei_lbrt = 0;
sector_t lba = 0, txlen = 0;
u32 ei_lbrt = 0;
@@
-180,7
+180,7
@@
out:
static const char *
scsi_trace_unmap(struct trace_seq *p, unsigned char *cdb, int len)
{
static const char *
scsi_trace_unmap(struct trace_seq *p, unsigned char *cdb, int len)
{
- const char *ret =
p->buffer + p->len
;
+ const char *ret =
trace_seq_buffer_ptr(p)
;
unsigned int regions = cdb[7] << 8 | cdb[8];
trace_seq_printf(p, "regions=%u", (regions - 8) / 16);
unsigned int regions = cdb[7] << 8 | cdb[8];
trace_seq_printf(p, "regions=%u", (regions - 8) / 16);
@@
-192,7
+192,7
@@
scsi_trace_unmap(struct trace_seq *p, unsigned char *cdb, int len)
static const char *
scsi_trace_service_action_in(struct trace_seq *p, unsigned char *cdb, int len)
{
static const char *
scsi_trace_service_action_in(struct trace_seq *p, unsigned char *cdb, int len)
{
- const char *ret =
p->buffer + p->len
, *cmd;
+ const char *ret =
trace_seq_buffer_ptr(p)
, *cmd;
sector_t lba = 0;
u32 alloc_len = 0;
sector_t lba = 0;
u32 alloc_len = 0;
@@
-247,7
+247,7
@@
scsi_trace_varlen(struct trace_seq *p, unsigned char *cdb, int len)
static const char *
scsi_trace_misc(struct trace_seq *p, unsigned char *cdb, int len)
{
static const char *
scsi_trace_misc(struct trace_seq *p, unsigned char *cdb, int len)
{
- const char *ret =
p->buffer + p->len
;
+ const char *ret =
trace_seq_buffer_ptr(p)
;
trace_seq_printf(p, "-");
trace_seq_putc(p, 0);
trace_seq_printf(p, "-");
trace_seq_putc(p, 0);