Menu
▾
▴
[LV-kern-commit] CVS: kernel-2.4/include/linux/nfsd nfsd.h,1.1.1.1,1.2 nfsfh.h,1.1.1.1,1.2 xdr.h,1.1.1.1,1.2 xdr3.h,1.1.1.1,1.2
|
From: Andy P. <at...@us...> - 2002-04-09 12:44:31
|
Update of /cvsroot/linux-vax/kernel-2.4/include/linux/nfsd
In directory usw-pr-cvs1:/tmp/cvs-serv17906/linux/nfsd
Modified Files:
nfsd.h nfsfh.h xdr.h xdr3.h
Log Message:
sync 2.4.15 commit 3
Index: nfsd.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/linux/nfsd/nfsd.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- nfsd.h 14 Jan 2001 16:48:22 -0000 1.1.1.1
+++ nfsd.h 9 Apr 2002 12:44:17 -0000 1.2
@@ -57,7 +57,7 @@
char dotonly;
};
typedef int (*encode_dent_fn)(struct readdir_cd *, const char *,
- int, off_t, ino_t, unsigned int);
+ int, loff_t, ino_t, unsigned int);
typedef int (*nfsd_dirop_t)(struct inode *, struct dentry *, int, int);
/*
@@ -81,7 +81,7 @@
int nfsd_lookup(struct svc_rqst *, struct svc_fh *,
const char *, int, struct svc_fh *);
int nfsd_setattr(struct svc_rqst *, struct svc_fh *,
- struct iattr *);
+ struct iattr *, int, time_t);
int nfsd_create(struct svc_rqst *, struct svc_fh *,
char *name, int len, struct iattr *attrs,
int type, dev_t rdev, struct svc_fh *res);
@@ -143,6 +143,7 @@
#define nfserr_noent __constant_htonl(NFSERR_NOENT)
#define nfserr_io __constant_htonl(NFSERR_IO)
#define nfserr_nxio __constant_htonl(NFSERR_NXIO)
+#define nfserr_eagain __constant_htonl(NFSERR_EAGAIN)
#define nfserr_acces __constant_htonl(NFSERR_ACCES)
#define nfserr_exist __constant_htonl(NFSERR_EXIST)
#define nfserr_xdev __constant_htonl(NFSERR_XDEV)
@@ -160,14 +161,20 @@
#define nfserr_dquot __constant_htonl(NFSERR_DQUOT)
#define nfserr_stale __constant_htonl(NFSERR_STALE)
#define nfserr_remote __constant_htonl(NFSERR_REMOTE)
+#define nfserr_wflush __constant_htonl(NFSERR_WFLUSH)
#define nfserr_badhandle __constant_htonl(NFSERR_BADHANDLE)
-#define nfserr_notsync __constant_htonl(NFSERR_NOTSYNC)
-#define nfserr_badcookie __constant_htonl(NFSERR_BADCOOKIE)
+#define nfserr_notsync __constant_htonl(NFSERR_NOT_SYNC)
+#define nfserr_badcookie __constant_htonl(NFSERR_BAD_COOKIE)
#define nfserr_notsupp __constant_htonl(NFSERR_NOTSUPP)
#define nfserr_toosmall __constant_htonl(NFSERR_TOOSMALL)
#define nfserr_serverfault __constant_htonl(NFSERR_SERVERFAULT)
#define nfserr_badtype __constant_htonl(NFSERR_BADTYPE)
#define nfserr_jukebox __constant_htonl(NFSERR_JUKEBOX)
+
+/* error code for internal use - if a request fails due to
+ * kmalloc failure, it gets dropped. Client should resend eventually
+ */
+#define nfserr_dropit __constant_htonl(30000)
/* Check for dir entries '.' and '..' */
#define isdotent(n, l) (l < 3 && n[0] == '.' && (l == 1 || n[1] == '.'))
Index: nfsfh.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/linux/nfsd/nfsfh.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- nfsfh.h 14 Jan 2001 16:48:21 -0000 1.1.1.1
+++ nfsfh.h 9 Apr 2002 12:44:17 -0000 1.2
@@ -31,7 +31,7 @@
* ino/dev of the exported inode.
*/
struct nfs_fhbase_old {
- struct dentry * fb_dentry; /* dentry cookie - always 0xfeebbaca */
+ __u32 fb_dcookie; /* dentry cookie - always 0xfeebbaca */
__u32 fb_ino; /* our inode number */
__u32 fb_dirino; /* dir inode number, 0 for directories */
__u32 fb_dev; /* our device */
@@ -101,7 +101,7 @@
} fh_base;
};
-#define ofh_dcookie fh_base.fh_old.fb_dentry
+#define ofh_dcookie fh_base.fh_old.fb_dcookie
#define ofh_ino fh_base.fh_old.fb_ino
#define ofh_dirino fh_base.fh_old.fb_dirino
#define ofh_dev fh_base.fh_old.fb_dev
@@ -120,22 +120,22 @@
/*
* Conversion macros for the filehandle fields.
*/
-extern inline __u32 kdev_t_to_u32(kdev_t dev)
+static inline __u32 kdev_t_to_u32(kdev_t dev)
{
return (__u32) dev;
}
-extern inline kdev_t u32_to_kdev_t(__u32 udev)
+static inline kdev_t u32_to_kdev_t(__u32 udev)
{
return (kdev_t) udev;
}
-extern inline __u32 ino_t_to_u32(ino_t ino)
+static inline __u32 ino_t_to_u32(ino_t ino)
{
return (__u32) ino;
}
-extern inline ino_t u32_to_ino_t(__u32 uino)
+static inline ino_t u32_to_ino_t(__u32 uino)
{
return (ino_t) uino;
}
@@ -199,7 +199,7 @@
* Function prototypes
*/
u32 fh_verify(struct svc_rqst *, struct svc_fh *, int, int);
-int fh_compose(struct svc_fh *, struct svc_export *, struct dentry *);
+int fh_compose(struct svc_fh *, struct svc_export *, struct dentry *, struct svc_fh *);
int fh_update(struct svc_fh *);
void fh_put(struct svc_fh *);
Index: xdr.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/linux/nfsd/xdr.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- xdr.h 14 Jan 2001 16:48:23 -0000 1.1.1.1
+++ xdr.h 9 Apr 2002 12:44:17 -0000 1.2
@@ -151,7 +151,7 @@
int nfssvc_encode_readdirres(struct svc_rqst *, u32 *, struct nfsd_readdirres *);
int nfssvc_encode_entry(struct readdir_cd *, const char *name,
- int namlen, off_t offset, ino_t ino, unsigned int);
+ int namlen, loff_t offset, ino_t ino, unsigned int);
int nfssvc_release_fhandle(struct svc_rqst *, u32 *, struct nfsd_fhandle *);
Index: xdr3.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/linux/nfsd/xdr3.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- xdr3.h 14 Jan 2001 16:48:24 -0000 1.1.1.1
+++ xdr3.h 9 Apr 2002 12:44:17 -0000 1.2
@@ -292,10 +292,10 @@
int nfs3svc_release_fhandle2(struct svc_rqst *, u32 *,
struct nfsd3_fhandle_pair *);
int nfs3svc_encode_entry(struct readdir_cd *, const char *name,
- int namlen, off_t offset, ino_t ino,
+ int namlen, loff_t offset, ino_t ino,
unsigned int);
int nfs3svc_encode_entry_plus(struct readdir_cd *, const char *name,
- int namlen, off_t offset, ino_t ino,
+ int namlen, loff_t offset, ino_t ino,
unsigned int);
|
