lkml.org 
[lkml]   [2000]   [Sep]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRe: 2.2.18pre10: A few warnings less...
From
Date
>>>>> " " == Horst von Brand <vonbrand@sleipnir.valparaiso.cl> writes:


> - There are several headers for NFS:
> include/linux/nfs.h include/linux/nfs2.h
> include/linux/nfs3.h include/linux/nfsd/const.h
> Several constants defined in nfs?.h are repeated in
> nfsd/const.h, which on the whole seems to be more complete
> than the others. Should this stuff be moved into nfs?.d, and
> nfsd/const.h deleted? What about nfs.h, which duplicates
> other stuff?

No. The stuff in nfsd/*.h is *only* for use by the server, and most of
nfsd/const.h is `legacy' crap.

The following patch gets rid of the warnings. We could probably get
rid of the NFS3_*VERFSIZE stuff too (neither the old nor the new nfsd
use it) but I leave that to Dave.

Cheers,
Trond





diff -u --recursive --new-file linux-2.2.18-pre10/include/linux/nfsd/const.h linux-2.2.18-pre10-fix_nfsd/include/linux/nfsd/const.h
--- linux-2.2.18-pre10/include/linux/nfsd/const.h Tue Sep 26 13:36:25 2000
+++ linux-2.2.18-pre10-fix_nfsd/include/linux/nfsd/const.h Tue Sep 26 14:41:58 2000
@@ -15,6 +15,8 @@
#include <linux/dirent.h>
#include <linux/fs.h>
#include <linux/nfs.h>
+#include <linux/nfs2.h>
+#include <linux/nfs3.h>

#define NFS_FHSIZE 32
#define NFS_MAXPATHLEN 1024
@@ -30,14 +32,8 @@
*/
#define NFSSVC_MAXBLKSIZE 8192

-#define NFS2_MAXPATHLEN 1024
-#define NFS2_MAXNAMLEN 255
-#define NFS2_FHSIZE NFS_FHSIZE
#define NFS2_COOKIESIZE 4

-#define NFS3_MAXPATHLEN PATH_MAX
-#define NFS3_MAXNAMLEN NAME_MAX
-#define NFS3_FHSIZE NFS_FHSIZE
#define NFS3_COOKIEVERFSIZE 8
#define NFS3_CREATEVERFSIZE 8
#define NFS3_WRITEVERFSIZE 8
@@ -47,43 +43,6 @@
#ifndef NFS_SUPER_MAGIC
# define NFS_SUPER_MAGIC 0x6969
#endif
-
-/*
- * NFS stats. The good thing with these values is that NFSv3 errors are
- * a superset of NFSv2 errors (with the exception of NFSERR_WFLUSH which
- * no-one uses anyway), so we can happily mix code as long as we make sure
- * no NFSv3 errors are returned to NFSv2 clients.
- */
-#define NFS_OK 0 /* v2 v3 */
-#define NFSERR_PERM 1 /* v2 v3 */
-#define NFSERR_NOENT 2 /* v2 v3 */
-#define NFSERR_IO 5 /* v2 v3 */
-#define NFSERR_NXIO 6 /* v2 v3 */
-#define NFSERR_ACCES 13 /* v2 v3 */
-#define NFSERR_EXIST 17 /* v2 v3 */
-#define NFSERR_XDEV 18 /* v3 */
-#define NFSERR_NODEV 19 /* v2 v3 */
-#define NFSERR_NOTDIR 20 /* v2 v3 */
-#define NFSERR_ISDIR 21 /* v2 v3 */
-#define NFSERR_INVAL 22 /* v3 */
-#define NFSERR_FBIG 27 /* v2 v3 */
-#define NFSERR_NOSPC 28 /* v2 v3 */
-#define NFSERR_ROFS 30 /* v2 v3 */
-#define NFSERR_MLINK 31 /* v3 */
-#define NFSERR_NAMETOOLONG 63 /* v2 v3 */
-#define NFSERR_NOTEMPTY 66 /* v2 v3 */
-#define NFSERR_DQUOT 69 /* v2 v3 */
-#define NFSERR_STALE 70 /* v2 v3 */
-#define NFSERR_REMOTE 71 /* v3 */
-#define NFSERR_WFLUSH 99 /* v2 */
-#define NFSERR_BADHANDLE 10001 /* v3 */
-#define NFSERR_NOT_SYNC 10002 /* v3 */
-#define NFSERR_BAD_COOKIE 10003 /* v3 */
-#define NFSERR_NOTSUPP 10004 /* v3 */
-#define NFSERR_TOOSMALL 10005 /* v3 */
-#define NFSERR_SERVERFAULT 10006 /* v3 */
-#define NFSERR_BADTYPE 10007 /* v3 */
-#define NFSERR_JUKEBOX 10008 /* v3 */

#endif /* __KERNEL__ */

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 12:38    [W:0.067 / U:3.208 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site