02865b208c
This maintenance release with no new features. Majot bug fixes are: Bug 2464 Fixed all the issues caused by GFID mismatch during distribute rename. Bug 2988 Fixed the issue of high CPU usage when Directory Quota is enabled. Bug 3122 Enhanced the volume set interface to support io-threads on the client. Bug 3210 Fixed the issue of modified mtime/atime of the files after rebalance operation. Bug 3191 Fixed the issue with symlinks during rebalance operation.
171 lines
4.1 KiB
Text
171 lines
4.1 KiB
Text
$NetBSD: patch-bk,v 1.6 2011/09/18 01:36:06 manu Exp $
|
|
|
|
Add missing xdr_sizeof() in NetBSD. Stollen from
|
|
http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/xdr/xdr_sizeof.c?rev=1.1
|
|
--- rpc/rpc-lib/src/xdr-sizeof.c.orig 2011-09-17 15:45:29.000000000 +0200
|
|
+++ rpc/rpc-lib/src/xdr-sizeof.c 2011-09-17 15:45:29.000000000 +0200
|
|
@@ -0,0 +1,164 @@
|
|
+#ifdef __NetBSD__
|
|
+/*
|
|
+ * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
|
|
+ * unrestricted use provided that this legend is included on all tape
|
|
+ * media and as a part of the software program in whole or part. Users
|
|
+ * may copy or modify Sun RPC without charge, but are not authorized
|
|
+ * to license or distribute it to anyone else except as part of a product or
|
|
+ * program developed by the user.
|
|
+ *
|
|
+ * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
|
|
+ * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
|
|
+ * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
|
|
+ *
|
|
+ * Sun RPC is provided with no support and without any obligation on the
|
|
+ * part of Sun Microsystems, Inc. to assist in its use, correction,
|
|
+ * modification or enhancement.
|
|
+ *
|
|
+ * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
|
|
+ * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
|
|
+ * OR ANY PART THEREOF.
|
|
+ *
|
|
+ * In no event will Sun Microsystems, Inc. be liable for any lost revenue
|
|
+ * or profits or other special, indirect and consequential damages, even if
|
|
+ * Sun has been advised of the possibility of such damages.
|
|
+ *
|
|
+ * Sun Microsystems, Inc.
|
|
+ * 2550 Garcia Avenue
|
|
+ * Mountain View, California 94043
|
|
+ */
|
|
+/*
|
|
+ * xdr_sizeof.c
|
|
+ *
|
|
+ * Copyright 1990 Sun Microsystems, Inc.
|
|
+ *
|
|
+ * General purpose routine to see how much space something will use
|
|
+ * when serialized using XDR.
|
|
+ */
|
|
+
|
|
+#include <sys/cdefs.h>
|
|
+/* __FBSDID("$FreeBSD: src/sys/xdr/xdr_sizeof.c,v 1.1 2008/03/26 15:23:11 dfr Exp $"); */
|
|
+
|
|
+#include "mem-pool.h"
|
|
+
|
|
+#include <rpc/types.h>
|
|
+#include <rpc/xdr.h>
|
|
+
|
|
+/* ARGSUSED */
|
|
+static bool_t
|
|
+x_putlong(XDR *xdrs, const long *longp)
|
|
+{
|
|
+
|
|
+ xdrs->x_handy += BYTES_PER_XDR_UNIT;
|
|
+ return (TRUE);
|
|
+}
|
|
+
|
|
+/* ARGSUSED */
|
|
+static bool_t
|
|
+x_putbytes(XDR *xdrs, const char *bp, u_int len)
|
|
+{
|
|
+
|
|
+ xdrs->x_handy += len;
|
|
+ return (TRUE);
|
|
+}
|
|
+
|
|
+static u_int
|
|
+x_getpostn(XDR *xdrs)
|
|
+{
|
|
+
|
|
+ return (xdrs->x_handy);
|
|
+}
|
|
+
|
|
+/* ARGSUSED */
|
|
+static bool_t
|
|
+x_setpostn(XDR *xdrs, u_int pos)
|
|
+{
|
|
+
|
|
+ /* This is not allowed */
|
|
+ return (FALSE);
|
|
+}
|
|
+
|
|
+static int32_t *
|
|
+x_inline(XDR *xdrs, u_int len)
|
|
+{
|
|
+
|
|
+ if (len == 0) {
|
|
+ return (NULL);
|
|
+ }
|
|
+ if (xdrs->x_op != XDR_ENCODE) {
|
|
+ return (NULL);
|
|
+ }
|
|
+ if (len < (u_int)(uintptr_t)xdrs->x_base) {
|
|
+ /* x_private was already allocated */
|
|
+ xdrs->x_handy += len;
|
|
+ return ((int32_t *) xdrs->x_private);
|
|
+ } else {
|
|
+ /* Free the earlier space and allocate new area */
|
|
+ if (xdrs->x_private)
|
|
+ FREE(xdrs->x_private);
|
|
+ if ((xdrs->x_private = (caddr_t) MALLOC(len)) == NULL) {
|
|
+
|
|
+ xdrs->x_base = 0;
|
|
+ return (NULL);
|
|
+ }
|
|
+ xdrs->x_base = (caddr_t)(uintptr_t) len;
|
|
+ xdrs->x_handy += len;
|
|
+ return ((int32_t *) xdrs->x_private);
|
|
+ }
|
|
+}
|
|
+
|
|
+static int
|
|
+harmless(void)
|
|
+{
|
|
+
|
|
+ /* Always return FALSE/NULL, as the case may be */
|
|
+ return (0);
|
|
+}
|
|
+
|
|
+static void
|
|
+x_destroy(XDR *xdrs)
|
|
+{
|
|
+
|
|
+ xdrs->x_handy = 0;
|
|
+ xdrs->x_base = 0;
|
|
+ if (xdrs->x_private) {
|
|
+ FREE(xdrs->x_private);
|
|
+ xdrs->x_private = NULL;
|
|
+ }
|
|
+ return;
|
|
+}
|
|
+
|
|
+unsigned long
|
|
+xdr_sizeof(xdrproc_t func, void *data)
|
|
+{
|
|
+ XDR x;
|
|
+ struct xdr_ops ops;
|
|
+ bool_t stat;
|
|
+ /* to stop ANSI-C compiler from complaining */
|
|
+ typedef bool_t (* dummyfunc1)(XDR *, long *);
|
|
+ typedef bool_t (* dummyfunc2)(XDR *, caddr_t, u_int);
|
|
+
|
|
+ ops.x_putlong = x_putlong;
|
|
+ ops.x_putbytes = x_putbytes;
|
|
+ ops.x_inline = x_inline;
|
|
+ ops.x_getpostn = x_getpostn;
|
|
+ ops.x_setpostn = x_setpostn;
|
|
+ ops.x_destroy = x_destroy;
|
|
+
|
|
+ /* the other harmless ones */
|
|
+ ops.x_getlong = (dummyfunc1) harmless;
|
|
+ ops.x_getbytes = (dummyfunc2) harmless;
|
|
+
|
|
+ x.x_op = XDR_ENCODE;
|
|
+ x.x_ops = &ops;
|
|
+ x.x_handy = 0;
|
|
+ x.x_private = (caddr_t) NULL;
|
|
+ x.x_base = (caddr_t) 0;
|
|
+
|
|
+ stat = func(&x, data);
|
|
+ if (x.x_private)
|
|
+ FREE(x.x_private);
|
|
+ return (stat == TRUE ? (unsigned) x.x_handy: 0);
|
|
+}
|
|
+
|
|
+#endif /* __NetBSD__ */
|