fs/nfs/nfs4xdr.c  |    6 ++++++
 fs/nfs4acl/acl.c  |    4 ----
 fs/nfsd/nfs4xdr.c |    6 ++++++
 fs/nfsd/vfs.c     |    8 ++++++++
 4 files changed, 20 insertions(+), 4 deletions(-)

diff -puN fs/nfsd/vfs.c~acl_debug fs/nfsd/vfs.c
--- current/fs/nfsd/vfs.c~acl_debug	Mon Jun  2 12:54:11 2003
+++ current-marius/fs/nfsd/vfs.c	Mon Jun  2 12:54:11 2003
@@ -400,17 +400,21 @@ nfsd4_set_nfs4_acl(struct svc_rqst *rqst
 		goto out_nfserr;
 
 	if (pacl != NULL) {
+		printk("ACL_DEBUG: nfsd setting POSIX access ACL\n");
 		error = _set_nfsv4_acl_one(dentry, pacl,
 		    XATTR_NAME_ACL_ACCESS);
 		if (error < 0)
 			goto out_nfserr;
+		printk("ACL_DEBUG: nfsd set POSIX access ACL successfully\n");
 	}
 
 	if (dpacl != NULL) {
+		printk("ACL_DEBUG: nfsd setting POSIX default ACL\n");
 		error = _set_nfsv4_acl_one(dentry, dpacl,
 		    XATTR_NAME_ACL_DEFAULT);
 		if (error < 0)
 			goto out_nfserr;
+		printk("ACL_DEBUG: nfsd set POSIX default ACL successfully\n");
 	}
 
 	/* XXX MARIUS: notify change? */
@@ -471,13 +475,16 @@ nfsd4_get_nfs4_acl(struct dentry *dentry
 	int error = 0;
 	struct posix_acl *pacl, *dpacl = NULL;
 
+	printk("ACL_DEBUG: nfsd getting POSIX access ACL\n");
 	pacl = _get_posix_acl(dentry, XATTR_NAME_ACL_ACCESS);
 	if (IS_ERR(pacl)) {
 		error = PTR_ERR(pacl);
 		goto out;
 	}
+	printk("ACL_DEBUG: nfsd got POSIX access ACL successfully\n");
 
 	if (S_ISDIR(inode->i_mode)) {
+		printk("ACL_DEBUG: nfsd getting POSIX default ACL\n");
 		dpacl = _get_posix_acl(dentry, XATTR_NAME_ACL_DEFAULT);
 		if (IS_ERR(dpacl) && PTR_ERR(dpacl) == -ENODATA)
 			dpacl = NULL; 
@@ -485,6 +492,7 @@ nfsd4_get_nfs4_acl(struct dentry *dentry
 			error = PTR_ERR(dpacl);
 			goto out;
 		}
+		printk("ACL_DEBUG: nfsd got POSIX default ACL successfully\n");
 	}
 
 	*acl = nfs4_acl_posix_to_nfsv4(NULL, pacl, dpacl);
diff -puN fs/nfsd/nfs4xdr.c~acl_debug fs/nfsd/nfs4xdr.c
--- current/fs/nfsd/nfs4xdr.c~acl_debug	Mon Jun  2 12:54:11 2003
+++ current-marius/fs/nfsd/nfs4xdr.c	Mon Jun  2 12:54:11 2003
@@ -384,6 +384,9 @@ nfsd4_decode_fattr(struct nfsd4_compound
 			    ace.access_mask, (char *)p, ace.wholen);
 			p += XDR_QUADLEN(ace.wholen);
 		}
+		
+		printk("ACL_DEBUG: nfsd received ACL:\n");
+		nfs4_acl_print(*acl);
 	} else
 		*acl = NULL;
 	if (bmval[1] & FATTR4_WORD1_MODE) {
@@ -1292,6 +1295,9 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s
 			WRITEMEM(ace->who, ace->wholen);
 		}
 
+		printk("ACL_DEBUG: nfsd sent ACL:\n");
+		nfs4_acl_print(acl);
+
 	out_acl:
 	}
 	if (bmval0 & FATTR4_WORD0_ACLSUPPORT) {
diff -puN fs/nfs/nfs4xdr.c~acl_debug fs/nfs/nfs4xdr.c
--- current/fs/nfs/nfs4xdr.c~acl_debug	Mon Jun  2 12:54:11 2003
+++ current-marius/fs/nfs/nfs4xdr.c	Mon Jun  2 12:54:11 2003
@@ -337,6 +337,9 @@ encode_attrs(struct xdr_stream *xdr, str
 			WRITE32(ace->wholen);
 			WRITEMEM(ace->who, ace->wholen);
 		}
+
+		printk("ACL_DEBUG: nfs sent ACL:\n");
+		nfs4_acl_print(acl);		
 	}
 	if (iap->ia_valid & ATTR_MODE) {
 		bmval1 |= FATTR4_WORD1_MODE;
@@ -1454,6 +1457,9 @@ decode_getattr(struct xdr_stream *xdr, s
 				goto out;
 			p += XDR_QUADLEN(ace.wholen);
 		}
+
+		printk("ACL_DEBUG: nfs received ACL:\n");
+		nfs4_acl_print(acl);		
 	out_acl:
 	} else if (getattr->gt_acl != NULL)
 		*getattr->gt_acl = NULL;
diff -puN fs/nfs4acl/acl.c~acl_debug fs/nfs4acl/acl.c
--- current/fs/nfs4acl/acl.c~acl_debug	Mon Jun  2 12:54:11 2003
+++ current-marius/fs/nfs4acl/acl.c	Mon Jun  2 12:54:11 2003
@@ -843,7 +843,6 @@ nfs4_acl_print(struct nfs4_acl *acl)
 static void
 nfs4_acl_print_ace(struct nfs4_ace *ace)
 {
-#ifdef ACL_DEBUG
 	char mask[4];
 
 	mask[3] = '\0';
@@ -861,13 +860,11 @@ nfs4_acl_print_ace(struct nfs4_ace *ace)
 	printk(KERN_INFO "**\twho: %.*s\n", ace->wholen, ace->who);
 	printk(KERN_INFO "**\ttype: %x flag: %x mask: %s\n",
 	    ace->type, ace->flag, mask);
-#endif /* ACL_DEBUG */
 }
 
 static void
 nfs4_posix_acl_print(struct posix_acl *acl)
 {
-#ifdef ACL_DEBUG
 	struct posix_acl_entry *pa, *pe;
 
 	FOREACH_ACL_ENTRY(pa, acl, pe)
@@ -893,7 +890,6 @@ nfs4_posix_acl_print(struct posix_acl *a
 	    default:
 		    break;
 	    }
-#endif ACL_DEBUG
 }
 
 static struct {

_