From f857751887742e348b13a33dffe866714fd1f2fc Mon Sep 17 00:00:00 2001 From: Dennis Dalessandro Date: Fri, 1 Feb 2008 14:08:22 -0500 Subject: [PATCH] fix max size bug --- src/client/sysint/sys-osd-io.sm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/client/sysint/sys-osd-io.sm b/src/client/sysint/sys-osd-io.sm index 94f059e..fef1637 100644 --- a/src/client/sysint/sys-osd-io.sm +++ b/src/client/sysint/sys-osd-io.sm @@ -194,7 +194,7 @@ static int osd_io_setup_msgpairs(struct PINT_smcb *smcb, job_status_s *js_p) PVFS_size target_size[OSD_INIT_MAX_IOVEC]; /* total bytes to read/write from each io server */ - PVFS_size sbytemax = io->mem_req->aggregate_size / dfile_count; + PVFS_size sbytemax = io->mem_req->aggregate_size; PVFS_size this_aggregate_size = 0; /* structures to pass into req proc engine */ @@ -204,9 +204,7 @@ static int osd_io_setup_msgpairs(struct PINT_smcb *smcb, job_status_s *js_p) if (sbytemax > KERNEL_BUFSIZE) { gossip_debug(GOSSIP_IO_DEBUG, "%s: SCSI buffer %lld cant handle %lld\n", __func__, lld(KERNEL_BUFSIZE), lld(sbytemax)); - //~ ret = -ENOMEM; - //~ goto out; - sbytemax = KERNEL_BUFSIZE / sm_p->u.io.datafile_count; + sbytemax = KERNEL_BUFSIZE; } @@ -582,12 +580,6 @@ static int osd_io_setup_msgpairs(struct PINT_smcb *smcb, job_status_s *js_p) gossip_debug(GOSSIP_IO_DEBUG, "%s: Aggreagte Transferred: %lld\n", __func__, lld(this_aggregate_size)); - if (this_aggregate_size != sbytemax * dfile_count) { - gossip_err("%s: Got %lld bytes data and wanted %lld bytes\n", - __func__, lld(this_aggregate_size), lld(sbytemax)); - ret = -EINVAL; - } - out: js_p->error_code = ret; return 1;