Sat Aug 7 20:39:33 2010 UTC ()
Fix incorrect comments about the buffer size being 2K; it is really 8K now.
From Robert Watson.


(christos)
diff -r1.16 -r1.17 src/sys/coda/coda.h
diff -r1.7 -r1.8 src/sys/coda/coda_pioctl.h
cvs diff -r1.16 -r1.17 src/sys/coda/coda.h (expand / switch to unified diff)

--- src/sys/coda/coda.h 2010/07/20 17:26:03 1.16
+++ src/sys/coda/coda.h 2010/08/07 20:39:33 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: coda.h,v 1.16 2010/07/20 17:26:03 christos Exp $ */ 1/* $NetBSD: coda.h,v 1.17 2010/08/07 20:39:33 christos Exp $ */
2 2
3/* 3/*
4 4
5 Coda: an Experimental Distributed File System 5 Coda: an Experimental Distributed File System
6 Release 4.0 6 Release 4.0
7 7
8 Copyright (c) 1987-1999 Carnegie Mellon University 8 Copyright (c) 1987-1999 Carnegie Mellon University
9 All Rights Reserved 9 All Rights Reserved
10 10
11Permission to use, copy, modify and distribute this software and its 11Permission to use, copy, modify and distribute this software and its
12documentation is hereby granted, provided that both the copyright 12documentation is hereby granted, provided that both the copyright
13notice and this permission notice appear in all copies of the 13notice and this permission notice appear in all copies of the
14software, derivative works or modified versions, and any portions 14software, derivative works or modified versions, and any portions
@@ -783,28 +783,28 @@ union coda_downcalls { @@ -783,28 +783,28 @@ union coda_downcalls {
783 struct coda_zapvnode_out zapvnode; 783 struct coda_zapvnode_out zapvnode;
784 struct coda_purgefid_out purgefid; 784 struct coda_purgefid_out purgefid;
785 struct coda_replace_out replace; 785 struct coda_replace_out replace;
786}; 786};
787 787
788 788
789/* 789/*
790 * Used for identifying usage of "Control" and pioctls 790 * Used for identifying usage of "Control" and pioctls
791 */ 791 */
792 792
793#define PIOCPARM_MASK 0x0000ffff 793#define PIOCPARM_MASK 0x0000ffff
794struct ViceIoctl { 794struct ViceIoctl {
795 void *in, *out; /* Data to be transferred in, or out */ 795 void *in, *out; /* Data to be transferred in, or out */
796 unsigned short in_size; /* Size of input buffer <= 2K */ 796 unsigned short in_size; /* Size of input buffer <= 8K */
797 unsigned short out_size;/* Maximum size of output buffer, <= 2K */ 797 unsigned short out_size;/* Maximum size of output buffer, <= 8K */
798}; 798};
799 799
800struct PioctlData { 800struct PioctlData {
801 const char *path; 801 const char *path;
802 int follow; 802 int follow;
803#if defined(__CYGWIN32__) || defined(__NT_CODA__) 803#if defined(__CYGWIN32__) || defined(__NT_CODA__)
804 int cmd; 804 int cmd;
805#endif 805#endif
806 struct ViceIoctl vi; 806 struct ViceIoctl vi;
807}; 807};
808 808
809#define CODA_CONTROL ".CONTROL" 809#define CODA_CONTROL ".CONTROL"
810#define CODA_CONTROLLEN 8 810#define CODA_CONTROLLEN 8
cvs diff -r1.7 -r1.8 src/sys/coda/coda_pioctl.h (expand / switch to unified diff)

--- src/sys/coda/coda_pioctl.h 2005/12/11 12:19:50 1.7
+++ src/sys/coda/coda_pioctl.h 2010/08/07 20:39:33 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: coda_pioctl.h,v 1.7 2005/12/11 12:19:50 christos Exp $ */ 1/* $NetBSD: coda_pioctl.h,v 1.8 2010/08/07 20:39:33 christos Exp $ */
2 2
3/* 3/*
4 * 4 *
5 * Coda: an Experimental Distributed File System 5 * Coda: an Experimental Distributed File System
6 * Release 3.1 6 * Release 3.1
7 * 7 *
8 * Copyright (c) 1987-1998 Carnegie Mellon University 8 * Copyright (c) 1987-1998 Carnegie Mellon University
9 * All Rights Reserved 9 * All Rights Reserved
10 * 10 *
11 * Permission to use, copy, modify and distribute this software and its 11 * Permission to use, copy, modify and distribute this software and its
12 * documentation is hereby granted, provided that both the copyright 12 * documentation is hereby granted, provided that both the copyright
13 * notice and this permission notice appear in all copies of the 13 * notice and this permission notice appear in all copies of the
14 * software, derivative works or modified versions, and any portions 14 * software, derivative works or modified versions, and any portions
@@ -41,27 +41,27 @@ @@ -41,27 +41,27 @@
41 */ 41 */
42 42
43/* 43/*
44 * ITC Remote file system - vice ioctl interface module 44 * ITC Remote file system - vice ioctl interface module
45 */ 45 */
46 46
47/* 47/*
48 * TODO: Find /usr/local/include/viceioctl.h. 48 * TODO: Find /usr/local/include/viceioctl.h.
49 */ 49 */
50 50
51#ifndef _SYS_PIOCTL_H_ 51#ifndef _SYS_PIOCTL_H_
52#define _SYS_PIOCTL_H_ 52#define _SYS_PIOCTL_H_
53 53
54/* The 2K limits above are a consequence of the size of the kernel buffer 54/* The 8K limits above are a consequence of the size of the kernel buffer
55 used to buffer requests from the user to venus--2*MAXPATHLEN. 55 used to buffer requests from the user to venus--2*MAXPATHLEN.
56 The buffer pointers may be null, or the counts may be 0 if there 56 The buffer pointers may be null, or the counts may be 0 if there
57 are no input or output parameters 57 are no input or output parameters
58 */ 58 */
59 59
60#define _VICEIOCTL(id) ((unsigned int ) _IOW('V', id, struct ViceIoctl)) 60#define _VICEIOCTL(id) ((unsigned int ) _IOW('V', id, struct ViceIoctl))
61 61
62/* Use this macro to define up to 256 vice ioctl's. These ioctl's 62/* Use this macro to define up to 256 vice ioctl's. These ioctl's
63 all potentially have in/out parameters--this depends upon the 63 all potentially have in/out parameters--this depends upon the
64 values in the ViceIoctl structure. This structure is itself passed 64 values in the ViceIoctl structure. This structure is itself passed
65 into the kernel by the normal ioctl parameter passing mechanism. 65 into the kernel by the normal ioctl parameter passing mechanism.
66 */ 66 */
67 67