diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:10:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:10:20 -0800 |
| commit | a45eec0736717ff951f93b4a30ed605a8d95a3d4 (patch) | |
| tree | e87a8026952a2ff0c3201dcf35039f61e6e41d9d /include/linux/nfsd | |
| parent | 2be208bc58825f9b71833b4a24155689bbacc7f2 (diff) | |
v2.4.8.2 -> v2.4.8.3
- Patrick Mochel: fix PCI:PCI bridge 64-bit memory type detection
- me: more forgotten nfsd off_t -> loff_t
- Alan Cox: ide driver merge
- Eric Lammerts, Rik van Riel: when oom, kill all threads.
- Ben LaHaise: use down_read, not down_write() in map_user_kiobuf.
We don't change the mappings, we just read them.
- Kai Germaschewski: ISDN updates
- Roland Fehrenbacher: sparse lun check
- Tim Waugh: handle awkward Titan parallel/serial port cards
- Stephen Rothwell: APM updates
- Anton Altaparmakov: NTFS updates
Diffstat (limited to 'include/linux/nfsd')
| -rw-r--r-- | include/linux/nfsd/nfsd.h | 2 | ||||
| -rw-r--r-- | include/linux/nfsd/xdr.h | 2 | ||||
| -rw-r--r-- | include/linux/nfsd/xdr3.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h index ed5fbc59d247..571557de8762 100644 --- a/include/linux/nfsd/nfsd.h +++ b/include/linux/nfsd/nfsd.h @@ -57,7 +57,7 @@ struct readdir_cd { 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); /* diff --git a/include/linux/nfsd/xdr.h b/include/linux/nfsd/xdr.h index 4bb4f668bf7c..5d96579529ed 100644 --- a/include/linux/nfsd/xdr.h +++ b/include/linux/nfsd/xdr.h @@ -151,7 +151,7 @@ int nfssvc_encode_statfsres(struct svc_rqst *, u32 *, struct nfsd_statfsres *); 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 *); diff --git a/include/linux/nfsd/xdr3.h b/include/linux/nfsd/xdr3.h index a5ca90410204..35d167ad6cd2 100644 --- a/include/linux/nfsd/xdr3.h +++ b/include/linux/nfsd/xdr3.h @@ -292,10 +292,10 @@ int nfs3svc_release_fhandle(struct svc_rqst *, u32 *, 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); |