Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a863055b authored by Jens Axboe's avatar Jens Axboe
Browse files

[PATCH] blktrace: don't return blktrace_seq from trace_note() 



Only the process notifier needs it, and it can set it manually.

Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent d3d9d2a5

block/blktrace.c

+4 −7
Original line number Original line Diff line number Diff line
@@ -31,7 +31,7 @@ static unsigned int blktrace_seq __read_mostly = 1; 
/*

/*

 * Send out a notify message.

 * Send out a notify message.

 */

 */

static unsigned int trace_note(struct blk_trace *bt, pid_t pid, int action,

static void trace_note(struct blk_trace *bt, pid_t pid, int action,

		       const void *data, size_t len)

		       const void *data, size_t len)

{

{

	struct blk_io_trace *t;

	struct blk_io_trace *t;
@@ -49,8 +49,6 @@ static unsigned int trace_note(struct blk_trace *bt, pid_t pid, int action, 
		t->pdu_len = len;

		t->pdu_len = len;

		memcpy((void *) t + sizeof(*t), data, len);

		memcpy((void *) t + sizeof(*t), data, len);

	}

	}



	return blktrace_seq;

}

}





/*

/*
@@ -59,9 +57,8 @@ static unsigned int trace_note(struct blk_trace *bt, pid_t pid, int action, 
 */

 */

static void trace_note_tsk(struct blk_trace *bt, struct task_struct *tsk)

static void trace_note_tsk(struct blk_trace *bt, struct task_struct *tsk)

{

{

	tsk->btrace_seq = trace_note(bt, tsk->pid,

	tsk->btrace_seq = blktrace_seq;

			BLK_TN_PROCESS,

	trace_note(bt, tsk->pid, BLK_TN_PROCESS, tsk->comm, sizeof(tsk->comm));

			tsk->comm, sizeof(tsk->comm));

}

}





static void trace_note_time(struct blk_trace *bt)

static void trace_note_time(struct blk_trace *bt)