From: pravins Date: Tue, 25 Aug 2009 10:09:44 +0000 (+0000) Subject: b=20339 X-Git-Tag: v1_9_250~11 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=7c38d0466d7add91dbbf88ab2d8be07ef6c31d49;p=fs%2Flustre-release.git b=20339 i=adilger fixes in LPSZ removal patch. --- diff --git a/lustre/llite/lproc_llite.c b/lustre/llite/lproc_llite.c index 19d5b19..3c74cfc 100644 --- a/lustre/llite/lproc_llite.c +++ b/lustre/llite/lproc_llite.c @@ -1184,8 +1184,8 @@ static int ll_rw_offset_stats_seq_show(struct seq_file *seq, void *v) offset[i].rw_pid, offset[i].rw_range_start, offset[i].rw_range_end, - offset[i].rw_smallest_extent, - offset[i].rw_largest_extent, + (unsigned long)offset[i].rw_smallest_extent, + (unsigned long)offset[i].rw_largest_extent, offset[i].rw_offset); } /* Then print the current offsets for each process */ @@ -1196,8 +1196,8 @@ static int ll_rw_offset_stats_seq_show(struct seq_file *seq, void *v) process[i].rw_pid, process[i].rw_range_start, process[i].rw_last_file_pos, - process[i].rw_smallest_extent, - process[i].rw_largest_extent, + (unsigned long)process[i].rw_smallest_extent, + (unsigned long)process[i].rw_largest_extent, process[i].rw_offset); } spin_unlock(&sbi->ll_process_lock); diff --git a/lustre/obdclass/cl_io.c b/lustre/obdclass/cl_io.c index 8cc0839..676ffac 100644 --- a/lustre/obdclass/cl_io.c +++ b/lustre/obdclass/cl_io.c @@ -228,7 +228,7 @@ int cl_io_rw_init(const struct lu_env *env, struct cl_io *io, LU_OBJECT_HEADER(D_VFSTRACE, env, &io->ci_obj->co_lu, "io range: %u ["LPU64", "LPU64") %u %u\n", - iot, (__u64)pos, (__u64)pos + count), + iot, (__u64)pos, (__u64)pos + count, io->u.ci_rw.crw_nonblock, io->u.ci_wr.wr_append); io->u.ci_rw.crw_pos = pos; io->u.ci_rw.crw_count = count;