32fbc5d824
In NFSv2, the directory cookie was 32-bits. NFSv3 widened it to 64-bits and SVN r22521 widened the corresponding argument in VOP_READDIR, but FreeBSD's NFS server continued to treat the cookies as 32-bits, and 0-extended to fill the field on the wire. Nobody ever noticed, because every in-tree file system generates cookies that fit comfortably within 32-bits. Also, have better type safety for txdr_hyper. Turn it into an inline function that type-checks its arguments. Prevents warnings about shift-count-overflow. PR: 260375 MFC after: 2 weeks Reviewed by: rmacklem Differential Revision: https://reviews.freebsd.org/D33404
95 lines
3.5 KiB
C
95 lines
3.5 KiB
C
/*-
|
|
* SPDX-License-Identifier: BSD-3-Clause
|
|
*
|
|
* Copyright (c) 1989, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* This code is derived from software contributed to Berkeley by
|
|
* Rick Macklem at The University of Guelph.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* @(#)xdr_subs.h 8.3 (Berkeley) 3/30/95
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#ifndef _NFS_XDR_SUBS_H_
|
|
#define _NFS_XDR_SUBS_H_
|
|
|
|
/*
|
|
* Macros used for conversion to/from xdr representation by nfs...
|
|
* These use the MACHINE DEPENDENT routines ntohl, htonl
|
|
* As defined by "XDR: External Data Representation Standard" RFC1014
|
|
*
|
|
* To simplify the implementation, we use ntohl/htonl even on big-endian
|
|
* machines, and count on them being `#define'd away. Some of these
|
|
* might be slightly more efficient as quad_t copies on a big-endian,
|
|
* but we cannot count on their alignment anyway.
|
|
*/
|
|
|
|
#define fxdr_unsigned(t, v) ((t)ntohl((int32_t)(v)))
|
|
#define txdr_unsigned(v) (htonl((int32_t)(v)))
|
|
|
|
#define fxdr_nfsv2time(f, t) \
|
|
do { \
|
|
(t)->tv_sec = ntohl(((struct nfsv2_time *)(f))->nfsv2_sec); \
|
|
if (((struct nfsv2_time *)(f))->nfsv2_usec != 0xffffffff) \
|
|
(t)->tv_nsec = 1000 * ntohl(((struct nfsv2_time *)(f))->nfsv2_usec); \
|
|
else \
|
|
(t)->tv_nsec = 0; \
|
|
} while (0)
|
|
#define txdr_nfsv2time(f, t) \
|
|
do { \
|
|
((struct nfsv2_time *)(t))->nfsv2_sec = htonl((f)->tv_sec); \
|
|
if ((f)->tv_nsec != -1) \
|
|
((struct nfsv2_time *)(t))->nfsv2_usec = htonl((f)->tv_nsec / 1000); \
|
|
else \
|
|
((struct nfsv2_time *)(t))->nfsv2_usec = 0xffffffff; \
|
|
} while (0)
|
|
|
|
#define fxdr_nfsv3time(f, t) \
|
|
do { \
|
|
(t)->tv_sec = ntohl(((struct nfsv3_time *)(f))->nfsv3_sec); \
|
|
(t)->tv_nsec = ntohl(((struct nfsv3_time *)(f))->nfsv3_nsec); \
|
|
} while (0)
|
|
#define txdr_nfsv3time(f, t) \
|
|
do { \
|
|
((struct nfsv3_time *)(t))->nfsv3_sec = htonl((f)->tv_sec); \
|
|
((struct nfsv3_time *)(t))->nfsv3_nsec = htonl((f)->tv_nsec); \
|
|
} while (0)
|
|
|
|
#define fxdr_hyper(f) \
|
|
((((u_quad_t)ntohl(((u_int32_t *)(f))[0])) << 32) | \
|
|
(u_quad_t)(ntohl(((u_int32_t *)(f))[1])))
|
|
|
|
static inline void
|
|
txdr_hyper(uint64_t f, uint32_t* t)
|
|
{
|
|
t[0] = htonl((u_int32_t)(f >> 32));
|
|
t[1] = htonl((u_int32_t)(f & 0xffffffff));
|
|
}
|
|
|
|
#endif
|