knfsd: fixes and enhancements for 2.6.21
Subsystems (3)
PATCH 1/1 knfsd: fixes and enhancements for 2.6.21
Following are 4 patchs from knfsd suitable for 2.6.21.
Numbers 3 and 4 provide new usability features that require a new nfs-utils to make full use of (all nfs-utils will ofcourse continue to work providing the functionality it always provided).
(3) allows a 16 byte uuid to be used to identify the filesystem rather than the device id (which is volatile) or a 32bit number (which has to be managed manually). nfs-utils used libblkid to extract a uuid from most filesystems. (Thanks Trond for reviewing this code - I hope you like the changes).
(4) allows an upcall to be made to map a 'uid' to a list of 'gids'. The AUTH_UNIX authentication protocol only carries 16 group ids which causes problems for people with more than 16 group ids.
[PATCH 001 of 4] knfsd: Fix return value for writes to some files in 'nfsd' filesystem. [PATCH 002 of 4] knfsd: Tidy up choice of filesystem-identifier when creating a filehandle. [PATCH 003 of 4] knfsd: Add some new fsid types.
[PATCH 004 of 4] knfsd: Allow the server to provide a gid list when using AUTH_UNIX authentication.
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier. Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs
PATCH 1/1 knfsd: Fix return value for writes to some files in 'nfsd' filesystem.
Most files in the 'nfsd' filesystem are transactional. When you write, a reply is generated that can be read back only on the same 'file'.
If the reply has zero length, the 'write' will incorrectly return a value of '0' instead of the length that was written. This causes 'rpc.nfsd' to give an annoying warning.
This patch fixes the test.
### Diffstat output
./fs/nfsd/nfsctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfsd/nfsctl.c +1 -1
@@ -123,7 +123,7 @@ static ssize_t nfsctl_transaction_write(return PTR_ERR (data); rv = write_op[ino](file, data, size); -if (rv>0 ) { +if (rv >=0 ) {simple_transaction_set (file, rv); rv = size; }
PATCH 1/1 knfsd: Add some new fsid types.
In reply to NeilBrownAdd support for using a filesystem UUID to identify and export point in the filehandle.
For NFSv2, this UUID is xor-ed down to 4 or 8 bytes so that it doesn't take up too much room. For NFSv3+, we use the full 16 bytes, and possibly also a 64bit inode number for exports beneath the root of a filesystem.
When generating an fsid to return in 'stat' information, use the UUID (hashed down to size) if it is available and a small 'fsid' was not specifically provided.
### Diffstat output
./fs/nfsd/export.c | 106 +++++++++++++++++++++++++++-------------- ./fs/nfsd/nfs3xdr.c | 31 +++++++++--- ./fs/nfsd/nfs4xdr.c | 10 +++ ./fs/nfsd/nfsfh.c | 88 ++++++++++++++++++---------------- ./fs/nfsd/nfsxdr.c | 19 ++++++- ./include/linux/nfsd/export.h | 7 +- ./include/linux/nfsd/nfsd.h | 12 ---- ./include/linux/nfsd/nfsfh.h | 107 +++++++++++++++++++++++++++++++----------- 8 files changed, 246 insertions(+), 134 deletions(-)
fs/nfsd/export.c +69 -37
@@ -189,18 +189,17 @@ static int expkey_show(struct seq_file * struct cache_head *h) {struct svc_expkey *ek ; +int i;if (h ==NULL ) {seq_puts (m,"#domain fsidtype fsid [path]\n" );return 0 ; } ek = container_of(h, struct svc_expkey, h); -seq_printf (m,"%s %d 0x%08x" , ek->ek_client->name, - ek->ek_fsidtype, ek->ek_fsid[0 ]); -if (ek->ek_fsidtype !=1 ) -seq_printf (m,"%08x" , ek->ek_fsid[1 ]); -if (ek->ek_fsidtype ==2 ) -seq_printf (m,"%08x" , ek->ek_fsid[2 ]); +seq_printf (m,"%s %d 0x" , ek->ek_client->name, + ek->ek_fsidtype); +for (i=0 ; i <key_len (ek->ek_fsidtype)/4 ; i++) +seq_printf (m,"%08x" , ek->ek_fsid[i]);if (test_bit (CACHE_VALID , &h->flags) && !test_bit (CACHE_NEGATIVE , &h->flags)) {seq_printf (m," " );
@@ -231,9 +230,8 @@ static inline void expkey_init(struct cakref_get (&item->ek_client->ref); new->ek_client = item->ek_client; new->ek_fsidtype = item->ek_fsidtype; - new->ek_fsid[0 ] = item->ek_fsid[0 ]; - new->ek_fsid[1 ] = item->ek_fsid[1 ]; - new->ek_fsid[2 ] = item->ek_fsid[2 ]; + +memcpy (new->ek_fsid, item->ek_fsid,sizeof (new->ek_fsid)); } static inline void expkey_update(struct cache_head *cnew,
@@ -362,7 +360,7 @@ static struct svc_export *svc_export_upd struct svc_export *old);static struct svc_export *svc_export_lookup (struct svc_export *); -static int check_export (struct inode *inode,int flags) +static int check_export (struct inode *inode,int flags,unsigned char *uuid) {/* We currently export only dirs and regular files.
@@ -375,12 +373,13 @@ static int check_export(struct inode *in/* There are two requirements on a filesystem to be exportable. * 1: We must be able to identify the filesystem from a number. * either a device number (so FS_REQUIRES_DEV needed) -* or an FSID number (so NFSEXP_FSID needed). +* or an FSID number (so NFSEXP_FSID or ->uuid is needed). * 2: We must be able to find an inode from a filehandle. * This means that s_export_op must be set. */ if (!(inode->i_sb->s_type->fs_flags &FS_REQUIRES_DEV ) && - !(flags &NFSEXP_FSID )) { + !(flags &NFSEXP_FSID ) && + uuid ==NULL ) {dprintk ("exp_export: export of non-dev fs without fsid\n" );return -EINVAL ; }
@@ -405,10 +404,6 @@ fsloc_parse(char **mesg, char *buf, struint len;int migrated, i, err; - len =qword_get (mesg, buf,PAGE_SIZE ); -if (len !=5 ||memcmp (buf,"fsloc" ,5 )) -return 0 ; -/* listsize */ err =get_int (mesg, &fsloc->locations_count);if (err)
@@ -519,6 +514,8 @@ static int svc_export_parse(struct cache exp.ex_fslocs.locations_count =0 ; exp.ex_fslocs.migrated =0 ; + exp.ex_uuid =NULL ; +/* flags */ err =get_int (&mesg, &an_int);if (err == -ENOENT )
@@ -542,12 +539,33 @@ static int svc_export_parse(struct cacheif (err) goto out; exp.ex_fsid = an_int; - err =check_export (nd.dentry->d_inode, exp.ex_flags); -if (err) goto out; +while ((len =qword_get (&mesg, buf,PAGE_SIZE )) >0 ) { +if (strcmp (buf,"fsloc" ) ==0 ) + err =fsloc_parse (&mesg, buf, &exp.ex_fslocs); +else if (strcmp (buf,"uuid" ) ==0 ) { +/* expect a 16 byte uuid encoded as \xXXXX... */ + len =qword_get (&mesg, buf,PAGE_SIZE ); +if (len !=16 ) + err = -EINVAL ; +else { + exp.ex_uuid = +kmemdup (buf,16 ,GFP_KERNEL ); +if (exp.ex_uuid ==NULL ) + err = -ENOMEM ; + } + }else +/* quietly ignore unknown words and anything +* following. Newer user-space can try to set +* new values, then see what the result was. +*/ +break ; +if (err) + goto out; + } - err =fsloc_parse (&mesg, buf, &exp.ex_fslocs); -if (err) - goto out; + err =check_export (nd.dentry->d_inode, exp.ex_flags, + exp.ex_uuid); +if (err) goto out; } expp =svc_export_lookup (&exp);
@@ -561,6 +579,8 @@ static int svc_export_parse(struct cacheelse exp_put (expp); out: +nfsd4_fslocs_free (&exp.ex_fslocs); +kfree (exp.ex_uuid);kfree (exp.ex_path);if (nd.dentry)path_release (&nd);
@@ -590,9 +610,19 @@ static int svc_export_show(struct seq_fiseq_escape (m, exp->ex_client->name," \t\n\\" );seq_putc (m,'(' );if (test_bit (CACHE_VALID , &h->flags) && - !test_bit (CACHE_NEGATIVE , &h->flags)) + !test_bit (CACHE_NEGATIVE , &h->flags)) {exp_flags (m, exp->ex_flags, exp->ex_fsid, exp->ex_anon_uid, exp->ex_anon_gid, &exp->ex_fslocs); +if (exp->ex_uuid) { +int i; +seq_puts (m,",uuid=" ); +for (i=0 ; i<16 ; i++) { +if ((i&3 ) ==0 && i) +seq_putc (m,':' ); +seq_printf (m,"%02x" , exp->ex_uuid[i]); + } + } + }seq_puts (m,")\n" );return 0 ; }
@@ -629,6 +659,8 @@ static void export_update(struct cache_h new->ex_anon_uid = item->ex_anon_uid; new->ex_anon_gid = item->ex_anon_gid; new->ex_fsid = item->ex_fsid; + new->ex_uuid = item->ex_uuid; + item->ex_uuid =NULL ; new->ex_path = item->ex_path; item->ex_path =NULL ; new->ex_fslocs.locations = item->ex_fslocs.locations;
@@ -751,11 +783,11 @@ exp_get_key(svc_client *clp, dev_t dev,u32 fsidv[3 ];if (old_valid_dev (dev)) { -mk_fsid_v0 (fsidv, dev, ino); -return exp_find_key (clp,0 , fsidv,NULL ); +mk_fsid (FSID_DEV , fsidv, dev, ino,0 ,NULL ); +return exp_find_key (clp,FSID_DEV , fsidv,NULL ); } -mk_fsid_v3 (fsidv, dev, ino); -return exp_find_key (clp,3 , fsidv,NULL ); +mk_fsid (FSID_ENCODE_DEV , fsidv, dev, ino,0 ,NULL ); +return exp_find_key (clp,FSID_ENCODE_DEV , fsidv,NULL ); }/*
@@ -766,9 +798,9 @@ exp_get_fsid_key(svc_client *clp, int fs {u32 fsidv[2 ]; -mk_fsid_v1 (fsidv, fsid); +mk_fsid (FSID_NUM , fsidv,0 ,0 , fsid,NULL ); -return exp_find_key (clp,1 , fsidv,NULL ); +return exp_find_key (clp,FSID_NUM , fsidv,NULL ); } svc_export *
@@ -882,8 +914,8 @@ static int exp_fsid_hash(svc_client *clpif ((exp->ex_flags &NFSEXP_FSID ) ==0 )return 0 ; -mk_fsid_v1 (fsid, exp->ex_fsid); -return exp_set_key (clp,1 , fsid, exp); +mk_fsid (FSID_NUM , fsid,0 ,0 , exp->ex_fsid,NULL ); +return exp_set_key (clp,FSID_NUM , fsid, exp); }static int exp_hash (struct auth_domain *clp,struct svc_export *exp)
@@ -893,11 +925,11 @@ static int exp_hash(struct auth_domain *dev_t dev = inode->i_sb->s_dev;if (old_valid_dev (dev)) { -mk_fsid_v0 (fsid, dev, inode->i_ino); -return exp_set_key (clp,0 , fsid, exp); +mk_fsid (FSID_DEV , fsid, dev, inode->i_ino,0 ,NULL ); +return exp_set_key (clp,FSID_DEV , fsid, exp); } -mk_fsid_v3 (fsid, dev, inode->i_ino); -return exp_set_key (clp,3 , fsid, exp); +mk_fsid (FSID_ENCODE_DEV , fsid, dev, inode->i_ino,0 ,NULL ); +return exp_set_key (clp,FSID_ENCODE_DEV , fsid, exp); }static void exp_unhash (struct svc_export *exp)
@@ -976,7 +1008,7 @@ exp_export(struct nfsctl_export *nxp) goto finish; } - err =check_export (nd.dentry->d_inode, nxp->ex_flags); + err =check_export (nd.dentry->d_inode, nxp->ex_flags,NULL );if (err) goto finish; err = -ENOMEM ;
@@ -1169,9 +1201,9 @@ exp_pseudoroot(struct auth_domain *clp,__be32 rv;u32 fsidv[2 ]; -mk_fsid_v1 (fsidv,0 ); +mk_fsid (FSID_NUM , fsidv,0 ,0 ,0 ,NULL ); - exp =exp_find (clp,1 , fsidv, creq); + exp =exp_find (clp,FSID_NUM , fsidv, creq);if (IS_ERR (exp))return nfserrno (PTR_ERR (exp));if (exp ==NULL )
fs/nfsd/nfs3xdr.c +23 -8
@@ -149,6 +149,27 @@ decode_sattr3(__be32 *p, struct iattr *ireturn p; } +static __be32 *encode_fsid (__be32 *p,struct svc_fh *fhp) +{ +u64 f; +switch (fsid_source (fhp)) { +default : +case FSIDSOURCE_DEV : + p =xdr_encode_hyper (p, (u64 )huge_encode_dev + (fhp->fh_dentry->d_inode->i_sb->s_dev)); +break ; +case FSIDSOURCE_FSID : + p =xdr_encode_hyper (p, (u64 ) fhp->fh_export->ex_fsid); +break ; +case FSIDSOURCE_UUID : + f = ((u64 *)fhp->fh_export->ex_uuid)[0 ]; + f ^= ((u64 *)fhp->fh_export->ex_uuid)[1 ]; + p =xdr_encode_hyper (p, f); +break ; + } +return p; +} +static __be32 *encode_fattr3 (struct svc_rqst *rqstp,__be32 *p,struct svc_fh *fhp,struct kstat *stat)
@@ -169,10 +190,7 @@ encode_fattr3(struct svc_rqst *rqstp, __ p =xdr_encode_hyper (p, ((u64 )stat->blocks) <<9 ); *p++ =htonl ((u32 )MAJOR (stat->rdev)); *p++ =htonl ((u32 )MINOR (stat->rdev)); -if (is_fsid (fhp, rqstp->rq_reffh)) - p =xdr_encode_hyper (p, (u64 ) fhp->fh_export->ex_fsid); -else - p =xdr_encode_hyper (p, (u64 )huge_encode_dev (stat->dev)); + p =encode_fsid (p, fhp); p =xdr_encode_hyper (p, (u64 ) stat->ino); p =encode_time3 (p, &stat->atime);lease_get_mtime (dentry->d_inode, &time);
@@ -203,10 +221,7 @@ encode_saved_post_attr(struct svc_rqst * p =xdr_encode_hyper (p, ((u64 )fhp->fh_post_blocks) <<9 ); *p++ = fhp->fh_post_rdev[0 ]; *p++ = fhp->fh_post_rdev[1 ]; -if (is_fsid (fhp, rqstp->rq_reffh)) - p =xdr_encode_hyper (p, (u64 ) fhp->fh_export->ex_fsid); -else - p =xdr_encode_hyper (p, (u64 )huge_encode_dev (inode->i_sb->s_dev)); + p =encode_fsid (p, fhp); p =xdr_encode_hyper (p, (u64 ) inode->i_ino); p =encode_time3 (p, &fhp->fh_post_atime); p =encode_time3 (p, &fhp->fh_post_mtime);
fs/nfsd/nfs4xdr.c +8 -2
@@ -1563,14 +1563,20 @@ nfsd4_encode_fattr(struct svc_fh *fhp, sif (exp->ex_fslocs.migrated) {WRITE64 (NFS4_REFERRAL_FSID_MAJOR );WRITE64 (NFS4_REFERRAL_FSID_MINOR ); - }else if (is_fsid (fhp, rqstp->rq_reffh)) { + }else switch (fsid_source (fhp)) { +case FSIDSOURCE_FSID :WRITE64 ((u64 )exp->ex_fsid);WRITE64 ((u64 )0 ); - }else { +break ; +case FSIDSOURCE_DEV :WRITE32 (0 );WRITE32 (MAJOR (stat.dev));WRITE32 (0 );WRITE32 (MINOR (stat.dev)); +break ; +case FSIDSOURCE_UUID : +WRITEMEM (exp->ex_uuid,16 ); +break ; } }if (bmval0 &FATTR4_WORD0_UNIQUE_HANDLES ) {
fs/nfsd/nfsfh.c +46 -42
137 lines not on this page · raw message
fs/nfsd/nfsxdr.c +16 -3
@@ -153,6 +153,7 @@ encode_fattr(struct svc_rqst *rqstp, __bstruct dentry *dentry = fhp->fh_dentry;int type;struct timespec time; +u32 f; type = (stat->mode &S_IFMT );
@@ -173,10 +174,22 @@ encode_fattr(struct svc_rqst *rqstp, __belse *p++ =htonl (0xffffffff ); *p++ =htonl ((u32 ) stat->blocks); -if (is_fsid (fhp, rqstp->rq_reffh)) - *p++ =htonl ((u32 ) fhp->fh_export->ex_fsid); -else +switch (fsid_source (fhp)) { +default : +case FSIDSOURCE_DEV : *p++ =htonl (new_encode_dev (stat->dev)); +break ; +case FSIDSOURCE_FSID : + *p++ =htonl ((u32 ) fhp->fh_export->ex_fsid); +break ; +case FSIDSOURCE_UUID : + f = ((u32 *)fhp->fh_export->ex_uuid)[0 ]; + f ^= ((u32 *)fhp->fh_export->ex_uuid)[1 ]; + f ^= ((u32 *)fhp->fh_export->ex_uuid)[2 ]; + f ^= ((u32 *)fhp->fh_export->ex_uuid)[3 ]; + *p++ =htonl (f); +break ; + } *p++ =htonl ((u32 ) stat->ino); *p++ =htonl ((u32 ) stat->atime.tv_sec); *p++ =htonl (stat->atime.tv_nsec ? stat->atime.tv_nsec /1000 :0 );
include/linux/nfsd/export.h +4 -3
@@ -74,19 +74,20 @@ struct svc_export {uid_t ex_anon_uid;gid_t ex_anon_gid;int ex_fsid; +unsigned char * ex_uuid;/* 16 byte fsid */ struct nfsd4_fs_locations ex_fslocs; };/* an "export key" (expkey) maps a filehandlefragement to an -* svc_export for a given client. There can be two per export, one -* for type 0 (dev/ino), one for type 1 (fsid) +* svc_export for a given client. There can be several per export, +* for the different fsid types. */ struct svc_expkey {struct cache_head h;struct auth_domain * ek_client;int ek_fsidtype; -u32 ek_fsid[3 ]; +u32 ek_fsid[6 ];struct vfsmount * ek_mnt;struct dentry * ek_dentry;
include/linux/nfsd/nfsd.h +0 -12
@@ -254,18 +254,6 @@ void nfsd_lockd_shutdown(void);*/ extern struct timeval nfssvc_boot; -static inline int is_fsid (struct svc_fh *fh,struct knfsd_fh *reffh) -{ -if (fh->fh_export->ex_flags &NFSEXP_FSID ) { -struct vfsmount *mnt = fh->fh_export->ex_mnt; -if (!old_valid_dev (mnt->mnt_sb->s_dev) || - (reffh->fh_version ==1 && reffh->fh_fsid_type ==1 )) -return 1 ; - } -return 0 ; -} - -#ifdef CONFIG_NFSD_V4 /* before processing a COMPOUND operation, we have to check that there
include/linux/nfsd/nfsfh.h +80 -27
118 lines not on this page · raw message
PATCH 1/1 knfsd: Allow the server to provide a gid list when using AUTH_UNIX authentication.
In reply to NeilBrownAUTH_UNIX authentication (the standard with NFS) has a limit of 16 groups ids. This causes problems for people in more than 16 groups.
So allow the server to map a uid into a list of group ids based on local knowledge rather depending on the (possibly truncated) list from the client.
If there is no process on the server responding to upcalls, the gidlist in the request will still be used.
### Diffstat output
./net/sunrpc/sunrpc_syms.c | 5 ./net/sunrpc/svcauth_unix.c | 225 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 224 insertions(+), 6 deletions(-)
net/sunrpc/sunrpc_syms.c +4 -1
@@ -136,7 +136,7 @@ EXPORT_SYMBOL(nlm_debug);extern int register_rpc_pipefs (void );extern void unregister_rpc_pipefs (void ); -extern struct cache_detail ip_map_cache; +extern struct cache_detail ip_map_cache, unix_gid_cache;extern int init_socket_xprt (void );extern void cleanup_socket_xprt (void );
@@ -156,6 +156,7 @@ init_sunrpc(void)rpc_proc_init ();#endif cache_register (&ip_map_cache); +cache_register (&unix_gid_cache);init_socket_xprt (); out:return err;
@@ -169,6 +170,8 @@ cleanup_sunrpc(void)rpc_destroy_mempool ();if (cache_unregister (&ip_map_cache))printk (KERN_ERR "sunrpc: failed to unregister ip_map cache\n" ); +if (cache_unregister (&unix_gid_cache)) +printk (KERN_ERR "sunrpc: failed to unregister unix_gid cache\n" );#ifdef RPC_DEBUG rpc_unregister_sysctl ();#endif
net/sunrpc/svcauth_unix.c +220 -5
238 lines not on this page · raw message
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier. Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs
PATCH 1/1 knfsd: Tidy up choice of filesystem-identifier when creating a filehandle.
In reply to NeilBrownIf we are using the same version/fsid as a current filehandle, then there is no need to verify the the numbers are valid for this export, and they must be (we used them to find this export).
This allows us to simplify the fsid selection code.
Also change "ref_fh_version" and "ref_fh_fsid_type" to "version" and "fsid_type", as the important thing isn't that they are the version/type of the reference filehandle, but they are the chosen type for the new filehandle.
And tidy up some indenting.
### Diffstat output
./fs/nfsd/nfsfh.c | 124 ++++++++++++++++++++++++++---------------------------- 1 file changed, 60 insertions(+), 64 deletions(-)
fs/nfsd/nfsfh.c +60 -64
@@ -211,7 +211,7 @@ fh_verify(struct svc_rqst *rqstp, struct fileid_type =2 ; }else fileid_type = fh->fh_fileid_type; - +if (fileid_type ==0 ) dentry =dget (exp->ex_dentry);else {
@@ -291,7 +291,7 @@ static inline int _fh_update(struct dent __u32 *datap, int *maxsize) {struct export_operations *nop = exp->ex_mnt->mnt_sb->s_export_op; - +if (dentry == exp->ex_dentry) { *maxsize =0 ;return 0 ;
@@ -316,7 +316,8 @@ static inline void _fh_update_old(struct }__be32 -fh_compose (struct svc_fh *fhp,struct svc_export *exp,struct dentry *dentry,struct svc_fh *ref_fh) +fh_compose (struct svc_fh *fhp,struct svc_export *exp,struct dentry *dentry, +struct svc_fh *ref_fh) {/* ref_fh is a reference file handle. * if it is non-null and for the same filesystem, then we should compose
@@ -326,8 +327,8 @@ fh_compose(struct svc_fh *fhp, struct sv* */ -u8 ref_fh_version =0 ; -u8 ref_fh_fsid_type =0 ; +u8 version =1 ; +u8 fsid_type =0 ;struct inode * inode = dentry->d_inode;struct dentry *parent = dentry->d_parent;__u32 *datap;
@@ -339,57 +340,52 @@ fh_compose(struct svc_fh *fhp, struct sv parent->d_name.name, dentry->d_name.name, (inode ? inode->i_ino : 0)); +/* Choose filehandle version and fsid type based on +* the reference filehandle (if it is in the same export) +* or the export options. +*/ if (ref_fh && ref_fh->fh_export == exp) { - ref_fh_version = ref_fh->fh_handle.fh_version; -if (ref_fh_version ==0xca ) - ref_fh_fsid_type =0 ; + version = ref_fh->fh_handle.fh_version; +if (version ==0xca ) + fsid_type =0 ;else - ref_fh_fsid_type = ref_fh->fh_handle.fh_fsid_type; -if (ref_fh_fsid_type >3 ) - ref_fh_fsid_type =0 ; - -/* make sure ref_fh type works for given export */ -if (ref_fh_fsid_type ==1 && - !(exp->ex_flags &NFSEXP_FSID )) { -/* if we don't have an fsid, we cannot provide one... */ - ref_fh_fsid_type =0 ; - } + fsid_type = ref_fh->fh_handle.fh_fsid_type; +/* We know this version/type works for this export +* so there is no need for further checks. +*/ }else if (exp->ex_flags &NFSEXP_FSID ) - ref_fh_fsid_type =1 ; - -if (!old_valid_dev (ex_dev) && ref_fh_fsid_type ==0 ) { + fsid_type =1 ; +else if (!old_valid_dev (ex_dev))/* for newer device numbers, we must use a newer fsid format */ - ref_fh_version =1 ; - ref_fh_fsid_type =3 ; - } -if (old_valid_dev (ex_dev) && - (ref_fh_fsid_type ==2 || ref_fh_fsid_type ==3 )) -/* must use type1 for smaller device numbers */ - ref_fh_fsid_type =0 ; + fsid_type =3 ; +else + fsid_type =0 ;if (ref_fh == fhp)fh_put (ref_fh);if (fhp->fh_locked || fhp->fh_dentry) {printk (KERN_ERR "fh_compose: fh %s/%s not initialized!\n" , - parent->d_name.name, dentry->d_name.name); + parent->d_name.name, dentry->d_name.name); }if (fhp->fh_maxsize <NFS_FHSIZE )printk (KERN_ERR "fh_compose: called with maxsize %d! %s/%s\n" , - fhp->fh_maxsize, parent->d_name.name, dentry->d_name.name); + fhp->fh_maxsize, + parent->d_name.name, dentry->d_name.name); fhp->fh_dentry =dget (dentry);/* our internal copy */ fhp->fh_export = exp;cache_get (&exp->h); -if (ref_fh_version ==0xca ) { +if (version ==0xca ) {/* old style filehandle please */ memset (&fhp->fh_handle.fh_base,0 ,NFS_FHSIZE ); fhp->fh_handle.fh_size =NFS_FHSIZE ; fhp->fh_handle.ofh_dcookie =0xfeebbaca ; fhp->fh_handle.ofh_dev =old_encode_dev (ex_dev); fhp->fh_handle.ofh_xdev = fhp->fh_handle.ofh_dev; - fhp->fh_handle.ofh_xino =ino_t_to_u32 (exp->ex_dentry->d_inode->i_ino); + fhp->fh_handle.ofh_xino = +ino_t_to_u32 (exp->ex_dentry->d_inode->i_ino); fhp->fh_handle.ofh_dirino =ino_t_to_u32 (parent_ino (dentry));if (inode)_fh_update_old (dentry, exp, &fhp->fh_handle);
@@ -398,38 +394,38 @@ fh_compose(struct svc_fh *fhp, struct sv fhp->fh_handle.fh_version =1 ; fhp->fh_handle.fh_auth_type =0 ; datap = fhp->fh_handle.fh_auth+0 ; - fhp->fh_handle.fh_fsid_type = ref_fh_fsid_type; -switch (ref_fh_fsid_type) { -case 0 : -/* -* fsid_type 0: -* 2byte major, 2byte minor, 4byte inode -*/ -mk_fsid_v0 (datap, ex_dev, - exp->ex_dentry->d_inode->i_ino); -break ; -case 1 : -/* fsid_type 1 == 4 bytes filesystem id */ -mk_fsid_v1 (datap, exp->ex_fsid); -break ; -case 2 : -/* -* fsid_type 2: -* 4byte major, 4byte minor, 4byte inode -*/ -mk_fsid_v2 (datap, ex_dev, - exp->ex_dentry->d_inode->i_ino); -break ; -case 3 : -/* -* fsid_type 3: -* 4byte devicenumber, 4byte inode -*/ -mk_fsid_v3 (datap, ex_dev, - exp->ex_dentry->d_inode->i_ino); -break ; + fhp->fh_handle.fh_fsid_type = fsid_type; +switch (fsid_type) { +case 0 : +/* +* fsid_type 0: +* 2byte major, 2byte minor, 4byte inode +*/ +mk_fsid_v0 (datap, ex_dev, + exp->ex_dentry->d_inode->i_ino); +break ; +case 1 : +/* fsid_type 1 == 4 bytes filesystem id */ +mk_fsid_v1 (datap, exp->ex_fsid); +break ; +case 2 : +/* +* fsid_type 2: +* 4byte major, 4byte minor, 4byte inode +*/ +mk_fsid_v2 (datap, ex_dev, + exp->ex_dentry->d_inode->i_ino); +break ; +case 3 : +/* +* fsid_type 3: +* 4byte devicenumber, 4byte inode +*/ +mk_fsid_v3 (datap, ex_dev, + exp->ex_dentry->d_inode->i_ino); +break ; } - len =key_len (ref_fh_fsid_type); + len =key_len (fsid_type); datap += len/4 ; fhp->fh_handle.fh_size =4 + len;
@@ -456,7 +452,7 @@ fh_update(struct svc_fh *fhp) {struct dentry *dentry;__u32 *datap; - +if (!fhp->fh_dentry) goto out_bad;
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier. Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs