LU-394: LND failure casued by discontiguous KIOV

Fix the problem of assigning starting_offset twice. This is imported
in combining patchset of lu-394 and lu-523.

Change-Id: Ia4ea205f211c70965101507906b02799a65694be
Signed-off-by: Jinshan Xiong <jay@whamcloud.com>
Reviewed-on: http://review.whamcloud.com/1146
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Tested-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index 964c5bc..33a0c2c 100644 (file)
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -2584,11 +2584,8 @@ osc_send_oap_rpc(const struct lu_env *env, struct client_obd *cli,
 
                 /* now put the page back in our accounting */
                 cfs_list_add_tail(&oap->oap_rpc_item, &rpc_list);
-                if (page_count++ == 0) {
+                if (page_count++ == 0)
                         srvlock = !!(oap->oap_brw_flags & OBD_BRW_SRVLOCK);
-                        starting_offset = (oap->oap_obj_off+oap->oap_page_off) &
-                                          (PTLRPC_MAX_BRW_SIZE - 1);
-                }
 
                 if (oap->oap_brw_flags & OBD_BRW_MEMALLOC)
                         mem_tight = 1;