Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into for...
authorJames Morris <jmorris@namei.org>
Thu, 12 May 2011 23:52:16 +0000 (09:52 +1000)
committerJames Morris <jmorris@namei.org>
Thu, 12 May 2011 23:52:16 +0000 (09:52 +1000)
security/selinux/ss/policydb.c

index e6e7ce0..7102457 100644 (file)
@@ -1819,8 +1819,6 @@ static int filename_trans_read(struct policydb *p, void *fp)
                goto out;
        nel = le32_to_cpu(buf[0]);
 
-       printk(KERN_ERR "%s: nel=%d\n", __func__, nel);
-
        last = p->filename_trans;
        while (last && last->next)
                last = last->next;
@@ -1857,8 +1855,6 @@ static int filename_trans_read(struct policydb *p, void *fp)
                        goto out;
                name[len] = 0;
 
-               printk(KERN_ERR "%s: ft=%p ft->name=%p ft->name=%s\n", __func__, ft, ft->name, ft->name);
-
                rc = next_entry(buf, fp, sizeof(u32) * 4);
                if (rc)
                        goto out;