PERFORCE change 147213 for review

[Edward Tomasz Napierala]

http://perforce.freebsd.org/chv.cgi?CH=147213

Change 147213 by trasz at trasz_traszkan on 2008/08/12 07:05:16

	Improve diagnostics when reading ACL fails.  Not tested yet.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_acl.c#9 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_acl.c#9 (text+ko) ====

@@ -53,6 +53,7 @@
 #include <ufs/ufs/dir.h>
 #include <ufs/ufs/ufsmount.h>
 #include <ufs/ufs/ufs_extern.h>
+#include <ufs/ffs/fs.h>
 
 #ifdef UFS_ACL
 
@@ -179,21 +180,26 @@
 		 * are unsafe.
 		 */
 		printf("ufs_getacl_nfs4(): Loaded invalid ACL ("
-		    "%d bytes)\n", len);
+		    "%d bytes), inumber %d on %s\n", len,
+		    ip->i_number, ip->i_fs->fs_fsmnt);
 
 		return (EPERM);
 	}
 
 	if (ap->a_aclp->acl_magic != ACL_MAGIC) {
 		printf("ufs_getacl_nfs4(): Loaded invalid ACL "
-		    "(wrong acl_magic: 0x%x)\n", ap->a_aclp->acl_magic);
+		    "(wrong acl_magic: 0x%x), inumber %d on %s\n",
+		    ap->a_aclp->acl_magic,
+		    ip->i_number, ip->i_fs->fs_fsmnt);
 		
 		return (EPERM);
 	}
 
 	if (ap->a_aclp->acl_cnt > ap->a_aclp->acl_length) {
 		printf("ufs_getacl_nfs4(): Loaded invalid ACL "
-		    "(wrong acl_cnt: %c)\n", ap->a_aclp->acl_cnt);
+		    "(wrong acl_cnt: %c), inumber %d on %s\n",
+		    ap->a_aclp->acl_cnt,
+		    ip->i_number, ip->i_fs->fs_fsmnt);
 
 		return (EPERM);
 	}
@@ -278,7 +284,8 @@
 				 * are unsafe.
 				 */
 				printf("ufs_getacl_posix1e(): Loaded invalid "
-				    "ACL (%d bytes)\n", len);
+				    "ACL (%d bytes), inumber %d on %s\n", len,
+				    ip->i_number, ip->i_fs->fs_fsmnt);
 				return (EPERM);
 			}
 
@@ -329,7 +336,8 @@
 				 * protections are unsafe.
 				 */
 				printf("ufs_getacl(): Loaded invalid ACL ("
-				    "%d bytes)\n", len);
+				    "%d bytes), inumber %d on %s\n", len,
+				    ip->i_number, ip->i_fs->fs_fsmnt);
 				return (EPERM);
 			}
 			break;