Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit

Pull audit fix from Paul Moore:
 "Just one patch from the audit tree for v3.20, and a very minor one at
  that.

  The patch simply removes an old, unused field from the audit_krule
  structure, a private audit-only struct.  In audit related news, we did
  a proper overhaul of the audit pathname code and removed the nasty
  getname()/putname() hacks for audit, you should see those patches in
  Al's vfs tree if you haven't already.

  That's it for audit this time, let's hope for a quiet -rcX series"

* 'upstream' of git://git.infradead.org/users/pcmoore/audit:
  audit: remove vestiges of vers_ops

diff --git a/include/linux/audit.h b/include/linux/audit.h
index af84234..599f3bd 100644 (file)
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -46,7 +46,6 @@ struct audit_tree;
 struct sk_buff;
 
 struct audit_krule {
-       int                     vers_ops;
        u32                     pflags;
        u32                     flags;
        u32                     listnr;

diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index 4f68a32..72e1660 100644 (file)
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -425,7 +425,6 @@ static struct audit_entry *audit_data_to_entry(struct audit_rule_data *data,
                goto exit_nofree;
 
        bufp = data->buf;
-       entry->rule.vers_ops = 2;
        for (i = 0; i < data->field_count; i++) {
                struct audit_field *f = &entry->rule.fields[i];
 
@@ -758,7 +757,6 @@ struct audit_entry *audit_dupe_rule(struct audit_krule *old)
                return ERR_PTR(-ENOMEM);
 
        new = &entry->rule;
-       new->vers_ops = old->vers_ops;
        new->flags = old->flags;
        new->pflags = old->pflags;
        new->listnr = old->listnr;