From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755489AbcGKRSg (ORCPT ); Mon, 11 Jul 2016 13:18:36 -0400 Received: from smtp1.ccs.ornl.gov ([160.91.199.38]:45819 "EHLO smtp1.ccs.ornl.gov" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753719AbcGKRSf (ORCPT ); Mon, 11 Jul 2016 13:18:35 -0400 From: James Simmons To: Al Viro , Andreas Dilger , Oleg Drokin Cc: Linux Kernel Mailing List , , Lustre Development List , James Simmons Subject: [PATCH] staging: lustre: o2iblnd: iov fixes for kiblnd_send Date: Mon, 11 Jul 2016 13:18:21 -0400 Message-Id: <1468257501-20630-1-git-send-email-jsimmons@infradead.org> X-Mailer: git-send-email 1.7.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org With the move to iov_iter handling two issues merged for the ko2iblnd driver. The first fix address a simple typo of the wrong flag being used with iov_iter_kvec. The second fix adds the payload offset to the payload size. Signed-off-by: James Simmons --- drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c index 3d597dc..437e149 100644 --- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c +++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c @@ -1519,12 +1519,15 @@ kiblnd_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg) /* payload is either all vaddrs or all pages */ LASSERT(!(payload_kiov && payload_iov)); - if (payload_kiov) + if (payload_kiov) { iov_iter_bvec(&from, ITER_BVEC | WRITE, - payload_kiov, payload_niov, payload_nob); - else - iov_iter_kvec(&from, ITER_BVEC | WRITE, - payload_iov, payload_niov, payload_nob); + payload_kiov, payload_niov, + payload_nob + payload_offset); + } else { + iov_iter_kvec(&from, ITER_KVEC | WRITE, + payload_iov, payload_niov, + payload_nob + payload_offset); + } iov_iter_advance(&from, payload_offset); switch (type) { -- 2.7.4