b=8654

- delay notification for audit_transfer in case of create
- remove unneeded list_head declaration

diff --git a/lustre/smfs/audit.c b/lustre/smfs/audit.c
index 73a6c35..ed70b73 100644 (file)
--- a/lustre/smfs/audit.c
+++ b/lustre/smfs/audit.c
@@ -367,7 +367,8 @@ static int smfs_audit_post_op(hook_op code, struct inode * inode, void * msg,
         if (rc != 0) {
                 CERROR("Error adding audit record: %d\n", rc);
                 rc= -EINVAL;
-        } else {
+        /* delay notify for create op */
+        } else if (!(code == HOOK_CREATE && ret == 0)) { 
                 audit_notify(priv->audit_ctxt->loc_handle, priv->au_id2name);
         }
         

diff --git a/lustre/smfs/audit_transfer.c b/lustre/smfs/audit_transfer.c
index d971430..9e6b7b1 100644 (file)
--- a/lustre/smfs/audit_transfer.c
+++ b/lustre/smfs/audit_transfer.c
@@ -78,7 +78,6 @@ static int transferd_check(struct transferd_ctl *tc)
 int audit_notify(struct llog_handle *llh, void * arg)
 {
         struct transfer_item *ti;
-        struct list_head tmp_list;
         ENTRY;
 
         down(&transferd_sem);