Attachment 148491 Details for Bug 228964 – Proposed patch

[patch] Proposed patch

228964.rhel-4 (text/plain), 2.77 KB, created by Peter Staubach on 2007-02-21 15:47:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Staubach

Created: 2007-02-21 15:47:49 UTC

Size: 2.77 KB

patch

obsolete

>--- linux-2.6.9/fs/nfsd/nfs2acl.c.org
>+++ linux-2.6.9/fs/nfsd/nfs2acl.c
>@@ -35,7 +35,7 @@ static int nfsacld_proc_getacl(struct sv
> {
> 	svc_fh *fh;
> 	struct posix_acl *acl;
>-	int nfserr = 0;
>+	int nfserr;
> 
> 	dprintk("nfsd: GETACL(2acl)   %s\n", SVCFH_fmt(&argp->fh));
> 
>@@ -102,7 +102,7 @@ static int nfsacld_proc_setacl(struct sv
> 		struct nfsd_attrstat *resp)
> {
> 	svc_fh *fh;
>-	int nfserr = 0;
>+	int nfserr;
> 
> 	dprintk("nfsd: SETACL(2acl)   %s\n", SVCFH_fmt(&argp->fh));
> 
>@@ -128,7 +128,7 @@ static int nfsacld_proc_setacl(struct sv
> /*
>  * Check file attributes
>  */
>-static int nfsacld_proc_getattr(struct svc_rqst * rqstp,
>+static int nfsacld_proc_getattr(struct svc_rqst *rqstp,
> 		struct nfsd_fhandle *argp, struct nfsd_attrstat *resp)
> {
> 	dprintk("nfsd: GETATTR  %s\n", SVCFH_fmt(&argp->fh));
>@@ -140,8 +140,8 @@ static int nfsacld_proc_getattr(struct s
> /*
>  * Check file access
>  */
>-static int nfsacld_proc_access(struct svc_rqst *rqstp, struct nfsd3_accessargs *argp,
>-		struct nfsd3_accessres *resp)
>+static int nfsacld_proc_access(struct svc_rqst *rqstp,
>+		struct nfsd3_accessargs *argp, struct nfsd3_accessres *resp)
> {
> 	int nfserr;
> 
>@@ -152,7 +152,7 @@ static int nfsacld_proc_access(struct sv
> 	fh_copy(&resp->fh, &argp->fh);
> 	resp->access = argp->access;
> 	nfserr = nfsd_access(rqstp, &resp->fh, &resp->access, NULL);
>-	return nfserr;
>+	RETURN_STATUS(nfserr);
> }
> 
> /*
>@@ -287,8 +287,15 @@ static int nfsaclsvc_release_getacl(stru
> 	return 1;
> }
> 
>-static int nfsaclsvc_release_fhandle(struct svc_rqst *rqstp, u32 *p,
>-		struct nfsd_fhandle *resp)
>+static int nfsaclsvc_release_attrstat(struct svc_rqst *rqstp, u32 *p,
>+		struct nfsd_attrstat *resp)
>+{
>+	fh_put(&resp->fh);
>+	return 1;
>+}
>+
>+static int nfsaclsvc_release_access(struct svc_rqst *rqstp, u32 *p,
>+		struct nfsd3_accessres *resp)
> {
> 	fh_put(&resp->fh);
> 	return 1;
>@@ -315,16 +322,15 @@ struct nfsd3_voidargs { int dummy; };
>  }
> 
> #define ST 1		/* status*/
>-#define AT 21		/* attributes */
>-#define pAT (1+AT)	/* post attributes - conditional */
>+#define AT 17		/* attributes */
> #define ACL (1+NFS_ACL_MAX_ENTRIES*3)  /* Access Control List */
> 
> static struct svc_procedure		nfsd_acl_procedures2[] = {
>   PROC(null,	void,		void,		void,	  RC_NOCACHE, ST),
>-  PROC(getacl,	getacl,		getacl,		getacl,	  RC_NOCACHE, ST+1+2*(1+ACL)),
>-  PROC(setacl,	setacl,		attrstat,	fhandle,  RC_NOCACHE, ST+AT),
>-  PROC(getattr, fhandle,	attrstat,	fhandle,  RC_NOCACHE, ST+AT),
>-  PROC(access,	access,		access,		fhandle,  RC_NOCACHE, ST+AT+1),
>+  PROC(getacl,	getacl,		getacl,		getacl,	  RC_NOCACHE, ST+AT+1+2*(1+ACL)),
>+  PROC(setacl,	setacl,		attrstat,	attrstat,  RC_NOCACHE, ST+AT),
>+  PROC(getattr, fhandle,	attrstat,	attrstat,  RC_NOCACHE, ST+AT),
>+  PROC(access,	access,		access,		access,  RC_NOCACHE, ST+AT+1),
> };
> 
> struct svc_version	nfsd_acl_version2 = {

Actions: View | Diff

Attachments on bug 228964: 148437 | 148491