From 3c327e53d03eb6717281bf7e26ee563cac54ab7f Mon Sep 17 00:00:00 2001 From: adilger Date: Mon, 22 Jul 2002 18:32:52 +0000 Subject: [PATCH] Call bulk descriptor "desc" instead of "bulk" for consistency. --- lustre/ptlrpc/niobuf.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lustre/ptlrpc/niobuf.c b/lustre/ptlrpc/niobuf.c index 072592f..408939c 100644 --- a/lustre/ptlrpc/niobuf.c +++ b/lustre/ptlrpc/niobuf.c @@ -30,15 +30,15 @@ extern ptl_handle_eq_t request_out_eq, reply_in_eq, reply_out_eq, bulk_source_eq, bulk_sink_eq; static ptl_process_id_t local_id = {PTL_NID_ANY, PTL_PID_ANY}; -int ptlrpc_check_bulk_sent(struct ptlrpc_bulk_desc *bulk) +int ptlrpc_check_bulk_sent(struct ptlrpc_bulk_desc *desc) { ENTRY; - if (bulk->b_flags & PTL_BULK_FL_SENT) + if (desc->b_flags & PTL_BULK_FL_SENT) RETURN(1); if (l_killable_pending(current)) { - bulk->b_flags |= PTL_RPC_FL_INTR; + desc->b_flags |= PTL_RPC_FL_INTR; RETURN(1); } @@ -46,15 +46,15 @@ int ptlrpc_check_bulk_sent(struct ptlrpc_bulk_desc *bulk) RETURN(0); } -int ptlrpc_check_bulk_received(struct ptlrpc_bulk_desc *bulk) +int ptlrpc_check_bulk_received(struct ptlrpc_bulk_desc *desc) { ENTRY; - if (bulk->b_flags & PTL_BULK_FL_RCVD) + if (desc->b_flags & PTL_BULK_FL_RCVD) RETURN(1); - + if (l_killable_pending(current)) { - bulk->b_flags |= PTL_RPC_FL_INTR; + desc->b_flags |= PTL_RPC_FL_INTR; RETURN(1); } -- 1.8.3.1