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

Commit 4f37bc04 authored by John L. Hammond's avatar John L. Hammond Committed by Greg Kroah-Hartman
Browse files

staging/lustre/llite: use READ, WRITE around ll_rw_stats_tally() 

In vvp_io_write_start() the stats function ll_rw_stats_tally() was
incorrectly called with a rw argument of 0. Correct this and use the
macros READ and WRITE in and around ll_rw_stats_tally() for clarity.

Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3384
Lustre-change: http://review.whamcloud.com/6447


Signed-off-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarJinshan Xiong <jinshan.xiong@intel.com>
Signed-off-by: default avatarPeng Tao <tao.peng@emc.com>
Signed-off-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2c922ba5

drivers/staging/lustre/lustre/llite/lproc_llite.c

+6 −4
Original line number Diff line number Diff line
@@ -1303,8 +1303,9 @@ static int ll_rw_offset_stats_seq_show(struct seq_file *seq, void *v) 
	/* We stored the discontiguous offsets here; print them first */

	for(i = 0; i < LL_OFFSET_HIST_MAX; i++) {

		if (offset[i].rw_pid != 0)

			seq_printf(seq,"%3c %10d %14Lu %14Lu %17lu %17lu %14Lu",

				   offset[i].rw_op ? 'W' : 'R',

			seq_printf(seq,

				   "%3c %10d %14Lu %14Lu %17lu %17lu %14Lu",

				   offset[i].rw_op == READ ? 'R' : 'W',

				   offset[i].rw_pid,

				   offset[i].rw_range_start,

				   offset[i].rw_range_end,
@@ -1315,8 +1316,9 @@ static int ll_rw_offset_stats_seq_show(struct seq_file *seq, void *v) 
	/* Then print the current offsets for each process */

	for(i = 0; i < LL_PROCESS_HIST_MAX; i++) {

		if (process[i].rw_pid != 0)

			seq_printf(seq,"%3c %10d %14Lu %14Lu %17lu %17lu %14Lu",

				   process[i].rw_op ? 'W' : 'R',

			seq_printf(seq,

				   "%3c %10d %14Lu %14Lu %17lu %17lu %14Lu",

				   process[i].rw_op == READ ? 'R' : 'W',

				   process[i].rw_pid,

				   process[i].rw_range_start,

				   process[i].rw_last_file_pos,

drivers/staging/lustre/lustre/llite/vvp_io.c

+2 −2
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ static int vvp_io_read_start(const struct lu_env *env, 
			io->ci_continue = 0;

		io->ci_nob += result;

		ll_rw_stats_tally(ll_i2sbi(inode), current->pid,

				  cio->cui_fd, pos, result, 0);

				  cio->cui_fd, pos, result, READ);

		result = 0;

	}

	return result;
@@ -580,7 +580,7 @@ static int vvp_io_write_start(const struct lu_env *env, 
			io->ci_continue = 0;

		io->ci_nob += result;

		ll_rw_stats_tally(ll_i2sbi(inode), current->pid,

				  cio->cui_fd, pos, result, 0);

				  cio->cui_fd, pos, result, WRITE);

		result = 0;

	}

	RETURN(result);