b=7391

lctl fix for setattr
remove unused symlink opcode

diff --git a/lustre/include/linux/lustre_audit.h b/lustre/include/linux/lustre_audit.h
index be74c17..05c8153 100644 (file)
--- a/lustre/include/linux/lustre_audit.h
+++ b/lustre/include/linux/lustre_audit.h
@@ -39,7 +39,6 @@ typedef enum {
         AUDIT_CREATE,
         AUDIT_LINK,
         AUDIT_UNLINK,
-        AUDIT_SYMLINK,
         AUDIT_RENAME,
         AUDIT_SETATTR,
         AUDIT_WRITE,

diff --git a/lustre/smfs/audit_transfer.c b/lustre/smfs/audit_transfer.c
index 3e36b4f..5e58b0f 100644 (file)
--- a/lustre/smfs/audit_transfer.c
+++ b/lustre/smfs/audit_transfer.c
@@ -99,7 +99,6 @@ const char *opstr[AUDIT_MAX] = {
         [AUDIT_CREATE]   "create",
         [AUDIT_LINK]     "link",
         [AUDIT_UNLINK]   "unlink",
-        [AUDIT_SYMLINK]  "symlink",
         [AUDIT_RENAME]   "rename",
         [AUDIT_SETATTR]  "setattr",
         [AUDIT_WRITE]    "write",

diff --git a/lustre/utils/lctl.c b/lustre/utils/lctl.c
index 0c8c7c0..a1f4d3f 100644 (file)
--- a/lustre/utils/lctl.c
+++ b/lustre/utils/lctl.c
@@ -84,6 +84,10 @@ static int parse_audit_ops(char * str, __u64 * mask)
                         SET_AUDIT_OP((*mask), AUDIT_STAT);
                 else if (!strcmp(op,"readdir"))
                         SET_AUDIT_OP((*mask), AUDIT_READDIR);
+                else if (!strcmp(op,"readlink"))
+                        SET_AUDIT_OP((*mask), AUDIT_READLINK);
+                else if (!strcmp(op,"setattr"))
+                        SET_AUDIT_OP((*mask), AUDIT_SETATTR);
                 else {
                         fprintf(stderr, "invalid audit operation '%s'\n", op);
                 }