X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fptlrpc%2Fpack_generic.c;h=8dc854652da3410824bdb444b66731fb7493ac06;hp=3e9c269b1cb5db661b551389d24b0ebce42ba2d7;hb=84a3fd67356c8073a917ea6abd63928055e38156;hpb=14d1efa1ecda80f11f6cc1d42c517dcfdf914ce5 diff --git a/lustre/ptlrpc/pack_generic.c b/lustre/ptlrpc/pack_generic.c index 3e9c269..8dc8546 100644 --- a/lustre/ptlrpc/pack_generic.c +++ b/lustre/ptlrpc/pack_generic.c @@ -1,31 +1,45 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: +/* + * GPL HEADER START + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). * - * Copyright (C) 2001-2003 Cluster File Systems, Inc. - * Author: Peter J. Braam - * Author: Phil Schwan - * Author: Eric Barton + * You should have received a copy of the GNU General Public License + * version 2 along with this program; If not, see + * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf * - * This file is part of the Lustre file system, http://www.lustre.org - * Lustre is a trademark of Cluster File Systems, Inc. + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. * - * You may have signed or agreed to another license before downloading - * this software. If so, you are bound by the terms and conditions - * of that agreement, and the following does not apply to you. See the - * LICENSE file included with this distribution for more information. + * GPL HEADER END + */ +/* + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. * - * If you did not agree to a different license, then this copy of Lustre - * is open source software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * Copyright (c) 2011, 2012, Whamcloud, Inc. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. * - * In either case, Lustre is distributed in the hope that it will be - * useful, but WITHOUT ANY WARRANTY; without even the implied warranty - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * license text for more details. + * lustre/ptlrpc/pack_generic.c * * (Un)packing of OST requests * + * Author: Peter J. Braam + * Author: Phil Schwan + * Author: Eric Barton */ #define DEBUG_SUBSYSTEM S_RPC @@ -38,31 +52,49 @@ #include #include #include +#include +#include -#if LUSTRE_VERSION_CODE > OBD_OCD_VERSION(1,8,0,0) -#error "lustre_msg_v1 has been deprecated since 1.6.0, please remove it" -#elif LUSTRE_VERSION_CODE > OBD_OCD_VERSION(1,6,50,0) -#warning "lustre_msg_v1 has been deprecated since 1.6.0, consider removing it" -#endif +static inline int lustre_msg_hdr_size_v2(int count) +{ + return cfs_size_round(offsetof(struct lustre_msg_v2, + lm_buflens[count])); +} -static inline int lustre_msg_hdr_size_v1(int count) +int lustre_msg_hdr_size(__u32 magic, int count) { - return size_round(offsetof(struct lustre_msg_v1, lm_buflens[count])); + switch (magic) { + case LUSTRE_MSG_MAGIC_V2: + return lustre_msg_hdr_size_v2(count); + default: + LASSERTF(0, "incorrect message magic: %08x\n", magic); + return -EINVAL; + } } +EXPORT_SYMBOL(lustre_msg_hdr_size); -static inline int lustre_msg_hdr_size_v2(int count) +void ptlrpc_buf_set_swabbed(struct ptlrpc_request *req, const int inout, + int index) { - return size_round(offsetof(struct lustre_msg_v2, lm_buflens[count])); + if (inout) + lustre_set_req_swabbed(req, index); + else + lustre_set_rep_swabbed(req, index); } -int lustre_msg_swabbed(struct lustre_msg *msg) +int ptlrpc_buf_need_swab(struct ptlrpc_request *req, const int inout, + int index) { - return (msg->lm_magic == LUSTRE_MSG_MAGIC_V1_SWABBED) || - (msg->lm_magic == LUSTRE_MSG_MAGIC_V2_SWABBED); + if (inout) + return (ptlrpc_req_need_swab(req) && + !lustre_req_swabbed(req, index)); + else + return (ptlrpc_rep_need_swab(req) && + !lustre_rep_swabbed(req, index)); } -static inline int -lustre_msg_check_version_v2(struct lustre_msg_v2 *msg, __u32 version) +static inline int lustre_msg_check_version_v2(struct lustre_msg_v2 *msg, + __u32 version) { __u32 ver = lustre_msg_get_version(msg); return (ver & LUSTRE_VERSION_MASK) != version; @@ -72,10 +104,9 @@ int lustre_msg_check_version(struct lustre_msg *msg, __u32 version) { switch (msg->lm_magic) { case LUSTRE_MSG_MAGIC_V1: - case LUSTRE_MSG_MAGIC_V1_SWABBED: - return 0; + CERROR("msg v1 not supported - please upgrade you system\n"); + return -EINVAL; case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: return lustre_msg_check_version_v2(msg, version); default: CERROR("incorrect message magic: %08x\n", msg->lm_magic); @@ -83,37 +114,47 @@ int lustre_msg_check_version(struct lustre_msg *msg, __u32 version) } } -static inline int lustre_msg_size_v1(int count, int *lengths) +/* early reply size */ +int lustre_msg_early_size() { - int size; - int i; - - LASSERT(count >= 0); - size = lustre_msg_hdr_size_v1(count); - for (i = 0; i < count; i++) - size += size_round(lengths[i]); - + static int size = 0; + if (!size) { + /* Always reply old ptlrpc_body_v2 to keep interoprability + * with the old client (< 2.3) which doesn't have pb_jobid + * in the ptlrpc_body. + * + * XXX Remove this whenever we dorp interoprability with such + * client. + */ + __u32 pblen = sizeof(struct ptlrpc_body_v2); + size = lustre_msg_size(LUSTRE_MSG_MAGIC_V2, 1, &pblen); + } return size; } +EXPORT_SYMBOL(lustre_msg_early_size); -int lustre_msg_size_v2(int count, int *lengths) +int lustre_msg_size_v2(int count, __u32 *lengths) { int size; int i; size = lustre_msg_hdr_size_v2(count); for (i = 0; i < count; i++) - size += size_round(lengths[i]); + size += cfs_size_round(lengths[i]); return size; } EXPORT_SYMBOL(lustre_msg_size_v2); /* This returns the size of the buffer that is required to hold a lustre_msg - * with the given sub-buffer lengths. */ -int lustre_msg_size(__u32 magic, int count, int *lens) + * with the given sub-buffer lengths. + * NOTE: this should only be used for NEW requests, and should always be + * in the form of a v2 request. If this is a connection to a v1 + * target then the first buffer will be stripped because the ptlrpc + * data is part of the lustre_msg_v1 header. b=14043 */ +int lustre_msg_size(__u32 magic, int count, __u32 *lens) { - int size[] = { sizeof(struct ptlrpc_body) }; + __u32 size[] = { sizeof(struct ptlrpc_body) }; if (!lens) { LASSERT(count == 1); @@ -121,11 +162,9 @@ int lustre_msg_size(__u32 magic, int count, int *lens) } LASSERT(count > 0); - LASSERT(lens[MSG_PTLRPC_BODY_OFF] == sizeof(struct ptlrpc_body)); + LASSERT(lens[MSG_PTLRPC_BODY_OFF] >= sizeof(struct ptlrpc_body_v2)); switch (magic) { - case LUSTRE_MSG_MAGIC_V1: - return lustre_msg_size_v1(count - 1, lens + 1); case LUSTRE_MSG_MAGIC_V2: return lustre_msg_size_v2(count, lens); default: @@ -134,32 +173,20 @@ int lustre_msg_size(__u32 magic, int count, int *lens) } } -static -void lustre_init_msg_v1(void *m, int count, int *lens, char **bufs) +/* This is used to determine the size of a buffer that was already packed + * and will correctly handle the different message formats. */ +int lustre_packed_msg_size(struct lustre_msg *msg) { - struct lustre_msg_v1 *msg = (struct lustre_msg_v1 *)m; - char *ptr; - int i; - - LASSERT(count >= 0); - msg->lm_magic = LUSTRE_MSG_MAGIC_V1; - msg->lm_version = PTLRPC_MSG_VERSION; - msg->lm_bufcount = count; - - for (i = 0; i < count; i++) - msg->lm_buflens[i] = lens[i]; - - if (bufs == NULL) - return; - - ptr = (char *)msg + lustre_msg_hdr_size_v1(count); - for (i = 0; i < count; i++) { - char *tmp = bufs[i]; - LOGL(tmp, lens[i], ptr); + switch (msg->lm_magic) { + case LUSTRE_MSG_MAGIC_V2: + return lustre_msg_size_v2(msg->lm_bufcount, msg->lm_buflens); + default: + CERROR("incorrect message magic: %08x\n", msg->lm_magic); + return 0; } } -void lustre_init_msg_v2(struct lustre_msg_v2 *msg, int count, int *lens, +void lustre_init_msg_v2(struct lustre_msg_v2 *msg, int count, __u32 *lens, char **bufs) { char *ptr; @@ -183,25 +210,8 @@ void lustre_init_msg_v2(struct lustre_msg_v2 *msg, int count, int *lens, } EXPORT_SYMBOL(lustre_init_msg_v2); -static int lustre_pack_request_v1(struct ptlrpc_request *req, - int count, int *lens, char **bufs) -{ - int reqlen, rc; - - reqlen = lustre_msg_size_v1(count, lens); - - rc = sptlrpc_cli_alloc_reqbuf(req, reqlen); - if (rc) - return rc; - - req->rq_reqlen = reqlen; - - lustre_init_msg_v1(req->rq_reqmsg, count, lens, bufs); - return 0; -} - static int lustre_pack_request_v2(struct ptlrpc_request *req, - int count, int *lens, char **bufs) + int count, __u32 *lens, char **bufs) { int reqlen, rc; @@ -215,14 +225,13 @@ static int lustre_pack_request_v2(struct ptlrpc_request *req, lustre_init_msg_v2(req->rq_reqmsg, count, lens, bufs); lustre_msg_add_version(req->rq_reqmsg, PTLRPC_MSG_VERSION); - lustre_set_req_swabbed(req, MSG_PTLRPC_BODY_OFF); return 0; } int lustre_pack_request(struct ptlrpc_request *req, __u32 magic, int count, - int *lens, char **bufs) + __u32 *lens, char **bufs) { - int size[] = { sizeof(struct ptlrpc_body) }; + __u32 size[] = { sizeof(struct ptlrpc_body) }; if (!lens) { LASSERT(count == 1); @@ -232,17 +241,10 @@ int lustre_pack_request(struct ptlrpc_request *req, __u32 magic, int count, LASSERT(count > 0); LASSERT(lens[MSG_PTLRPC_BODY_OFF] == sizeof(struct ptlrpc_body)); - /* if we choose policy other than null, we have also choosed - * to use new message format. - */ - if (magic == LUSTRE_MSG_MAGIC_V1 && - req->rq_sec_flavor != SPTLRPC_FLVR_NULL) - magic = LUSTRE_MSG_MAGIC_V2; + /* only use new format, we don't need to be compatible with 1.4 */ + magic = LUSTRE_MSG_MAGIC_V2; switch (magic) { - case LUSTRE_MSG_MAGIC_V1: - return lustre_pack_request_v1(req, count - 1, lens + 1, - bufs ? bufs + 1 : NULL); case LUSTRE_MSG_MAGIC_V2: return lustre_pack_request_v2(req, count, lens, bufs); default: @@ -253,20 +255,20 @@ int lustre_pack_request(struct ptlrpc_request *req, __u32 magic, int count, #if RS_DEBUG CFS_LIST_HEAD(ptlrpc_rs_debug_lru); -spinlock_t ptlrpc_rs_debug_lock; +cfs_spinlock_t ptlrpc_rs_debug_lock; #define PTLRPC_RS_DEBUG_LRU_ADD(rs) \ do { \ - spin_lock(&ptlrpc_rs_debug_lock); \ - list_add_tail(&(rs)->rs_debug_list, &ptlrpc_rs_debug_lru); \ - spin_unlock(&ptlrpc_rs_debug_lock); \ + cfs_spin_lock(&ptlrpc_rs_debug_lock); \ + cfs_list_add_tail(&(rs)->rs_debug_list, &ptlrpc_rs_debug_lru); \ + cfs_spin_unlock(&ptlrpc_rs_debug_lock); \ } while (0) #define PTLRPC_RS_DEBUG_LRU_DEL(rs) \ do { \ - spin_lock(&ptlrpc_rs_debug_lock); \ - list_del(&(rs)->rs_debug_list); \ - spin_unlock(&ptlrpc_rs_debug_lock); \ + cfs_spin_lock(&ptlrpc_rs_debug_lock); \ + cfs_list_del(&(rs)->rs_debug_list); \ + cfs_spin_unlock(&ptlrpc_rs_debug_lock); \ } while (0) #else # define PTLRPC_RS_DEBUG_LRU_ADD(rs) do {} while(0) @@ -277,26 +279,27 @@ struct ptlrpc_reply_state *lustre_get_emerg_rs(struct ptlrpc_service *svc) { struct ptlrpc_reply_state *rs = NULL; - spin_lock(&svc->srv_lock); + cfs_spin_lock(&svc->srv_rs_lock); /* See if we have anything in a pool, and wait if nothing */ - while (list_empty(&svc->srv_free_rs_list)) { + while (cfs_list_empty(&svc->srv_free_rs_list)) { struct l_wait_info lwi; int rc; - spin_unlock(&svc->srv_lock); + cfs_spin_unlock(&svc->srv_rs_lock); /* If we cannot get anything for some long time, we better bail out instead of waiting infinitely */ lwi = LWI_TIMEOUT(cfs_time_seconds(10), NULL, NULL); rc = l_wait_event(svc->srv_free_rs_waitq, - !list_empty(&svc->srv_free_rs_list), &lwi); + !cfs_list_empty(&svc->srv_free_rs_list), + &lwi); if (rc) goto out; - spin_lock(&svc->srv_lock); + cfs_spin_lock(&svc->srv_rs_lock); } - rs = list_entry(svc->srv_free_rs_list.next, struct ptlrpc_reply_state, - rs_list); - list_del(&rs->rs_list); - spin_unlock(&svc->srv_lock); + rs = cfs_list_entry(svc->srv_free_rs_list.next, + struct ptlrpc_reply_state, rs_list); + cfs_list_del(&rs->rs_list); + cfs_spin_unlock(&svc->srv_rs_lock); LASSERT(rs); memset(rs, 0, svc->srv_max_reply_size); rs->rs_service = svc; @@ -311,46 +314,14 @@ void lustre_put_emerg_rs(struct ptlrpc_reply_state *rs) LASSERT(svc); - spin_lock(&svc->srv_lock); - list_add(&rs->rs_list, &svc->srv_free_rs_list); - spin_unlock(&svc->srv_lock); + cfs_spin_lock(&svc->srv_rs_lock); + cfs_list_add(&rs->rs_list, &svc->srv_free_rs_list); + cfs_spin_unlock(&svc->srv_rs_lock); cfs_waitq_signal(&svc->srv_free_rs_waitq); } -static int lustre_pack_reply_v1(struct ptlrpc_request *req, int count, - int *lens, char **bufs) -{ - struct ptlrpc_reply_state *rs; - int msg_len, rc; - ENTRY; - - LASSERT (req->rq_reply_state == NULL); - - msg_len = lustre_msg_size_v1(count, lens); - rc = sptlrpc_svc_alloc_rs(req, msg_len); - if (rc) - RETURN(rc); - - rs = req->rq_reply_state; - atomic_set(&rs->rs_refcount, 1); /* 1 ref for rq_reply_state */ - rs->rs_cb_id.cbid_fn = reply_out_callback; - rs->rs_cb_id.cbid_arg = rs; - rs->rs_service = req->rq_rqbd->rqbd_service; - CFS_INIT_LIST_HEAD(&rs->rs_exp_list); - CFS_INIT_LIST_HEAD(&rs->rs_obd_list); - - req->rq_replen = msg_len; - req->rq_reply_state = rs; - req->rq_repmsg = rs->rs_msg; - lustre_init_msg_v1(rs->rs_msg, count, lens, bufs); - - PTLRPC_RS_DEBUG_LRU_ADD(rs); - - RETURN (0); -} - int lustre_pack_reply_v2(struct ptlrpc_request *req, int count, - int *lens, char **bufs) + __u32 *lens, char **bufs, int flags) { struct ptlrpc_reply_state *rs; int msg_len, rc; @@ -358,25 +329,33 @@ int lustre_pack_reply_v2(struct ptlrpc_request *req, int count, LASSERT(req->rq_reply_state == NULL); + if ((flags & LPRFL_EARLY_REPLY) == 0) { + cfs_spin_lock(&req->rq_lock); + req->rq_packed_final = 1; + cfs_spin_unlock(&req->rq_lock); + } + msg_len = lustre_msg_size_v2(count, lens); rc = sptlrpc_svc_alloc_rs(req, msg_len); if (rc) RETURN(rc); rs = req->rq_reply_state; - atomic_set(&rs->rs_refcount, 1); /* 1 ref for rq_reply_state */ + cfs_atomic_set(&rs->rs_refcount, 1); /* 1 ref for rq_reply_state */ rs->rs_cb_id.cbid_fn = reply_out_callback; rs->rs_cb_id.cbid_arg = rs; rs->rs_service = req->rq_rqbd->rqbd_service; CFS_INIT_LIST_HEAD(&rs->rs_exp_list); CFS_INIT_LIST_HEAD(&rs->rs_obd_list); + CFS_INIT_LIST_HEAD(&rs->rs_list); + cfs_spin_lock_init(&rs->rs_lock); req->rq_replen = msg_len; req->rq_reply_state = rs; req->rq_repmsg = rs->rs_msg; + lustre_init_msg_v2(rs->rs_msg, count, lens, bufs); lustre_msg_add_version(rs->rs_msg, PTLRPC_MSG_VERSION); - lustre_set_rep_swabbed(req, MSG_PTLRPC_BODY_OFF); PTLRPC_RS_DEBUG_LRU_ADD(rs); @@ -384,10 +363,11 @@ int lustre_pack_reply_v2(struct ptlrpc_request *req, int count, } EXPORT_SYMBOL(lustre_pack_reply_v2); -int lustre_pack_reply(struct ptlrpc_request *req, int count, int *lens, - char **bufs) +int lustre_pack_reply_flags(struct ptlrpc_request *req, int count, __u32 *lens, + char **bufs, int flags) { - int size[] = { sizeof(struct ptlrpc_body) }; + int rc = 0; + __u32 size[] = { sizeof(struct ptlrpc_body) }; if (!lens) { LASSERT(count == 1); @@ -398,48 +378,24 @@ int lustre_pack_reply(struct ptlrpc_request *req, int count, int *lens, LASSERT(lens[MSG_PTLRPC_BODY_OFF] == sizeof(struct ptlrpc_body)); switch (req->rq_reqmsg->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - case LUSTRE_MSG_MAGIC_V1_SWABBED: - return lustre_pack_reply_v1(req, count - 1, lens + 1, - bufs ? bufs + 1 : NULL); case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: - return lustre_pack_reply_v2(req, count, lens, bufs); + rc = lustre_pack_reply_v2(req, count, lens, bufs, flags); + break; default: LASSERTF(0, "incorrect message magic: %08x\n", req->rq_reqmsg->lm_magic); - return -EINVAL; + rc = -EINVAL; } + if (rc != 0) + CERROR("lustre_pack_reply failed: rc=%d size=%d\n", rc, + lustre_msg_size(req->rq_reqmsg->lm_magic, count, lens)); + return rc; } -void *lustre_msg_buf_v1(void *msg, int n, int min_size) +int lustre_pack_reply(struct ptlrpc_request *req, int count, __u32 *lens, + char **bufs) { - struct lustre_msg_v1 *m = (struct lustre_msg_v1 *)msg; - int i, offset, buflen, bufcount; - - LASSERT(m != NULL); - LASSERT(n >= 0); - - bufcount = m->lm_bufcount; - if (unlikely(n >= bufcount)) { - CDEBUG(D_INFO, "msg %p buffer[%d] not present (count %d)\n", - m, n, bufcount); - return NULL; - } - - buflen = m->lm_buflens[n]; - if (unlikely(buflen < min_size)) { - CERROR("msg %p buffer[%d] size %d too small (required %d)\n", - m, n, buflen, min_size); - LBUG(); - return NULL; - } - - offset = lustre_msg_hdr_size_v1(bufcount); - for (i = 0; i < n; i++) - offset += size_round(m->lm_buflens[i]); - - return (char *)m + offset; + return lustre_pack_reply_flags(req, count, lens, bufs, 0); } void *lustre_msg_buf_v2(struct lustre_msg_v2 *m, int n, int min_size) @@ -458,14 +414,15 @@ void *lustre_msg_buf_v2(struct lustre_msg_v2 *m, int n, int min_size) buflen = m->lm_buflens[n]; if (unlikely(buflen < min_size)) { - CERROR("msg %p buffer[%d] size %d too small (required %d)\n", - m, n, buflen, min_size); + CERROR("msg %p buffer[%d] size %d too small " + "(required %d, opc=%d)\n", m, n, buflen, min_size, + n == MSG_PTLRPC_BODY_OFF ? -1 : lustre_msg_get_opc(m)); return NULL; } offset = lustre_msg_hdr_size_v2(bufcount); for (i = 0; i < n; i++) - offset += size_round(m->lm_buflens[i]); + offset += cfs_size_round(m->lm_buflens[i]); return (char *)m + offset; } @@ -473,11 +430,7 @@ void *lustre_msg_buf_v2(struct lustre_msg_v2 *m, int n, int min_size) void *lustre_msg_buf(struct lustre_msg *m, int n, int min_size) { switch (m->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - case LUSTRE_MSG_MAGIC_V1_SWABBED: - return lustre_msg_buf_v1(m, n - 1, min_size); case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: return lustre_msg_buf_v2(m, n, min_size); default: LASSERTF(0, "incorrect message magic: %08x(msg:%p)\n", m->lm_magic, m); @@ -485,45 +438,6 @@ void *lustre_msg_buf(struct lustre_msg *m, int n, int min_size) } } -int lustre_shrink_msg_v1(struct lustre_msg_v1 *msg, int segment, - unsigned int newlen, int move_data) -{ - char *tail = NULL, *newpos; - int tail_len = 0, n; - - LASSERT(msg); - LASSERT(segment >= 0); - LASSERT(msg->lm_bufcount > segment); - LASSERT(msg->lm_buflens[segment] >= newlen); - - if (msg->lm_buflens[segment] == newlen) - goto out; - - if (move_data && msg->lm_bufcount > segment + 1) { - tail = lustre_msg_buf_v1(msg, segment + 1, 0); - for (n = segment + 1; n < msg->lm_bufcount; n++) - tail_len += size_round(msg->lm_buflens[n]); - } - - msg->lm_buflens[segment] = newlen; - - if (tail && tail_len) { - newpos = lustre_msg_buf_v1(msg, segment + 1, 0); - LASSERT(newpos <= tail); - if (newpos != tail) - memcpy(newpos, tail, tail_len); - } - - if (newlen == 0 && msg->lm_bufcount > segment + 1) { - memmove(&msg->lm_buflens[segment], &msg->lm_buflens[segment + 1], - (msg->lm_bufcount - segment - 1) * sizeof(__u32)); - msg->lm_buflens[msg->lm_bufcount - 1] = 0; - } - -out: - return lustre_msg_size_v1(msg->lm_bufcount, msg->lm_buflens); -} - int lustre_shrink_msg_v2(struct lustre_msg_v2 *msg, int segment, unsigned int newlen, int move_data) { @@ -540,7 +454,7 @@ int lustre_shrink_msg_v2(struct lustre_msg_v2 *msg, int segment, if (move_data && msg->lm_bufcount > segment + 1) { tail = lustre_msg_buf_v2(msg, segment + 1, 0); for (n = segment + 1; n < msg->lm_bufcount; n++) - tail_len += size_round(msg->lm_buflens[n]); + tail_len += cfs_size_round(msg->lm_buflens[n]); } msg->lm_buflens[segment] = newlen; @@ -549,15 +463,8 @@ int lustre_shrink_msg_v2(struct lustre_msg_v2 *msg, int segment, newpos = lustre_msg_buf_v2(msg, segment + 1, 0); LASSERT(newpos <= tail); if (newpos != tail) - memcpy(newpos, tail, tail_len); + memmove(newpos, tail, tail_len); } - - if (newlen == 0 && msg->lm_bufcount > segment + 1) { - memmove(&msg->lm_buflens[segment], &msg->lm_buflens[segment + 1], - (msg->lm_bufcount - segment - 1) * sizeof(__u32)); - msg->lm_buflens[msg->lm_bufcount - 1] = 0; - } - out: return lustre_msg_size_v2(msg->lm_bufcount, msg->lm_buflens); } @@ -582,9 +489,6 @@ int lustre_shrink_msg(struct lustre_msg *msg, int segment, unsigned int newlen, int move_data) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - return lustre_shrink_msg_v1((struct lustre_msg_v1 *) msg, - segment - 1, newlen, move_data); case LUSTRE_MSG_MAGIC_V2: return lustre_shrink_msg_v2(msg, segment, newlen, move_data); default: @@ -596,80 +500,21 @@ void lustre_free_reply_state(struct ptlrpc_reply_state *rs) { PTLRPC_RS_DEBUG_LRU_DEL(rs); - LASSERT (atomic_read(&rs->rs_refcount) == 0); + LASSERT (cfs_atomic_read(&rs->rs_refcount) == 0); LASSERT (!rs->rs_difficult || rs->rs_handled); LASSERT (!rs->rs_on_net); LASSERT (!rs->rs_scheduled); LASSERT (rs->rs_export == NULL); LASSERT (rs->rs_nlocks == 0); - LASSERT (list_empty(&rs->rs_exp_list)); - LASSERT (list_empty(&rs->rs_obd_list)); + LASSERT (cfs_list_empty(&rs->rs_exp_list)); + LASSERT (cfs_list_empty(&rs->rs_obd_list)); sptlrpc_svc_free_rs(rs); } -int lustre_unpack_msg_v1(void *msg, int len) -{ - struct lustre_msg_v1 *m = (struct lustre_msg_v1 *)msg; - int flipped, required_len, i; - ENTRY; - - /* Now we know the sender speaks my language. */ - required_len = lustre_msg_hdr_size_v1(0); - if (len < required_len) { - /* can't even look inside the message */ - CERROR("message length %d too small for lustre_msg\n", len); - RETURN(-EINVAL); - } - - flipped = lustre_msg_swabbed((struct lustre_msg *)m); - - if (flipped) { - __swab32s(&m->lm_type); - __swab32s(&m->lm_version); - __swab32s(&m->lm_opc); - __swab64s(&m->lm_last_xid); - __swab64s(&m->lm_last_committed); - __swab64s(&m->lm_transno); - __swab32s(&m->lm_status); - __swab32s(&m->lm_flags); - __swab32s(&m->lm_conn_cnt); - __swab32s(&m->lm_bufcount); - } - - if (m->lm_version != PTLRPC_MSG_VERSION) { - CERROR("wrong lustre_msg version %08x\n", m->lm_version); - RETURN(-EINVAL); - } - - required_len = lustre_msg_hdr_size_v1(m->lm_bufcount); - if (len < required_len) { - /* didn't receive all the buffer lengths */ - CERROR("message length %d too small for %d buflens\n", - len, m->lm_bufcount); - RETURN(-EINVAL); - } - - for (i = 0; i < m->lm_bufcount; i++) { - if (flipped) - __swab32s (&m->lm_buflens[i]); - required_len += size_round(m->lm_buflens[i]); - } - - if (len < required_len) { - CERROR("len: %d, required_len %d\n", len, required_len); - CERROR("bufcount: %d\n", m->lm_bufcount); - for (i = 0; i < m->lm_bufcount; i++) - CERROR("buffer %d length %d\n", i, m->lm_buflens[i]); - RETURN(-EINVAL); - } - - RETURN(0); -} - static int lustre_unpack_msg_v2(struct lustre_msg_v2 *m, int len) { - int flipped, required_len, i; + int swabbed, required_len, i; /* Now we know the sender speaks my language. */ required_len = lustre_msg_hdr_size_v2(0); @@ -679,14 +524,15 @@ static int lustre_unpack_msg_v2(struct lustre_msg_v2 *m, int len) return -EINVAL; } - flipped = lustre_msg_swabbed(m); + swabbed = (m->lm_magic == LUSTRE_MSG_MAGIC_V2_SWABBED); - if (flipped) { + if (swabbed) { + __swab32s(&m->lm_magic); __swab32s(&m->lm_bufcount); __swab32s(&m->lm_secflvr); __swab32s(&m->lm_repsize); - __swab32s(&m->lm_timeout); - CLASSERT(offsetof(typeof(*m), lm_padding_1) != 0); + __swab32s(&m->lm_cksum); + __swab32s(&m->lm_flags); CLASSERT(offsetof(typeof(*m), lm_padding_2) != 0); CLASSERT(offsetof(typeof(*m), lm_padding_3) != 0); } @@ -698,11 +544,11 @@ static int lustre_unpack_msg_v2(struct lustre_msg_v2 *m, int len) len, m->lm_bufcount); return -EINVAL; } - + for (i = 0; i < m->lm_bufcount; i++) { - if (flipped) + if (swabbed) __swab32s(&m->lm_buflens[i]); - required_len += size_round(m->lm_buflens[i]); + required_len += cfs_size_round(m->lm_buflens[i]); } if (len < required_len) { @@ -713,10 +559,10 @@ static int lustre_unpack_msg_v2(struct lustre_msg_v2 *m, int len) return -EINVAL; } - return 0; + return swabbed; } -int lustre_unpack_msg(struct lustre_msg *m, int len) +int __lustre_unpack_msg(struct lustre_msg *m, int len) { int required_len, rc; ENTRY; @@ -736,38 +582,54 @@ int lustre_unpack_msg(struct lustre_msg *m, int len) RETURN(-EINVAL); } - switch (m->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - case LUSTRE_MSG_MAGIC_V1_SWABBED: - rc = lustre_unpack_msg_v1(m, len); - break; - case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: - rc = lustre_unpack_msg_v2(m, len); - break; - default: - CERROR("bad lustre msg magic: %#08X\n", m->lm_magic); - return -EINVAL; - } + rc = lustre_unpack_msg_v2(m, len); RETURN(rc); } +EXPORT_SYMBOL(__lustre_unpack_msg); + +int ptlrpc_unpack_req_msg(struct ptlrpc_request *req, int len) +{ + int rc; + rc = __lustre_unpack_msg(req->rq_reqmsg, len); + if (rc == 1) { + lustre_set_req_swabbed(req, MSG_PTLRPC_HEADER_OFF); + rc = 0; + } + return rc; +} + +int ptlrpc_unpack_rep_msg(struct ptlrpc_request *req, int len) +{ + int rc; + rc = __lustre_unpack_msg(req->rq_repmsg, len); + if (rc == 1) { + lustre_set_rep_swabbed(req, MSG_PTLRPC_HEADER_OFF); + rc = 0; + } + return rc; +} -static inline int lustre_unpack_ptlrpc_body_v2(struct lustre_msg_v2 *m, - int offset) +static inline int lustre_unpack_ptlrpc_body_v2(struct ptlrpc_request *req, + const int inout, int offset) { struct ptlrpc_body *pb; + struct lustre_msg_v2 *m = inout ? req->rq_reqmsg : req->rq_repmsg; - pb = lustre_swab_buf(m, offset, sizeof(*pb), lustre_swab_ptlrpc_body); + pb = lustre_msg_buf_v2(m, offset, sizeof(struct ptlrpc_body_v2)); if (!pb) { - CERROR("error unpacking ptlrpc body"); + CERROR("error unpacking ptlrpc body\n"); return -EFAULT; } + if (ptlrpc_buf_need_swab(req, inout, offset)) { + lustre_swab_ptlrpc_body(pb); + ptlrpc_buf_set_swabbed(req, inout, offset); + } if ((pb->pb_version & ~LUSTRE_VERSION_MASK) != PTLRPC_MSG_VERSION) { CERROR("wrong lustre_msg version %08x\n", pb->pb_version); return -EINVAL; - } + } return 0; } @@ -775,15 +637,10 @@ static inline int lustre_unpack_ptlrpc_body_v2(struct lustre_msg_v2 *m, int lustre_unpack_req_ptlrpc_body(struct ptlrpc_request *req, int offset) { switch (req->rq_reqmsg->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - case LUSTRE_MSG_MAGIC_V1_SWABBED: - return 0; case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: - lustre_set_req_swabbed(req, offset); - return lustre_unpack_ptlrpc_body_v2(req->rq_reqmsg, offset); + return lustre_unpack_ptlrpc_body_v2(req, 1, offset); default: - CERROR("bad lustre msg magic: %#08X\n", + CERROR("bad lustre msg magic: %08x\n", req->rq_reqmsg->lm_magic); return -EINVAL; } @@ -792,31 +649,15 @@ int lustre_unpack_req_ptlrpc_body(struct ptlrpc_request *req, int offset) int lustre_unpack_rep_ptlrpc_body(struct ptlrpc_request *req, int offset) { switch (req->rq_repmsg->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - case LUSTRE_MSG_MAGIC_V1_SWABBED: - return 0; case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: - lustre_set_rep_swabbed(req, offset); - return lustre_unpack_ptlrpc_body_v2(req->rq_repmsg, offset); + return lustre_unpack_ptlrpc_body_v2(req, 0, offset); default: - CERROR("bad lustre msg magic: %#08X\n", + CERROR("bad lustre msg magic: %08x\n", req->rq_repmsg->lm_magic); return -EINVAL; } } -static inline int lustre_msg_buflen_v1(void *msg, int n) -{ - struct lustre_msg_v1 *m = (struct lustre_msg_v1 *)msg; - - LASSERT(n >= 0); - if (n >= m->lm_bufcount) - return 0; - - return m->lm_buflens[n]; -} - static inline int lustre_msg_buflen_v2(struct lustre_msg_v2 *m, int n) { if (n >= m->lm_bufcount) @@ -826,20 +667,16 @@ static inline int lustre_msg_buflen_v2(struct lustre_msg_v2 *m, int n) } /** - * lustre_msg_buflen - return the length of buffer @n in message @m - * @m - lustre_msg (request or reply) to look at - * @n - message index (base 0) + * lustre_msg_buflen - return the length of buffer \a n in message \a m + * \param m lustre_msg (request or reply) to look at + * \param n message index (base 0) * * returns zero for non-existent message indices */ int lustre_msg_buflen(struct lustre_msg *m, int n) { switch (m->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - case LUSTRE_MSG_MAGIC_V1_SWABBED: - return lustre_msg_buflen_v1(m, n - 1); case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: return lustre_msg_buflen_v2(m, n); default: CERROR("incorrect message magic: %08x\n", m->lm_magic); @@ -848,17 +685,6 @@ int lustre_msg_buflen(struct lustre_msg *m, int n) } EXPORT_SYMBOL(lustre_msg_buflen); -static inline void lustre_msg_set_buflen_v1(void *msg, int n, int len) -{ - struct lustre_msg_v1 *m = (struct lustre_msg_v1 *)msg; - - LASSERT(n >= 0); - if (n >= m->lm_bufcount) - LBUG(); - - m->lm_buflens[n] = len; -} - static inline void lustre_msg_set_buflen_v2(struct lustre_msg_v2 *m, int n, int len) { @@ -871,9 +697,6 @@ lustre_msg_set_buflen_v2(struct lustre_msg_v2 *m, int n, int len) void lustre_msg_set_buflen(struct lustre_msg *m, int n, int len) { switch (m->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - lustre_msg_set_buflen_v1(m, n - 1, len); - return; case LUSTRE_MSG_MAGIC_V2: lustre_msg_set_buflen_v2(m, n, len); return; @@ -889,11 +712,7 @@ EXPORT_SYMBOL(lustre_msg_set_buflen); int lustre_msg_bufcount(struct lustre_msg *m) { switch (m->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - case LUSTRE_MSG_MAGIC_V1_SWABBED: - return ((struct lustre_msg_v1 *)m)->lm_bufcount + 1; case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: return m->lm_bufcount; default: CERROR("incorrect message magic: %08x\n", m->lm_magic); @@ -909,13 +728,7 @@ char *lustre_msg_string(struct lustre_msg *m, int index, int max_len) int slen, blen; switch (m->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - case LUSTRE_MSG_MAGIC_V1_SWABBED: - str = lustre_msg_buf_v1(m, index - 1, 0); - blen = lustre_msg_buflen_v1(m, index - 1); - break; case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: str = lustre_msg_buf_v2(m, index, 0); blen = lustre_msg_buflen_v2(m, index); break; @@ -954,58 +767,66 @@ char *lustre_msg_string(struct lustre_msg *m, int index, int max_len) } /* Wrap up the normal fixed length cases */ -void *lustre_swab_buf(struct lustre_msg *msg, int index, int min_size, - void *swabber) +static inline void *__lustre_swab_buf(struct lustre_msg *msg, int index, + int min_size, void *swabber) { void *ptr = NULL; + LASSERT(msg != NULL); switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - case LUSTRE_MSG_MAGIC_V1_SWABBED: - ptr = lustre_msg_buf_v1(msg, index - 1, min_size); - break; case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: ptr = lustre_msg_buf_v2(msg, index, min_size); break; default: CERROR("incorrect message magic: %08x\n", msg->lm_magic); } - if (ptr == NULL) - return NULL; - if (swabber != NULL && lustre_msg_swabbed(msg)) + if (ptr && swabber) ((void (*)(void *))swabber)(ptr); return ptr; } -void *lustre_swab_reqbuf(struct ptlrpc_request *req, int index, int min_size, - void *swabber) -{ - LASSERT_REQSWAB(req, index); - return lustre_swab_buf(req->rq_reqmsg, index, min_size, swabber); -} - -void *lustre_swab_repbuf(struct ptlrpc_request *req, int index, int min_size, - void *swabber) +static inline struct ptlrpc_body *lustre_msg_ptlrpc_body(struct lustre_msg *msg) { - LASSERT_REPSWAB(req, index); - return lustre_swab_buf(req->rq_repmsg, index, min_size, swabber); + return lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, + sizeof(struct ptlrpc_body_v2)); } -__u32 lustre_msg_get_flags(struct lustre_msg *msg) +__u32 lustre_msghdr_get_flags(struct lustre_msg *msg) { switch (msg->lm_magic) { case LUSTRE_MSG_MAGIC_V1: case LUSTRE_MSG_MAGIC_V1_SWABBED: - return ((struct lustre_msg_v1 *)msg)->lm_flags & - MSG_GEN_FLAG_MASK; + return 0; case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { - struct ptlrpc_body *pb; + /* already in host endian */ + return msg->lm_flags; + default: + LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); + return 0; + } +} +EXPORT_SYMBOL(lustre_msghdr_get_flags); - pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb)); +void lustre_msghdr_set_flags(struct lustre_msg *msg, __u32 flags) +{ + switch (msg->lm_magic) { + case LUSTRE_MSG_MAGIC_V1: + return; + case LUSTRE_MSG_MAGIC_V2: + msg->lm_flags = flags; + return; + default: + LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); + } +} + +__u32 lustre_msg_get_flags(struct lustre_msg *msg) +{ + switch (msg->lm_magic) { + case LUSTRE_MSG_MAGIC_V2: { + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); if (!pb) { CERROR("invalid msg %p: no ptlrpc body!\n", msg); return 0; @@ -1022,14 +843,8 @@ __u32 lustre_msg_get_flags(struct lustre_msg *msg) void lustre_msg_add_flags(struct lustre_msg *msg, int flags) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - ((struct lustre_msg_v1 *)msg)->lm_flags |= - MSG_GEN_FLAG_MASK & flags; - return; case LUSTRE_MSG_MAGIC_V2: { - struct ptlrpc_body *pb; - - pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb)); + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg); pb->pb_flags |= flags; return; @@ -1042,15 +857,8 @@ void lustre_msg_add_flags(struct lustre_msg *msg, int flags) void lustre_msg_set_flags(struct lustre_msg *msg, int flags) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - ((struct lustre_msg_v1 *)msg)->lm_flags &= ~MSG_GEN_FLAG_MASK; - ((struct lustre_msg_v1 *)msg)->lm_flags |= - MSG_GEN_FLAG_MASK & flags; - return; case LUSTRE_MSG_MAGIC_V2: { - struct ptlrpc_body *pb; - - pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb)); + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg); pb->pb_flags = flags; return; @@ -1063,16 +871,8 @@ void lustre_msg_set_flags(struct lustre_msg *msg, int flags) void lustre_msg_clear_flags(struct lustre_msg *msg, int flags) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - case LUSTRE_MSG_MAGIC_V1_SWABBED: - ((struct lustre_msg_v1 *)msg)->lm_flags &= - ~(MSG_GEN_FLAG_MASK & flags); - return; - case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { - struct ptlrpc_body *pb; - - pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb)); + case LUSTRE_MSG_MAGIC_V2: { + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg); pb->pb_flags &= ~(MSG_GEN_FLAG_MASK & flags); return; @@ -1085,15 +885,8 @@ void lustre_msg_clear_flags(struct lustre_msg *msg, int flags) __u32 lustre_msg_get_op_flags(struct lustre_msg *msg) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - case LUSTRE_MSG_MAGIC_V1_SWABBED: - return ((struct lustre_msg_v1 *)msg)->lm_flags >> - MSG_OP_FLAG_SHIFT; - case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { - struct ptlrpc_body *pb; - - pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb)); + case LUSTRE_MSG_MAGIC_V2: { + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); if (!pb) { CERROR("invalid msg %p: no ptlrpc body!\n", msg); return 0; @@ -1108,14 +901,8 @@ __u32 lustre_msg_get_op_flags(struct lustre_msg *msg) void lustre_msg_add_op_flags(struct lustre_msg *msg, int flags) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - ((struct lustre_msg_v1 *)msg)->lm_flags |= - (flags & MSG_GEN_FLAG_MASK) << MSG_OP_FLAG_SHIFT; - return; case LUSTRE_MSG_MAGIC_V2: { - struct ptlrpc_body *pb; - - pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb)); + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg); pb->pb_op_flags |= flags; return; @@ -1128,15 +915,8 @@ void lustre_msg_add_op_flags(struct lustre_msg *msg, int flags) void lustre_msg_set_op_flags(struct lustre_msg *msg, int flags) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - ((struct lustre_msg_v1 *)msg)->lm_flags &= ~MSG_OP_FLAG_MASK; - ((struct lustre_msg_v1 *)msg)->lm_flags |= - ((flags & MSG_GEN_FLAG_MASK) <pb_op_flags |= flags; return; @@ -1149,14 +929,8 @@ void lustre_msg_set_op_flags(struct lustre_msg *msg, int flags) struct lustre_handle *lustre_msg_get_handle(struct lustre_msg *msg) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - case LUSTRE_MSG_MAGIC_V1_SWABBED: - return &((struct lustre_msg_v1 *)msg)->lm_handle; - case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { - struct ptlrpc_body *pb; - - pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb)); + case LUSTRE_MSG_MAGIC_V2: { + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); if (!pb) { CERROR("invalid msg %p: no ptlrpc body!\n", msg); return NULL; @@ -1172,14 +946,8 @@ struct lustre_handle *lustre_msg_get_handle(struct lustre_msg *msg) __u32 lustre_msg_get_type(struct lustre_msg *msg) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - case LUSTRE_MSG_MAGIC_V1_SWABBED: - return ((struct lustre_msg_v1 *)msg)->lm_type; - case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { - struct ptlrpc_body *pb; - - pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb)); + case LUSTRE_MSG_MAGIC_V2: { + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); if (!pb) { CERROR("invalid msg %p: no ptlrpc body!\n", msg); return PTL_RPC_MSG_ERR; @@ -1195,14 +963,8 @@ __u32 lustre_msg_get_type(struct lustre_msg *msg) __u32 lustre_msg_get_version(struct lustre_msg *msg) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - case LUSTRE_MSG_MAGIC_V1_SWABBED: - return ((struct lustre_msg_v1 *)msg)->lm_version; - case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { - struct ptlrpc_body *pb; - - pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb)); + case LUSTRE_MSG_MAGIC_V2: { + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); if (!pb) { CERROR("invalid msg %p: no ptlrpc body!\n", msg); return 0; @@ -1218,14 +980,8 @@ __u32 lustre_msg_get_version(struct lustre_msg *msg) void lustre_msg_add_version(struct lustre_msg *msg, int version) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - case LUSTRE_MSG_MAGIC_V1_SWABBED: - return; - case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { - struct ptlrpc_body *pb; - - pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb)); + case LUSTRE_MSG_MAGIC_V2: { + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg); pb->pb_version |= version; return; @@ -1238,14 +994,8 @@ void lustre_msg_add_version(struct lustre_msg *msg, int version) __u32 lustre_msg_get_opc(struct lustre_msg *msg) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - case LUSTRE_MSG_MAGIC_V1_SWABBED: - return ((struct lustre_msg_v1 *)msg)->lm_opc; - case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { - struct ptlrpc_body *pb; - - pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb)); + case LUSTRE_MSG_MAGIC_V2: { + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); if (!pb) { CERROR("invalid msg %p: no ptlrpc body!\n", msg); return 0; @@ -1254,6 +1004,7 @@ __u32 lustre_msg_get_opc(struct lustre_msg *msg) } default: CERROR("incorrect message magic: %08x(msg:%p)\n", msg->lm_magic, msg); + LBUG(); return 0; } } @@ -1261,14 +1012,8 @@ __u32 lustre_msg_get_opc(struct lustre_msg *msg) __u64 lustre_msg_get_last_xid(struct lustre_msg *msg) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - case LUSTRE_MSG_MAGIC_V1_SWABBED: - return ((struct lustre_msg_v1 *)msg)->lm_last_xid; - case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { - struct ptlrpc_body *pb; - - pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb)); + case LUSTRE_MSG_MAGIC_V2: { + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); if (!pb) { CERROR("invalid msg %p: no ptlrpc body!\n", msg); return 0; @@ -1284,14 +1029,8 @@ __u64 lustre_msg_get_last_xid(struct lustre_msg *msg) __u64 lustre_msg_get_last_committed(struct lustre_msg *msg) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - case LUSTRE_MSG_MAGIC_V1_SWABBED: - return ((struct lustre_msg_v1 *)msg)->lm_last_committed; - case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { - struct ptlrpc_body *pb; - - pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb)); + case LUSTRE_MSG_MAGIC_V2: { + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); if (!pb) { CERROR("invalid msg %p: no ptlrpc body!\n", msg); return 0; @@ -1304,17 +1043,30 @@ __u64 lustre_msg_get_last_committed(struct lustre_msg *msg) } } -__u64 lustre_msg_get_transno(struct lustre_msg *msg) +__u64 *lustre_msg_get_versions(struct lustre_msg *msg) { switch (msg->lm_magic) { case LUSTRE_MSG_MAGIC_V1: - case LUSTRE_MSG_MAGIC_V1_SWABBED: - return ((struct lustre_msg_v1 *)msg)->lm_transno; - case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { - struct ptlrpc_body *pb; + return NULL; + case LUSTRE_MSG_MAGIC_V2: { + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); + if (!pb) { + CERROR("invalid msg %p: no ptlrpc body!\n", msg); + return NULL; + } + return pb->pb_pre_versions; + } + default: + CERROR("incorrect message magic: %08x\n", msg->lm_magic); + return NULL; + } +} - pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb)); +__u64 lustre_msg_get_transno(struct lustre_msg *msg) +{ + switch (msg->lm_magic) { + case LUSTRE_MSG_MAGIC_V2: { + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); if (!pb) { CERROR("invalid msg %p: no ptlrpc body!\n", msg); return 0; @@ -1330,14 +1082,8 @@ __u64 lustre_msg_get_transno(struct lustre_msg *msg) int lustre_msg_get_status(struct lustre_msg *msg) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - case LUSTRE_MSG_MAGIC_V1_SWABBED: - return ((struct lustre_msg_v1 *)msg)->lm_status; - case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { - struct ptlrpc_body *pb; - - pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb)); + case LUSTRE_MSG_MAGIC_V2: { + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); if (!pb) { CERROR("invalid msg %p: no ptlrpc body!\n", msg); return -EINVAL; @@ -1351,22 +1097,131 @@ int lustre_msg_get_status(struct lustre_msg *msg) } } +__u64 lustre_msg_get_slv(struct lustre_msg *msg) +{ + switch (msg->lm_magic) { + case LUSTRE_MSG_MAGIC_V2: { + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); + if (!pb) { + CERROR("invalid msg %p: no ptlrpc body!\n", msg); + return -EINVAL; + } + return pb->pb_slv; + } + default: + CERROR("invalid msg magic %08x\n", msg->lm_magic); + return -EINVAL; + } +} + + +void lustre_msg_set_slv(struct lustre_msg *msg, __u64 slv) +{ + switch (msg->lm_magic) { + case LUSTRE_MSG_MAGIC_V2: { + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); + if (!pb) { + CERROR("invalid msg %p: no ptlrpc body!\n", msg); + return; + } + pb->pb_slv = slv; + return; + } + default: + CERROR("invalid msg magic %x\n", msg->lm_magic); + return; + } +} + +__u32 lustre_msg_get_limit(struct lustre_msg *msg) +{ + switch (msg->lm_magic) { + case LUSTRE_MSG_MAGIC_V2: { + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); + if (!pb) { + CERROR("invalid msg %p: no ptlrpc body!\n", msg); + return -EINVAL; + } + return pb->pb_limit; + } + default: + CERROR("invalid msg magic %x\n", msg->lm_magic); + return -EINVAL; + } +} + + +void lustre_msg_set_limit(struct lustre_msg *msg, __u64 limit) +{ + switch (msg->lm_magic) { + case LUSTRE_MSG_MAGIC_V2: { + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); + if (!pb) { + CERROR("invalid msg %p: no ptlrpc body!\n", msg); + return; + } + pb->pb_limit = limit; + return; + } + default: + CERROR("invalid msg magic %08x\n", msg->lm_magic); + return; + } +} + __u32 lustre_msg_get_conn_cnt(struct lustre_msg *msg) { switch (msg->lm_magic) { + case LUSTRE_MSG_MAGIC_V2: { + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); + if (!pb) { + CERROR("invalid msg %p: no ptlrpc body!\n", msg); + return 0; + } + return pb->pb_conn_cnt; + } + default: + CERROR("incorrect message magic: %08x\n", msg->lm_magic); + return 0; + } +} + +int lustre_msg_is_v1(struct lustre_msg *msg) +{ + switch (msg->lm_magic) { case LUSTRE_MSG_MAGIC_V1: case LUSTRE_MSG_MAGIC_V1_SWABBED: - return ((struct lustre_msg_v1 *)msg)->lm_conn_cnt; + return 1; + default: + return 0; + } +} + +__u32 lustre_msg_get_magic(struct lustre_msg *msg) +{ + switch (msg->lm_magic) { case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { - struct ptlrpc_body *pb; + return msg->lm_magic; + default: + CERROR("incorrect message magic: %08x\n", msg->lm_magic); + return 0; + } +} - pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb)); +__u32 lustre_msg_get_timeout(struct lustre_msg *msg) +{ + switch (msg->lm_magic) { + case LUSTRE_MSG_MAGIC_V1: + case LUSTRE_MSG_MAGIC_V1_SWABBED: + return 0; + case LUSTRE_MSG_MAGIC_V2: { + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); if (!pb) { CERROR("invalid msg %p: no ptlrpc body!\n", msg); return 0; + } - return pb->pb_conn_cnt; + return pb->pb_timeout; } default: CERROR("incorrect message magic: %08x\n", msg->lm_magic); @@ -1374,30 +1229,109 @@ __u32 lustre_msg_get_conn_cnt(struct lustre_msg *msg) } } -__u32 lustre_msg_get_magic(struct lustre_msg *msg) +__u32 lustre_msg_get_service_time(struct lustre_msg *msg) { switch (msg->lm_magic) { case LUSTRE_MSG_MAGIC_V1: case LUSTRE_MSG_MAGIC_V1_SWABBED: + return 0; + case LUSTRE_MSG_MAGIC_V2: { + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); + if (!pb) { + CERROR("invalid msg %p: no ptlrpc body!\n", msg); + return 0; + + } + return pb->pb_service_time; + } + default: + CERROR("incorrect message magic: %08x\n", msg->lm_magic); + return 0; + } +} + +char *lustre_msg_get_jobid(struct lustre_msg *msg) +{ + switch (msg->lm_magic) { + case LUSTRE_MSG_MAGIC_V1: + case LUSTRE_MSG_MAGIC_V1_SWABBED: + return NULL; + case LUSTRE_MSG_MAGIC_V2: { + struct ptlrpc_body *pb = + lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, + sizeof(struct ptlrpc_body)); + if (!pb) + return NULL; + + return pb->pb_jobid; + } + default: + CERROR("incorrect message magic: %08x\n", msg->lm_magic); + return NULL; + } +} +EXPORT_SYMBOL(lustre_msg_get_jobid); + +__u32 lustre_msg_get_cksum(struct lustre_msg *msg) +{ + switch (msg->lm_magic) { case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: - return msg->lm_magic; + return msg->lm_cksum; default: CERROR("incorrect message magic: %08x\n", msg->lm_magic); return 0; } } +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 0, 0) +/* + * In 1.6 and 1.8 the checksum was computed only on struct ptlrpc_body as + * it was in 1.6 (88 bytes, smaller than the full size in 1.8). It makes + * more sense to compute the checksum on the full ptlrpc_body, regardless + * of what size it is, but in order to keep interoperability with 1.8 we + * can optionally also checksum only the first 88 bytes (caller decides). */ +# define ptlrpc_body_cksum_size_compat18 88 + +__u32 lustre_msg_calc_cksum(struct lustre_msg *msg, int compat18) +#else +# warning "remove checksum compatibility support for b1_8" +__u32 lustre_msg_calc_cksum(struct lustre_msg *msg) +#endif +{ + switch (msg->lm_magic) { + case LUSTRE_MSG_MAGIC_V2: { + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 0, 0) + __u32 crc; + unsigned int hsize = 4; + __u32 len = compat18 ? ptlrpc_body_cksum_size_compat18 : + lustre_msg_buflen(msg, MSG_PTLRPC_BODY_OFF); + LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg); + cfs_crypto_hash_digest(CFS_HASH_ALG_CRC32, (unsigned char *)pb, + len, NULL, 0, (unsigned char *)&crc, + &hsize); + return crc; +#else +# warning "remove checksum compatibility support for b1_8" + __u32 crc; + unsigned int hsize = 4; + cfs_crypto_hash_digest(CFS_HASH_ALG_CRC32, (unsigned char *)pb, + lustre_msg_buflen(msg, MSG_PTLRPC_BODY_OFF), + NULL, 0, (unsigned char *)&crc, &hsize); + return crc; +#endif + } + default: + CERROR("incorrect message magic: %08x\n", msg->lm_magic); + return 0; + } +} + void lustre_msg_set_handle(struct lustre_msg *msg, struct lustre_handle *handle) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - ((struct lustre_msg_v1 *)msg)->lm_handle = *handle; - return; case LUSTRE_MSG_MAGIC_V2: { - struct ptlrpc_body *pb; - - pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb)); + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg); pb->pb_handle = *handle; return; @@ -1410,13 +1344,8 @@ void lustre_msg_set_handle(struct lustre_msg *msg, struct lustre_handle *handle) void lustre_msg_set_type(struct lustre_msg *msg, __u32 type) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - ((struct lustre_msg_v1 *)msg)->lm_type = type; - return; case LUSTRE_MSG_MAGIC_V2: { - struct ptlrpc_body *pb; - - pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb)); + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg); pb->pb_type = type; return; @@ -1429,13 +1358,8 @@ void lustre_msg_set_type(struct lustre_msg *msg, __u32 type) void lustre_msg_set_opc(struct lustre_msg *msg, __u32 opc) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - ((struct lustre_msg_v1 *)msg)->lm_opc = opc; - return; case LUSTRE_MSG_MAGIC_V2: { - struct ptlrpc_body *pb; - - pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb)); + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg); pb->pb_opc = opc; return; @@ -1448,13 +1372,8 @@ void lustre_msg_set_opc(struct lustre_msg *msg, __u32 opc) void lustre_msg_set_last_xid(struct lustre_msg *msg, __u64 last_xid) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - ((struct lustre_msg_v1 *)msg)->lm_last_xid = last_xid; - return; case LUSTRE_MSG_MAGIC_V2: { - struct ptlrpc_body *pb; - - pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb)); + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg); pb->pb_last_xid = last_xid; return; @@ -1467,13 +1386,8 @@ void lustre_msg_set_last_xid(struct lustre_msg *msg, __u64 last_xid) void lustre_msg_set_last_committed(struct lustre_msg *msg, __u64 last_committed) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - ((struct lustre_msg_v1 *)msg)->lm_last_committed=last_committed; - return; case LUSTRE_MSG_MAGIC_V2: { - struct ptlrpc_body *pb; - - pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb)); + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg); pb->pb_last_committed = last_committed; return; @@ -1483,16 +1397,30 @@ void lustre_msg_set_last_committed(struct lustre_msg *msg, __u64 last_committed) } } -void lustre_msg_set_transno(struct lustre_msg *msg, __u64 transno) +void lustre_msg_set_versions(struct lustre_msg *msg, __u64 *versions) { switch (msg->lm_magic) { case LUSTRE_MSG_MAGIC_V1: - ((struct lustre_msg_v1 *)msg)->lm_transno = transno; return; case LUSTRE_MSG_MAGIC_V2: { - struct ptlrpc_body *pb; + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); + LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg); + pb->pb_pre_versions[0] = versions[0]; + pb->pb_pre_versions[1] = versions[1]; + pb->pb_pre_versions[2] = versions[2]; + pb->pb_pre_versions[3] = versions[3]; + return; + } + default: + LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); + } +} - pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb)); +void lustre_msg_set_transno(struct lustre_msg *msg, __u64 transno) +{ + switch (msg->lm_magic) { + case LUSTRE_MSG_MAGIC_V2: { + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg); pb->pb_transno = transno; return; @@ -1505,13 +1433,8 @@ void lustre_msg_set_transno(struct lustre_msg *msg, __u64 transno) void lustre_msg_set_status(struct lustre_msg *msg, __u32 status) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - ((struct lustre_msg_v1 *)msg)->lm_status = status; - return; case LUSTRE_MSG_MAGIC_V2: { - struct ptlrpc_body *pb; - - pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb)); + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg); pb->pb_status = status; return; @@ -1524,15 +1447,42 @@ void lustre_msg_set_status(struct lustre_msg *msg, __u32 status) void lustre_msg_set_conn_cnt(struct lustre_msg *msg, __u32 conn_cnt) { switch (msg->lm_magic) { + case LUSTRE_MSG_MAGIC_V2: { + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); + LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg); + pb->pb_conn_cnt = conn_cnt; + return; + } + default: + LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); + } +} + +void lustre_msg_set_timeout(struct lustre_msg *msg, __u32 timeout) +{ + switch (msg->lm_magic) { case LUSTRE_MSG_MAGIC_V1: - ((struct lustre_msg_v1 *)msg)->lm_conn_cnt = conn_cnt; return; case LUSTRE_MSG_MAGIC_V2: { - struct ptlrpc_body *pb; + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); + LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg); + pb->pb_timeout = timeout; + return; + } + default: + LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); + } +} - pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb)); +void lustre_msg_set_service_time(struct lustre_msg *msg, __u32 service_time) +{ + switch (msg->lm_magic) { + case LUSTRE_MSG_MAGIC_V1: + return; + case LUSTRE_MSG_MAGIC_V2: { + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg); - pb->pb_conn_cnt = conn_cnt; + pb->pb_service_time = service_time; return; } default: @@ -1540,6 +1490,113 @@ void lustre_msg_set_conn_cnt(struct lustre_msg *msg, __u32 conn_cnt) } } +void lustre_msg_set_jobid(struct lustre_msg *msg, char *jobid) +{ + switch (msg->lm_magic) { + case LUSTRE_MSG_MAGIC_V1: + return; + case LUSTRE_MSG_MAGIC_V2: { + __u32 opc = lustre_msg_get_opc(msg); + struct ptlrpc_body *pb; + + /* Don't set jobid for ldlm ast RPCs, they've been shrinked. + * See the comment in ptlrpc_request_pack(). */ + if (!opc || opc == LDLM_BL_CALLBACK || + opc == LDLM_CP_CALLBACK || opc == LDLM_GL_CALLBACK) + return; + + pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, + sizeof(struct ptlrpc_body)); + LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg); + memcpy(pb->pb_jobid, jobid, JOBSTATS_JOBID_SIZE); + return; + } + default: + LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); + } +} +EXPORT_SYMBOL(lustre_msg_set_jobid); + +void lustre_msg_set_cksum(struct lustre_msg *msg, __u32 cksum) +{ + switch (msg->lm_magic) { + case LUSTRE_MSG_MAGIC_V1: + return; + case LUSTRE_MSG_MAGIC_V2: + msg->lm_cksum = cksum; + return; + default: + LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); + } +} + + +void ptlrpc_request_set_replen(struct ptlrpc_request *req) +{ + int count = req_capsule_filled_sizes(&req->rq_pill, RCL_SERVER); + + req->rq_replen = lustre_msg_size(req->rq_reqmsg->lm_magic, count, + req->rq_pill.rc_area[RCL_SERVER]); + if (req->rq_reqmsg->lm_magic == LUSTRE_MSG_MAGIC_V2) + req->rq_reqmsg->lm_repsize = req->rq_replen; +} + +void ptlrpc_req_set_repsize(struct ptlrpc_request *req, int count, __u32 *lens) +{ + req->rq_replen = lustre_msg_size(req->rq_reqmsg->lm_magic, count, lens); + if (req->rq_reqmsg->lm_magic == LUSTRE_MSG_MAGIC_V2) + req->rq_reqmsg->lm_repsize = req->rq_replen; +} + +/** + * Send a remote set_info_async. + * + * This may go from client to server or server to client. + */ +int do_set_info_async(struct obd_import *imp, + int opcode, int version, + obd_count keylen, void *key, + obd_count vallen, void *val, + struct ptlrpc_request_set *set) +{ + struct ptlrpc_request *req; + char *tmp; + int rc; + ENTRY; + + req = ptlrpc_request_alloc(imp, &RQF_OBD_SET_INFO); + if (req == NULL) + RETURN(-ENOMEM); + + req_capsule_set_size(&req->rq_pill, &RMF_SETINFO_KEY, + RCL_CLIENT, keylen); + req_capsule_set_size(&req->rq_pill, &RMF_SETINFO_VAL, + RCL_CLIENT, vallen); + rc = ptlrpc_request_pack(req, version, opcode); + if (rc) { + ptlrpc_request_free(req); + RETURN(rc); + } + + tmp = req_capsule_client_get(&req->rq_pill, &RMF_SETINFO_KEY); + memcpy(tmp, key, keylen); + tmp = req_capsule_client_get(&req->rq_pill, &RMF_SETINFO_VAL); + memcpy(tmp, val, vallen); + + ptlrpc_request_set_replen(req); + + if (set) { + ptlrpc_set_add_req(set, req); + ptlrpc_check_set(NULL, set); + } else { + rc = ptlrpc_queue_wait(req); + ptlrpc_req_finished(req); + } + + RETURN(rc); +} +EXPORT_SYMBOL(do_set_info_async); + /* byte flipping routines for all wire types declared in * lustre_idl.h implemented here. */ @@ -1556,11 +1613,21 @@ void lustre_swab_ptlrpc_body(struct ptlrpc_body *b) __swab32s (&b->pb_flags); __swab32s (&b->pb_op_flags); __swab32s (&b->pb_conn_cnt); - CLASSERT(offsetof(typeof(*b), pb_padding_1) != 0); - CLASSERT(offsetof(typeof(*b), pb_padding_2) != 0); - CLASSERT(offsetof(typeof(*b), pb_padding_3) != 0); - CLASSERT(offsetof(typeof(*b), pb_padding_4) != 0); - CLASSERT(offsetof(typeof(*b), pb_padding_5) != 0); + __swab32s (&b->pb_timeout); + __swab32s (&b->pb_service_time); + __swab32s (&b->pb_limit); + __swab64s (&b->pb_slv); + __swab64s (&b->pb_pre_versions[0]); + __swab64s (&b->pb_pre_versions[1]); + __swab64s (&b->pb_pre_versions[2]); + __swab64s (&b->pb_pre_versions[3]); + CLASSERT(offsetof(typeof(*b), pb_padding) != 0); + /* While we need to maintain compatibility between + * clients and servers without ptlrpc_body_v2 (< 2.3) + * do not swab any fields beyond pb_jobid, as we are + * using this swab function for both ptlrpc_body + * and ptlrpc_body_v2. */ + CLASSERT(offsetof(typeof(*b), pb_jobid) != 0); } void lustre_swab_connect(struct obd_connect_data *ocd) @@ -1571,21 +1638,45 @@ void lustre_swab_connect(struct obd_connect_data *ocd) __swab64s(&ocd->ocd_ibits_known); __swab32s(&ocd->ocd_index); __swab32s(&ocd->ocd_brw_size); - __swab32s(&ocd->ocd_nllu); - __swab32s(&ocd->ocd_nllg); + /* ocd_blocksize and ocd_inodespace don't need to be swabbed because + * they are 8-byte values */ + __swab16s(&ocd->ocd_grant_extent); + __swab32s(&ocd->ocd_unused); __swab64s(&ocd->ocd_transno); __swab32s(&ocd->ocd_group); + __swab32s(&ocd->ocd_cksum_types); + __swab32s(&ocd->ocd_instance); + /* Fields after ocd_cksum_types are only accessible by the receiver + * if the corresponding flag in ocd_connect_flags is set. Accessing + * any field after ocd_maxbytes on the receiver without a valid flag + * may result in out-of-bound memory access and kernel oops. */ + if (ocd->ocd_connect_flags & OBD_CONNECT_MAX_EASIZE) + __swab32s(&ocd->ocd_max_easize); + if (ocd->ocd_connect_flags & OBD_CONNECT_MAXBYTES) + __swab64s(&ocd->ocd_maxbytes); CLASSERT(offsetof(typeof(*ocd), padding1) != 0); CLASSERT(offsetof(typeof(*ocd), padding2) != 0); CLASSERT(offsetof(typeof(*ocd), padding3) != 0); + CLASSERT(offsetof(typeof(*ocd), padding4) != 0); + CLASSERT(offsetof(typeof(*ocd), padding5) != 0); + CLASSERT(offsetof(typeof(*ocd), padding6) != 0); + CLASSERT(offsetof(typeof(*ocd), padding7) != 0); + CLASSERT(offsetof(typeof(*ocd), padding8) != 0); + CLASSERT(offsetof(typeof(*ocd), padding9) != 0); + CLASSERT(offsetof(typeof(*ocd), paddingA) != 0); + CLASSERT(offsetof(typeof(*ocd), paddingB) != 0); + CLASSERT(offsetof(typeof(*ocd), paddingC) != 0); + CLASSERT(offsetof(typeof(*ocd), paddingD) != 0); + CLASSERT(offsetof(typeof(*ocd), paddingE) != 0); + CLASSERT(offsetof(typeof(*ocd), paddingF) != 0); } void lustre_swab_obdo (struct obdo *o) { __swab64s (&o->o_valid); __swab64s (&o->o_id); - __swab64s (&o->o_gr); - __swab64s (&o->o_fid); + __swab64s (&o->o_seq); + __swab64s (&o->o_parent_seq); __swab64s (&o->o_size); __swab64s (&o->o_mtime); __swab64s (&o->o_atime); @@ -1598,13 +1689,20 @@ void lustre_swab_obdo (struct obdo *o) __swab32s (&o->o_gid); __swab32s (&o->o_flags); __swab32s (&o->o_nlink); - __swab32s (&o->o_generation); + __swab32s (&o->o_parent_oid); __swab32s (&o->o_misc); - __swab32s (&o->o_easize); - __swab32s (&o->o_mds); + __swab64s (&o->o_ioepoch); __swab32s (&o->o_stripe_idx); - __swab32s (&o->o_padding_1); - /* o_inline is opaque */ + __swab32s (&o->o_parent_ver); + /* o_handle is opaque */ + /* o_lcookie is swabbed elsewhere */ + __swab32s (&o->o_uid_h); + __swab32s (&o->o_gid_h); + __swab64s (&o->o_data_version); + CLASSERT(offsetof(typeof(*o), o_padding_4) != 0); + CLASSERT(offsetof(typeof(*o), o_padding_5) != 0); + CLASSERT(offsetof(typeof(*o), o_padding_6) != 0); + } void lustre_swab_obd_statfs (struct obd_statfs *os) @@ -1620,13 +1718,21 @@ void lustre_swab_obd_statfs (struct obd_statfs *os) __swab32s (&os->os_namelen); __swab64s (&os->os_maxbytes); __swab32s (&os->os_state); - /* no need to swap os_spare */ + CLASSERT(offsetof(typeof(*os), os_spare1) != 0); + CLASSERT(offsetof(typeof(*os), os_spare2) != 0); + CLASSERT(offsetof(typeof(*os), os_spare3) != 0); + CLASSERT(offsetof(typeof(*os), os_spare4) != 0); + CLASSERT(offsetof(typeof(*os), os_spare5) != 0); + CLASSERT(offsetof(typeof(*os), os_spare6) != 0); + CLASSERT(offsetof(typeof(*os), os_spare7) != 0); + CLASSERT(offsetof(typeof(*os), os_spare8) != 0); + CLASSERT(offsetof(typeof(*os), os_spare9) != 0); } void lustre_swab_obd_ioobj (struct obd_ioobj *ioo) { __swab64s (&ioo->ioo_id); - __swab64s (&ioo->ioo_gr); + __swab64s (&ioo->ioo_seq); __swab32s (&ioo->ioo_type); __swab32s (&ioo->ioo_bufcnt); } @@ -1653,50 +1759,18 @@ void lustre_swab_generic_32s(__u32 *val) __swab32s(val); } -void lustre_swab_ost_lvb(struct ost_lvb *lvb) -{ - __swab64s(&lvb->lvb_size); - __swab64s(&lvb->lvb_mtime); - __swab64s(&lvb->lvb_atime); - __swab64s(&lvb->lvb_ctime); - __swab64s(&lvb->lvb_blocks); -} - -void lustre_swab_mds_status_req (struct mds_status_req *r) +void lustre_swab_lvb(union ldlm_wire_lvb *lvb) { - __swab32s (&r->flags); - __swab32s (&r->repbuf); -} - -void lustre_swab_mds_body (struct mds_body *b) -{ - lustre_swab_ll_fid (&b->fid1); - lustre_swab_ll_fid (&b->fid2); - /* handle is opaque */ - __swab64s (&b->valid); - __swab64s (&b->size); - __swab64s (&b->mtime); - __swab64s (&b->atime); - __swab64s (&b->ctime); - __swab64s (&b->blocks); - __swab64s (&b->io_epoch); - __swab64s (&b->ino); - __swab32s (&b->fsuid); - __swab32s (&b->fsgid); - __swab32s (&b->capability); - __swab32s (&b->mode); - __swab32s (&b->uid); - __swab32s (&b->gid); - __swab32s (&b->flags); - __swab32s (&b->rdev); - __swab32s (&b->nlink); - __swab32s (&b->generation); - __swab32s (&b->suppgid); - __swab32s (&b->eadatasize); - __swab32s (&b->aclsize); - __swab32s (&b->max_mdsize); - __swab32s (&b->max_cookiesize); - __swab32s (&b->padding_4); + /* The ldlm_wire_lvb union represents all the possible LVB types. + * Unfortunately, there is no way to know what member of the union we + * are dealing with at this point. Therefore, all LVB structures must + * have fields of the same types, although used for different purposes + */ + __swab64s(&lvb->l_ost.lvb_size); + __swab64s(&lvb->l_ost.lvb_mtime); + __swab64s(&lvb->l_ost.lvb_atime); + __swab64s(&lvb->l_ost.lvb_ctime); + __swab64s(&lvb->l_ost.lvb_blocks); } void lustre_swab_mdt_body (struct mdt_body *b) @@ -1711,6 +1785,7 @@ void lustre_swab_mdt_body (struct mdt_body *b) __swab64s (&b->ctime); __swab64s (&b->blocks); __swab64s (&b->ioepoch); + __swab64s (&b->ino); __swab32s (&b->fsuid); __swab32s (&b->fsgid); __swab32s (&b->capability); @@ -1720,14 +1795,18 @@ void lustre_swab_mdt_body (struct mdt_body *b) __swab32s (&b->flags); __swab32s (&b->rdev); __swab32s (&b->nlink); + __swab32s (&b->generation); __swab32s (&b->suppgid); __swab32s (&b->eadatasize); __swab32s (&b->aclsize); __swab32s (&b->max_mdsize); __swab32s (&b->max_cookiesize); + __swab32s (&b->uid_h); + __swab32s (&b->gid_h); + CLASSERT(offsetof(typeof(*b), padding_5) != 0); } -void lustre_swab_mdt_epoch (struct mdt_epoch *b) +void lustre_swab_mdt_ioepoch (struct mdt_ioepoch *b) { /* handle is opaque */ __swab64s (&b->ioepoch); @@ -1742,12 +1821,51 @@ void lustre_swab_mgs_target_info(struct mgs_target_info *mti) __swab32s(&mti->mti_stripe_index); __swab32s(&mti->mti_config_ver); __swab32s(&mti->mti_flags); + __swab32s(&mti->mti_instance); __swab32s(&mti->mti_nid_count); CLASSERT(sizeof(lnet_nid_t) == sizeof(__u64)); for (i = 0; i < MTI_NIDS_MAX; i++) __swab64s(&mti->mti_nids[i]); } +void lustre_swab_mgs_nidtbl_entry(struct mgs_nidtbl_entry *entry) +{ + int i; + + __swab64s(&entry->mne_version); + __swab32s(&entry->mne_instance); + __swab32s(&entry->mne_index); + __swab32s(&entry->mne_length); + + /* mne_nid_(count|type) must be one byte size because we're gonna + * access it w/o swapping. */ + CLASSERT(sizeof(entry->mne_nid_count) == sizeof(__u8)); + CLASSERT(sizeof(entry->mne_nid_type) == sizeof(__u8)); + + /* remove this assertion if ipv6 is supported. */ + LASSERT(entry->mne_nid_type == 0); + for (i = 0; i < entry->mne_nid_count; i++) { + CLASSERT(sizeof(lnet_nid_t) == sizeof(__u64)); + __swab64s(&entry->u.nids[i]); + } +} +EXPORT_SYMBOL(lustre_swab_mgs_nidtbl_entry); + +void lustre_swab_mgs_config_body(struct mgs_config_body *body) +{ + __swab64s(&body->mcb_offset); + __swab32s(&body->mcb_units); + __swab16s(&body->mcb_type); +} +EXPORT_SYMBOL(lustre_swab_mgs_config_body); + +void lustre_swab_mgs_config_res(struct mgs_config_res *body) +{ + __swab64s(&body->mcr_offset); + __swab64s(&body->mcr_size); +} +EXPORT_SYMBOL(lustre_swab_mgs_config_res); + static void lustre_swab_obd_dqinfo (struct obd_dqinfo *i) { __swab64s (&i->dqi_bgrace); @@ -1767,7 +1885,7 @@ static void lustre_swab_obd_dqblk (struct obd_dqblk *b) __swab64s (&b->dqb_btime); __swab64s (&b->dqb_itime); __swab32s (&b->dqb_valid); - CLASSERT(offsetof(typeof(*b), padding) != 0); + CLASSERT(offsetof(typeof(*b), dqb_padding) != 0); } void lustre_swab_obd_quotactl (struct obd_quotactl *q) @@ -1780,353 +1898,189 @@ void lustre_swab_obd_quotactl (struct obd_quotactl *q) lustre_swab_obd_dqblk (&q->qc_dqblk); } -void lustre_swab_mds_remote_perm (struct mds_remote_perm *p) +void lustre_swab_quota_adjust_qunit (struct quota_adjust_qunit *q) { - __swab32s (&p->rp_uid); - __swab32s (&p->rp_gid); - __swab32s (&p->rp_fsuid); - __swab32s (&p->rp_fsgid); - __swab32s (&p->rp_access_perm); -}; + __swab32s (&q->qaq_flags); + __swab32s (&q->qaq_id); + __swab64s (&q->qaq_bunit_sz); + __swab64s (&q->qaq_iunit_sz); + __swab64s (&q->padding1); +} void lustre_swab_mdt_remote_perm (struct mdt_remote_perm *p) { __swab32s (&p->rp_uid); __swab32s (&p->rp_gid); __swab32s (&p->rp_fsuid); + __swab32s (&p->rp_fsuid_h); __swab32s (&p->rp_fsgid); + __swab32s (&p->rp_fsgid_h); __swab32s (&p->rp_access_perm); + __swab32s (&p->rp_padding); }; -void lustre_swab_mds_rec_setattr (struct mds_rec_setattr *sa) -{ - __swab32s (&sa->sa_opcode); - __swab32s (&sa->sa_fsuid); - __swab32s (&sa->sa_fsgid); - __swab32s (&sa->sa_cap); - __swab32s (&sa->sa_suppgid); - __swab32s (&sa->sa_mode); - lustre_swab_ll_fid (&sa->sa_fid); - __swab64s (&sa->sa_valid); - __swab64s (&sa->sa_size); - __swab64s (&sa->sa_mtime); - __swab64s (&sa->sa_atime); - __swab64s (&sa->sa_ctime); - __swab32s (&sa->sa_uid); - __swab32s (&sa->sa_gid); - __swab32s (&sa->sa_attr_flags); - CLASSERT(offsetof(typeof(*sa), sa_padding) != 0); -} - -void lustre_swab_mdt_rec_setattr (struct mdt_rec_setattr *sa) -{ - __swab32s (&sa->sa_opcode); - __swab32s (&sa->sa_fsuid); - __swab32s (&sa->sa_fsgid); - __swab32s (&sa->sa_cap); - __swab32s (&sa->sa_suppgid); - __swab32s (&sa->sa_mode); - lustre_swab_lu_fid (&sa->sa_fid); - __swab64s (&sa->sa_valid); - __swab64s (&sa->sa_size); - __swab64s (&sa->sa_blocks); - __swab64s (&sa->sa_mtime); - __swab64s (&sa->sa_atime); - __swab64s (&sa->sa_ctime); - __swab32s (&sa->sa_uid); - __swab32s (&sa->sa_gid); - __swab32s (&sa->sa_attr_flags); - CLASSERT(offsetof(typeof(*sa), sa_padding) != 0); -} - -void lustre_swab_mds_rec_join (struct mds_rec_join *jr) -{ - __swab64s(&jr->jr_headsize); - lustre_swab_ll_fid(&jr->jr_fid); -} - -void lustre_swab_mdt_rec_join (struct mdt_rec_join *jr) -{ - __swab64s(&jr->jr_headsize); - lustre_swab_lu_fid(&jr->jr_fid); -} - -void lustre_swab_mds_rec_create (struct mds_rec_create *cr) -{ - __swab32s (&cr->cr_opcode); - __swab32s (&cr->cr_fsuid); - __swab32s (&cr->cr_fsgid); - __swab32s (&cr->cr_cap); - __swab32s (&cr->cr_flags); /* for use with open */ - __swab32s (&cr->cr_mode); - lustre_swab_ll_fid (&cr->cr_fid); - lustre_swab_ll_fid (&cr->cr_replayfid); - __swab64s (&cr->cr_time); - __swab64s (&cr->cr_rdev); - __swab32s (&cr->cr_suppgid); - CLASSERT(offsetof(typeof(*cr), cr_padding_1) != 0); - CLASSERT(offsetof(typeof(*cr), cr_padding_2) != 0); - CLASSERT(offsetof(typeof(*cr), cr_padding_3) != 0); - CLASSERT(offsetof(typeof(*cr), cr_padding_4) != 0); - CLASSERT(offsetof(typeof(*cr), cr_padding_5) != 0); -} - -void lustre_swab_mdt_rec_create (struct mdt_rec_create *cr) -{ - __swab32s (&cr->cr_opcode); - __swab32s (&cr->cr_fsuid); - __swab32s (&cr->cr_fsgid); - __swab32s (&cr->cr_cap); - __swab32s (&cr->cr_flags); /* for use with open */ - __swab32s (&cr->cr_mode); - /* handle is opaque */ - lustre_swab_lu_fid (&cr->cr_fid1); - lustre_swab_lu_fid (&cr->cr_fid2); - __swab64s (&cr->cr_time); - __swab64s (&cr->cr_rdev); - __swab64s (&cr->cr_ioepoch); - __swab32s (&cr->cr_suppgid1); - __swab32s (&cr->cr_suppgid2); - __swab32s (&cr->cr_bias); - CLASSERT(offsetof(typeof(*cr), cr_padding_1) != 0); -} - -void lustre_swab_mds_rec_link (struct mds_rec_link *lk) -{ - __swab32s (&lk->lk_opcode); - __swab32s (&lk->lk_fsuid); - __swab32s (&lk->lk_fsgid); - __swab32s (&lk->lk_cap); - __swab32s (&lk->lk_suppgid1); - __swab32s (&lk->lk_suppgid2); - lustre_swab_ll_fid (&lk->lk_fid1); - lustre_swab_ll_fid (&lk->lk_fid2); - __swab64s (&lk->lk_time); - CLASSERT(offsetof(typeof(*lk), lk_padding_1) != 0); - CLASSERT(offsetof(typeof(*lk), lk_padding_2) != 0); - CLASSERT(offsetof(typeof(*lk), lk_padding_3) != 0); - CLASSERT(offsetof(typeof(*lk), lk_padding_4) != 0); -} - -void lustre_swab_mdt_rec_link (struct mdt_rec_link *lk) -{ - __swab32s (&lk->lk_opcode); - __swab32s (&lk->lk_fsuid); - __swab32s (&lk->lk_fsgid); - __swab32s (&lk->lk_cap); - __swab32s (&lk->lk_suppgid1); - __swab32s (&lk->lk_suppgid2); - lustre_swab_lu_fid (&lk->lk_fid1); - lustre_swab_lu_fid (&lk->lk_fid2); - __swab64s (&lk->lk_time); - __swab32s (&lk->lk_bias); - CLASSERT(offsetof(typeof(*lk), lk_padding_2) != 0); - CLASSERT(offsetof(typeof(*lk), lk_padding_3) != 0); - CLASSERT(offsetof(typeof(*lk), lk_padding_4) != 0); -} - -void lustre_swab_mds_rec_unlink (struct mds_rec_unlink *ul) -{ - __swab32s (&ul->ul_opcode); - __swab32s (&ul->ul_fsuid); - __swab32s (&ul->ul_fsgid); - __swab32s (&ul->ul_cap); - __swab32s (&ul->ul_suppgid); - __swab32s (&ul->ul_mode); - lustre_swab_ll_fid (&ul->ul_fid1); - lustre_swab_ll_fid (&ul->ul_fid2); - __swab64s (&ul->ul_time); - CLASSERT(offsetof(typeof(*ul), ul_padding_1) != 0); - CLASSERT(offsetof(typeof(*ul), ul_padding_2) != 0); - CLASSERT(offsetof(typeof(*ul), ul_padding_3) != 0); - CLASSERT(offsetof(typeof(*ul), ul_padding_4) != 0); -} - -void lustre_swab_mdt_rec_unlink (struct mdt_rec_unlink *ul) -{ - __swab32s (&ul->ul_opcode); - __swab32s (&ul->ul_fsuid); - __swab32s (&ul->ul_fsgid); - __swab32s (&ul->ul_cap); - __swab32s (&ul->ul_suppgid); - __swab32s (&ul->ul_mode); - lustre_swab_lu_fid (&ul->ul_fid1); - lustre_swab_lu_fid (&ul->ul_fid2); - __swab64s (&ul->ul_time); - __swab32s (&ul->ul_bias); - CLASSERT(offsetof(typeof(*ul), ul_padding_2) != 0); - CLASSERT(offsetof(typeof(*ul), ul_padding_3) != 0); - CLASSERT(offsetof(typeof(*ul), ul_padding_4) != 0); -} - -void lustre_swab_mds_rec_rename (struct mds_rec_rename *rn) -{ - __swab32s (&rn->rn_opcode); - __swab32s (&rn->rn_fsuid); - __swab32s (&rn->rn_fsgid); - __swab32s (&rn->rn_cap); - __swab32s (&rn->rn_suppgid1); - __swab32s (&rn->rn_suppgid2); - lustre_swab_ll_fid (&rn->rn_fid1); - lustre_swab_ll_fid (&rn->rn_fid2); - __swab64s (&rn->rn_time); - CLASSERT(offsetof(typeof(*rn), rn_padding_1) != 0); - CLASSERT(offsetof(typeof(*rn), rn_padding_2) != 0); - CLASSERT(offsetof(typeof(*rn), rn_padding_3) != 0); - CLASSERT(offsetof(typeof(*rn), rn_padding_4) != 0); -} - -void lustre_swab_mdt_rec_rename (struct mdt_rec_rename *rn) -{ - __swab32s (&rn->rn_opcode); - __swab32s (&rn->rn_fsuid); - __swab32s (&rn->rn_fsgid); - __swab32s (&rn->rn_cap); - __swab32s (&rn->rn_suppgid1); - __swab32s (&rn->rn_suppgid2); - lustre_swab_lu_fid (&rn->rn_fid1); - lustre_swab_lu_fid (&rn->rn_fid2); - __swab64s (&rn->rn_time); - __swab32s (&rn->rn_mode); - __swab32s (&rn->rn_bias); - CLASSERT(offsetof(typeof(*rn), rn_padding_3) != 0); - CLASSERT(offsetof(typeof(*rn), rn_padding_4) != 0); +void lustre_swab_fid2path(struct getinfo_fid2path *gf) +{ + lustre_swab_lu_fid(&gf->gf_fid); + __swab64s(&gf->gf_recno); + __swab32s(&gf->gf_linkno); + __swab32s(&gf->gf_pathlen); } +EXPORT_SYMBOL(lustre_swab_fid2path); + +void lustre_swab_fiemap_extent(struct ll_fiemap_extent *fm_extent) +{ + __swab64s(&fm_extent->fe_logical); + __swab64s(&fm_extent->fe_physical); + __swab64s(&fm_extent->fe_length); + __swab32s(&fm_extent->fe_flags); + __swab32s(&fm_extent->fe_device); +} + +void lustre_swab_fiemap(struct ll_user_fiemap *fiemap) +{ + int i; + + __swab64s(&fiemap->fm_start); + __swab64s(&fiemap->fm_length); + __swab32s(&fiemap->fm_flags); + __swab32s(&fiemap->fm_mapped_extents); + __swab32s(&fiemap->fm_extent_count); + __swab32s(&fiemap->fm_reserved); + + for (i = 0; i < fiemap->fm_mapped_extents; i++) + lustre_swab_fiemap_extent(&fiemap->fm_extents[i]); +} + +void lustre_swab_mdt_rec_reint (struct mdt_rec_reint *rr) +{ + __swab32s (&rr->rr_opcode); + __swab32s (&rr->rr_cap); + __swab32s (&rr->rr_fsuid); + /* rr_fsuid_h is unused */ + __swab32s (&rr->rr_fsgid); + /* rr_fsgid_h is unused */ + __swab32s (&rr->rr_suppgid1); + /* rr_suppgid1_h is unused */ + __swab32s (&rr->rr_suppgid2); + /* rr_suppgid2_h is unused */ + lustre_swab_lu_fid (&rr->rr_fid1); + lustre_swab_lu_fid (&rr->rr_fid2); + __swab64s (&rr->rr_mtime); + __swab64s (&rr->rr_atime); + __swab64s (&rr->rr_ctime); + __swab64s (&rr->rr_size); + __swab64s (&rr->rr_blocks); + __swab32s (&rr->rr_bias); + __swab32s (&rr->rr_mode); + __swab32s (&rr->rr_flags); + + CLASSERT(offsetof(typeof(*rr), rr_padding_2) != 0); + CLASSERT(offsetof(typeof(*rr), rr_padding_3) != 0); + CLASSERT(offsetof(typeof(*rr), rr_padding_4) != 0); +}; void lustre_swab_lov_desc (struct lov_desc *ld) { __swab32s (&ld->ld_tgt_count); __swab32s (&ld->ld_active_tgt_count); __swab32s (&ld->ld_default_stripe_count); + __swab32s (&ld->ld_pattern); __swab64s (&ld->ld_default_stripe_size); __swab64s (&ld->ld_default_stripe_offset); - __swab32s (&ld->ld_pattern); __swab32s (&ld->ld_qos_maxage); /* uuid endian insensitive */ } -/*begin adding MDT by huanghua@clusterfs.com*/ void lustre_swab_lmv_desc (struct lmv_desc *ld) { __swab32s (&ld->ld_tgt_count); __swab32s (&ld->ld_active_tgt_count); + __swab32s (&ld->ld_default_stripe_count); + __swab32s (&ld->ld_pattern); + __swab64s (&ld->ld_default_hash_size); + __swab32s (&ld->ld_qos_maxage); /* uuid endian insensitive */ } -/*end adding MDT by huanghua@clusterfs.com*/ -void lustre_swab_md_fld (struct md_fld *mf) + +void lustre_swab_lmv_stripe_md (struct lmv_stripe_md *mea) { - __swab64s(&mf->mf_seq); - __swab64s(&mf->mf_mds); + __swab32s(&mea->mea_magic); + __swab32s(&mea->mea_count); + __swab32s(&mea->mea_master); + CLASSERT(offsetof(typeof(*mea), mea_padding) != 0); } + static void print_lum (struct lov_user_md *lum) { CDEBUG(D_OTHER, "lov_user_md %p:\n", lum); CDEBUG(D_OTHER, "\tlmm_magic: %#x\n", lum->lmm_magic); CDEBUG(D_OTHER, "\tlmm_pattern: %#x\n", lum->lmm_pattern); CDEBUG(D_OTHER, "\tlmm_object_id: "LPU64"\n", lum->lmm_object_id); - CDEBUG(D_OTHER, "\tlmm_object_gr: "LPU64"\n", lum->lmm_object_gr); + CDEBUG(D_OTHER, "\tlmm_object_gr: "LPU64"\n", lum->lmm_object_seq); CDEBUG(D_OTHER, "\tlmm_stripe_size: %#x\n", lum->lmm_stripe_size); CDEBUG(D_OTHER, "\tlmm_stripe_count: %#x\n", lum->lmm_stripe_count); - CDEBUG(D_OTHER, "\tlmm_stripe_offset: %#x\n", lum->lmm_stripe_offset); + CDEBUG(D_OTHER, "\tlmm_stripe_offset/lmm_layout_gen: %#x\n", + lum->u.lum_stripe_offset); } -void lustre_swab_lov_user_md(struct lov_user_md *lum) +static void lustre_swab_lov_user_md_common(struct lov_user_md_v1 *lum) { ENTRY; - CDEBUG(D_IOCTL, "swabbing lov_user_md\n"); __swab32s(&lum->lmm_magic); __swab32s(&lum->lmm_pattern); __swab64s(&lum->lmm_object_id); - __swab64s(&lum->lmm_object_gr); + __swab64s(&lum->lmm_object_seq); __swab32s(&lum->lmm_stripe_size); __swab16s(&lum->lmm_stripe_count); - __swab16s(&lum->lmm_stripe_offset); + __swab16s(&lum->u.lum_stripe_offset); print_lum(lum); EXIT; } -static void print_lumj (struct lov_user_md_join *lumj) -{ - CDEBUG(D_OTHER, "lov_user_md %p:\n", lumj); - CDEBUG(D_OTHER, "\tlmm_magic: %#x\n", lumj->lmm_magic); - CDEBUG(D_OTHER, "\tlmm_pattern: %#x\n", lumj->lmm_pattern); - CDEBUG(D_OTHER, "\tlmm_object_id: "LPU64"\n", lumj->lmm_object_id); - CDEBUG(D_OTHER, "\tlmm_object_gr: "LPU64"\n", lumj->lmm_object_gr); - CDEBUG(D_OTHER, "\tlmm_stripe_size: %#x\n", lumj->lmm_stripe_size); - CDEBUG(D_OTHER, "\tlmm_stripe_count: %#x\n", lumj->lmm_stripe_count); - CDEBUG(D_OTHER, "\tlmm_extent_count: %#x\n", lumj->lmm_extent_count); -} - -void lustre_swab_lov_user_md_join(struct lov_user_md_join *lumj) +void lustre_swab_lov_user_md_v1(struct lov_user_md_v1 *lum) { ENTRY; - CDEBUG(D_IOCTL, "swabbing lov_user_md_join\n"); - __swab32s(&lumj->lmm_magic); - __swab32s(&lumj->lmm_pattern); - __swab64s(&lumj->lmm_object_id); - __swab64s(&lumj->lmm_object_gr); - __swab32s(&lumj->lmm_stripe_size); - __swab32s(&lumj->lmm_stripe_count); - __swab32s(&lumj->lmm_extent_count); - print_lumj(lumj); + CDEBUG(D_IOCTL, "swabbing lov_user_md v1\n"); + lustre_swab_lov_user_md_common(lum); EXIT; } -static void print_lum_objs(struct lov_user_md *lum) +void lustre_swab_lov_user_md_v3(struct lov_user_md_v3 *lum) { - struct lov_user_ost_data *lod; - int i; ENTRY; - if (!(libcfs_debug & D_OTHER)) /* don't loop on nothing */ - return; - CDEBUG(D_OTHER, "lov_user_md_objects: %p\n", lum); - for (i = 0; i < lum->lmm_stripe_count; i++) { - lod = &lum->lmm_objects[i]; - CDEBUG(D_OTHER, "(%i) lod->l_object_id: "LPX64"\n", i, lod->l_object_id); - CDEBUG(D_OTHER, "(%i) lod->l_object_gr: "LPX64"\n", i, lod->l_object_gr); - CDEBUG(D_OTHER, "(%i) lod->l_ost_gen: %#x\n", i, lod->l_ost_gen); - CDEBUG(D_OTHER, "(%i) lod->l_ost_idx: %#x\n", i, lod->l_ost_idx); - } + CDEBUG(D_IOCTL, "swabbing lov_user_md v3\n"); + lustre_swab_lov_user_md_common((struct lov_user_md_v1 *)lum); + /* lmm_pool_name nothing to do with char */ EXIT; } -void lustre_swab_lov_user_md_objects(struct lov_user_md *lum) +void lustre_swab_lov_mds_md(struct lov_mds_md *lmm) { - struct lov_user_ost_data *lod; - int i; ENTRY; - for (i = 0; i < lum->lmm_stripe_count; i++) { - lod = &lum->lmm_objects[i]; - __swab64s(&lod->l_object_id); - __swab64s(&lod->l_object_gr); - __swab32s(&lod->l_ost_gen); - __swab32s(&lod->l_ost_idx); - } - print_lum_objs(lum); + CDEBUG(D_IOCTL, "swabbing lov_mds_md\n"); + __swab32s(&lmm->lmm_magic); + __swab32s(&lmm->lmm_pattern); + __swab64s(&lmm->lmm_object_id); + __swab64s(&lmm->lmm_object_seq); + __swab32s(&lmm->lmm_stripe_size); + __swab16s(&lmm->lmm_stripe_count); + __swab16s(&lmm->lmm_layout_gen); EXIT; } - -void lustre_swab_lov_mds_md(struct lov_mds_md *lmm) +void lustre_swab_lov_user_md_objects(struct lov_user_ost_data *lod, + int stripe_count) { - struct lov_ost_data *lod; int i; ENTRY; - for (i = 0; i < lmm->lmm_stripe_count; i++) { - lod = &lmm->lmm_objects[i]; - __swab64s(&lod->l_object_id); - __swab64s(&lod->l_object_gr); - __swab32s(&lod->l_ost_gen); - __swab32s(&lod->l_ost_idx); + for (i = 0; i < stripe_count; i++) { + __swab64s(&(lod[i].l_object_id)); + __swab64s(&(lod[i].l_object_seq)); + __swab32s(&(lod[i].l_ost_gen)); + __swab32s(&(lod[i].l_ost_idx)); } - __swab32s(&lmm->lmm_magic); - __swab32s(&lmm->lmm_pattern); - __swab64s(&lmm->lmm_object_id); - __swab64s(&lmm->lmm_object_gr); - __swab32s(&lmm->lmm_stripe_size); - __swab32s(&lmm->lmm_stripe_count); - EXIT; } @@ -2139,7 +2093,7 @@ void lustre_swab_ldlm_res_id (struct ldlm_res_id *id) __swab64s (&id->name[i]); } -void lustre_swab_ldlm_policy_data (ldlm_policy_data_t *d) +void lustre_swab_ldlm_policy_data (ldlm_wire_policy_data_t *d) { /* the lock data is a union and the first two fields are always an * extent so it's ok to process an LDLM_EXTENT and LDLM_FLOCK lock @@ -2147,7 +2101,8 @@ void lustre_swab_ldlm_policy_data (ldlm_policy_data_t *d) __swab64s(&d->l_extent.start); __swab64s(&d->l_extent.end); __swab64s(&d->l_extent.gid); - __swab32s(&d->l_flock.pid); + __swab64s(&d->l_flock.lfw_owner); + __swab32s(&d->l_flock.lfw_pid); } void lustre_swab_ldlm_intent (struct ldlm_intent *i) @@ -2203,54 +2158,160 @@ void lustre_swab_qdata(struct qunit_data *d) __swab32s (&d->qd_id); __swab32s (&d->qd_flags); __swab64s (&d->qd_count); -} - -void lustre_swab_qdata_old(struct qunit_data_old *d) -{ - __swab32s (&d->qd_id); - __swab32s (&d->qd_type); - __swab32s (&d->qd_count); - __swab32s (&d->qd_isblk); + __swab64s (&d->qd_qunit); + CLASSERT(offsetof(typeof(*d), padding) != 0); +} + +/* Dump functions */ +void dump_ioo(struct obd_ioobj *ioo) +{ + CDEBUG(D_RPCTRACE, + "obd_ioobj: ioo_id="LPD64", ioo_seq="LPD64", ioo_type=%d, " + "ioo_bufct=%d\n", ioo->ioo_id, ioo->ioo_seq, ioo->ioo_type, + ioo->ioo_bufcnt); +} + +void dump_rniobuf(struct niobuf_remote *nb) +{ + CDEBUG(D_RPCTRACE, "niobuf_remote: offset="LPU64", len=%d, flags=%x\n", + nb->offset, nb->len, nb->flags); +} + +void dump_obdo(struct obdo *oa) +{ + __u32 valid = oa->o_valid; + + CDEBUG(D_RPCTRACE, "obdo: o_valid = %08x\n", valid); + if (valid & OBD_MD_FLID) + CDEBUG(D_RPCTRACE, "obdo: o_id = "LPD64"\n", oa->o_id); + if (valid & OBD_MD_FLGROUP) + CDEBUG(D_RPCTRACE, "obdo: o_seq = "LPD64"\n", oa->o_seq); + if (valid & OBD_MD_FLFID) + CDEBUG(D_RPCTRACE, "obdo: o_parent_seq = "LPX64"\n", + oa->o_parent_seq); + if (valid & OBD_MD_FLSIZE) + CDEBUG(D_RPCTRACE, "obdo: o_size = "LPD64"\n", oa->o_size); + if (valid & OBD_MD_FLMTIME) + CDEBUG(D_RPCTRACE, "obdo: o_mtime = "LPD64"\n", oa->o_mtime); + if (valid & OBD_MD_FLATIME) + CDEBUG(D_RPCTRACE, "obdo: o_atime = "LPD64"\n", oa->o_atime); + if (valid & OBD_MD_FLCTIME) + CDEBUG(D_RPCTRACE, "obdo: o_ctime = "LPD64"\n", oa->o_ctime); + if (valid & OBD_MD_FLBLOCKS) /* allocation of space */ + CDEBUG(D_RPCTRACE, "obdo: o_blocks = "LPD64"\n", oa->o_blocks); + if (valid & OBD_MD_FLGRANT) + CDEBUG(D_RPCTRACE, "obdo: o_grant = "LPD64"\n", oa->o_grant); + if (valid & OBD_MD_FLBLKSZ) + CDEBUG(D_RPCTRACE, "obdo: o_blksize = %d\n", oa->o_blksize); + if (valid & (OBD_MD_FLTYPE | OBD_MD_FLMODE)) + CDEBUG(D_RPCTRACE, "obdo: o_mode = %o\n", + oa->o_mode & ((valid & OBD_MD_FLTYPE ? S_IFMT : 0) | + (valid & OBD_MD_FLMODE ? ~S_IFMT : 0))); + if (valid & OBD_MD_FLUID) + CDEBUG(D_RPCTRACE, "obdo: o_uid = %u\n", oa->o_uid); + if (valid & OBD_MD_FLUID) + CDEBUG(D_RPCTRACE, "obdo: o_uid_h = %u\n", oa->o_uid_h); + if (valid & OBD_MD_FLGID) + CDEBUG(D_RPCTRACE, "obdo: o_gid = %u\n", oa->o_gid); + if (valid & OBD_MD_FLGID) + CDEBUG(D_RPCTRACE, "obdo: o_gid_h = %u\n", oa->o_gid_h); + if (valid & OBD_MD_FLFLAGS) + CDEBUG(D_RPCTRACE, "obdo: o_flags = %x\n", oa->o_flags); + if (valid & OBD_MD_FLNLINK) + CDEBUG(D_RPCTRACE, "obdo: o_nlink = %u\n", oa->o_nlink); + else if (valid & OBD_MD_FLCKSUM) + CDEBUG(D_RPCTRACE, "obdo: o_checksum (o_nlink) = %u\n", + oa->o_nlink); + if (valid & OBD_MD_FLGENER) + CDEBUG(D_RPCTRACE, "obdo: o_parent_oid = %x\n", + oa->o_parent_oid); + if (valid & OBD_MD_FLEPOCH) + CDEBUG(D_RPCTRACE, "obdo: o_ioepoch = "LPD64"\n", + oa->o_ioepoch); + if (valid & OBD_MD_FLFID) { + CDEBUG(D_RPCTRACE, "obdo: o_stripe_idx = %u\n", + oa->o_stripe_idx); + CDEBUG(D_RPCTRACE, "obdo: o_parent_ver = %x\n", + oa->o_parent_ver); + } + if (valid & OBD_MD_FLHANDLE) + CDEBUG(D_RPCTRACE, "obdo: o_handle = "LPD64"\n", + oa->o_handle.cookie); + if (valid & OBD_MD_FLCOOKIE) + CDEBUG(D_RPCTRACE, "obdo: o_lcookie = " + "(llog_cookie dumping not yet implemented)\n"); +} + +void dump_ost_body(struct ost_body *ob) +{ + dump_obdo(&ob->oa); +} + +void dump_rcs(__u32 *rc) +{ + CDEBUG(D_RPCTRACE, "rmf_rcs: %d\n", *rc); } #ifdef __KERNEL__ -struct qunit_data *lustre_quota_old_to_new(struct qunit_data_old *d) + +/** + * got qdata from request(req/rep) + */ +struct qunit_data *quota_get_qdata(void *r, int is_req, int is_exp) { - struct qunit_data_old tmp; - struct qunit_data *ret; - ENTRY; + struct ptlrpc_request *req = (struct ptlrpc_request *)r; + struct qunit_data *qdata; + __u64 flags = is_exp ? req->rq_export->exp_connect_flags : + req->rq_import->imp_connect_data.ocd_connect_flags; - if (!d) - return NULL; + LASSERT(req); + /* support for quota64 */ + LASSERT(flags & OBD_CONNECT_QUOTA64); + /* support for change_qs */ + LASSERT(flags & OBD_CONNECT_CHANGE_QS); - tmp = *d; - ret = (struct qunit_data *)d; - ret->qd_id = tmp.qd_id; - ret->qd_flags = (tmp.qd_type ? QUOTA_IS_GRP : 0) | (tmp.qd_isblk ? QUOTA_IS_BLOCK : 0); - ret->qd_count = tmp.qd_count; - RETURN(ret); + if (is_req == QUOTA_REQUEST) + qdata = req_capsule_client_get(&req->rq_pill, &RMF_QUNIT_DATA); + else + qdata = req_capsule_server_get(&req->rq_pill, &RMF_QUNIT_DATA); + if (qdata == NULL) + return ERR_PTR(-EPROTO); + QDATA_SET_CHANGE_QS(qdata); + return qdata; } -EXPORT_SYMBOL(lustre_quota_old_to_new); - -struct qunit_data_old *lustre_quota_new_to_old(struct qunit_data *d) -{ - struct qunit_data tmp; - struct qunit_data_old *ret; - ENTRY; +EXPORT_SYMBOL(quota_get_qdata); - if (!d) - return NULL; - - tmp = *d; - ret = (struct qunit_data_old *)d; - ret->qd_id = tmp.qd_id; - ret->qd_type = ((tmp.qd_flags & QUOTA_IS_GRP) ? GRPQUOTA : USRQUOTA); - ret->qd_count = (__u32)tmp.qd_count; - ret->qd_isblk = ((tmp.qd_flags & QUOTA_IS_BLOCK) ? 1 : 0); - RETURN(ret); +/** + * copy qdata to request(req/rep) + */ +int quota_copy_qdata(void *r, struct qunit_data *qdata, int is_req, + int is_exp) +{ + struct ptlrpc_request *req = (struct ptlrpc_request *)r; + void *target; + __u64 flags = is_exp ? req->rq_export->exp_connect_flags : + req->rq_import->imp_connect_data.ocd_connect_flags; + + LASSERT(req); + LASSERT(qdata); + /* support for quota64 */ + LASSERT(flags & OBD_CONNECT_QUOTA64); + /* support for change_qs */ + LASSERT(flags & OBD_CONNECT_CHANGE_QS); + + if (is_req == QUOTA_REQUEST) + target = req_capsule_client_get(&req->rq_pill, &RMF_QUNIT_DATA); + else + target = req_capsule_server_get(&req->rq_pill, &RMF_QUNIT_DATA); + if (target == NULL) + return -EPROTO; + + LASSERT(target != qdata); + memcpy(target, qdata, sizeof(*qdata)); + return 0; } -EXPORT_SYMBOL(lustre_quota_new_to_old); +EXPORT_SYMBOL(quota_copy_qdata); #endif /* __KERNEL__ */ static inline int req_ptlrpc_body_swabbed(struct ptlrpc_request *req) @@ -2258,11 +2319,7 @@ static inline int req_ptlrpc_body_swabbed(struct ptlrpc_request *req) LASSERT(req->rq_reqmsg); switch (req->rq_reqmsg->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - case LUSTRE_MSG_MAGIC_V1_SWABBED: - return 1; case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: return lustre_req_swabbed(req, MSG_PTLRPC_BODY_OFF); default: CERROR("bad lustre msg magic: %#08X\n", @@ -2276,11 +2333,7 @@ static inline int rep_ptlrpc_body_swabbed(struct ptlrpc_request *req) LASSERT(req->rq_repmsg); switch (req->rq_repmsg->lm_magic) { - case LUSTRE_MSG_MAGIC_V1: - case LUSTRE_MSG_MAGIC_V1_SWABBED: - return 1; case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: return lustre_rep_swabbed(req, MSG_PTLRPC_BODY_OFF); default: /* uninitialized yet */ @@ -2288,37 +2341,49 @@ static inline int rep_ptlrpc_body_swabbed(struct ptlrpc_request *req) } } -void _debug_req(struct ptlrpc_request *req, __u32 mask, - struct libcfs_debug_msg_data *data, const char *fmt, ... ) +void _debug_req(struct ptlrpc_request *req, + struct libcfs_debug_msg_data *msgdata, + const char *fmt, ... ) { + int req_ok = req->rq_reqmsg != NULL; + int rep_ok = req->rq_repmsg != NULL; + lnet_nid_t nid = LNET_NID_ANY; va_list args; + if (ptlrpc_req_need_swab(req)) { + req_ok = req_ok && req_ptlrpc_body_swabbed(req); + rep_ok = rep_ok && rep_ptlrpc_body_swabbed(req); + } + + if (req->rq_import && req->rq_import->imp_connection) + nid = req->rq_import->imp_connection->c_peer.nid; + else if (req->rq_export && req->rq_export->exp_connection) + nid = req->rq_export->exp_connection->c_peer.nid; + va_start(args, fmt); - libcfs_debug_vmsg2(data->msg_cdls, data->msg_subsys, mask, data->msg_file, - data->msg_fn, data->msg_line, fmt, args, - " req@%p x"LPD64"/t"LPD64"("LPD64") o%d->%s@%s:%d lens" - " %d/%d ref %d fl "REQ_FLAGS_FMT"/%x/%x rc %d/%d\n", + libcfs_debug_vmsg2(msgdata, fmt, args, + " req@%p x"LPU64"/t"LPD64"("LPD64") o%d->%s@%s:%d/%d" + " lens %d/%d e %d to %d dl "CFS_TIME_T" ref %d " + "fl "REQ_FLAGS_FMT"/%x/%x rc %d/%d\n", req, req->rq_xid, req->rq_transno, - req->rq_reqmsg ? lustre_msg_get_transno(req->rq_reqmsg) : 0, - req->rq_reqmsg ? lustre_msg_get_opc(req->rq_reqmsg) : -1, - req->rq_import ? obd2cli_tgt(req->rq_import->imp_obd) : - req->rq_export ? - (char*)req->rq_export->exp_client_uuid.uuid : "", + req_ok ? lustre_msg_get_transno(req->rq_reqmsg) : 0, + req_ok ? lustre_msg_get_opc(req->rq_reqmsg) : -1, req->rq_import ? - (char *)req->rq_import->imp_connection->c_remote_uuid.uuid : - req->rq_export ? - (char *)req->rq_export->exp_connection->c_remote_uuid.uuid : "", - (req->rq_import && req->rq_import->imp_client) ? - req->rq_import->imp_client->cli_request_portal : -1, - req->rq_reqlen, req->rq_replen, atomic_read(&req->rq_refcount), + req->rq_import->imp_obd->obd_name : + req->rq_export ? + req->rq_export->exp_client_uuid.uuid : + "", + libcfs_nid2str(nid), + req->rq_request_portal, req->rq_reply_portal, + req->rq_reqlen, req->rq_replen, + req->rq_early_count, req->rq_timedout, + req->rq_deadline, + cfs_atomic_read(&req->rq_refcount), DEBUG_REQ_FLAGS(req), - req->rq_reqmsg && req_ptlrpc_body_swabbed(req) ? - lustre_msg_get_flags(req->rq_reqmsg) : -1, - req->rq_repmsg && rep_ptlrpc_body_swabbed(req) ? - lustre_msg_get_flags(req->rq_repmsg) : -1, + req_ok ? lustre_msg_get_flags(req->rq_reqmsg) : -1, + rep_ok ? lustre_msg_get_flags(req->rq_repmsg) : -1, req->rq_status, - req->rq_repmsg && rep_ptlrpc_body_swabbed(req) ? - lustre_msg_get_status(req->rq_repmsg) : -1); + rep_ok ? lustre_msg_get_status(req->rq_repmsg) : -1); } EXPORT_SYMBOL(_debug_req); @@ -2326,16 +2391,55 @@ void lustre_swab_lustre_capa(struct lustre_capa *c) { lustre_swab_lu_fid(&c->lc_fid); __swab64s (&c->lc_opc); - __swab32s (&c->lc_uid); + __swab64s (&c->lc_uid); + __swab64s (&c->lc_gid); __swab32s (&c->lc_flags); __swab32s (&c->lc_keyid); __swab32s (&c->lc_timeout); - __swab64s (&c->lc_expiry); + __swab32s (&c->lc_expiry); } -void lustre_swab_lustre_capa_key (struct lustre_capa_key *k) +void lustre_swab_lustre_capa_key(struct lustre_capa_key *k) { - __swab64s (&k->lk_mdsid); + __swab64s (&k->lk_seq); __swab32s (&k->lk_keyid); - __swab32s (&k->lk_padding); + CLASSERT(offsetof(typeof(*k), lk_padding) != 0); } + +void lustre_swab_hsm_state(struct hsm_state_set_ioc *hssi) +{ + lustre_swab_lu_fid(&hssi->hssi_fid); + __swab64s(&hssi->hssi_setmask); + __swab64s(&hssi->hssi_clearmask); +} +EXPORT_SYMBOL(lustre_swab_hsm_state); + +void lustre_swab_hsm_user_request(struct hsm_user_request *hur) +{ + int i; + + __swab32s(&hur->hur_action); + __swab32s(&hur->hur_itemcount); + __swab32s(&hur->hur_data_len); + for (i = 0; i < hur->hur_itemcount; i++) { + struct hsm_user_item *hui = &hur->hur_user_item[i]; + lustre_swab_lu_fid(&hui->hui_fid); + __swab64s(&hui->hui_extent.offset); + __swab64s(&hui->hui_extent.length); + } + /* Note: data blob is not swabbed here */ +} +EXPORT_SYMBOL(lustre_swab_hsm_user_request); + +void lustre_swab_hsm_progress(struct hsm_progress *hp) +{ + lustre_swab_lu_fid(&hp->hp_fid); + __swab64s(&hp->hp_cookie); + __swab64s(&hp->hp_extent.offset); + __swab64s(&hp->hp_extent.length); + __swab16s(&hp->hp_flags); + __swab16s(&hp->hp_errval); +} +EXPORT_SYMBOL(lustre_swab_hsm_progress); + +