- small fixes after landing

diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h
index d3cba8c..a9104cd 100644 (file)
--- a/lustre/llite/llite_internal.h
+++ b/lustre/llite/llite_internal.h
@@ -462,7 +462,7 @@ struct ll_lock_tree_node {
         struct lustre_handle    lt_lockh;
         ldlm_mode_t             lt_mode;
 };
         struct lustre_handle    lt_lockh;
         ldlm_mode_t             lt_mode;
 };

-//struct ll_lock_tree_node;
+

 struct ll_lock_tree {
         rb_root_t                       lt_root;
         struct list_head                lt_locked_list;
 struct ll_lock_tree {
         rb_root_t                       lt_root;
         struct list_head                lt_locked_list;

diff --git a/lustre/llite/llite_mmap.c b/lustre/llite/llite_mmap.c
index 70dcf8a..5fbf6f0 100644 (file)
--- a/lustre/llite/llite_mmap.c
+++ b/lustre/llite/llite_mmap.c
@@ -52,16 +52,6 @@
 #include "llite_internal.h"
 #include <linux/lustre_compat25.h>
 
 #include "llite_internal.h"
 #include <linux/lustre_compat25.h>
 

-/*
-struct ll_lock_tree_node {
-        rb_node_t               lt_node;
-        struct list_head        lt_locked_item;
-        __u64                   lt_oid;
-        ldlm_policy_data_t      lt_policy;
-        struct lustre_handle    lt_lockh;
-        ldlm_mode_t             lt_mode;
-};
-*/

 __u64 lov_merge_size(struct lov_stripe_md *lsm, int kms);
 int lt_get_mmap_locks(struct ll_lock_tree *tree, struct inode *inode,
                       unsigned long addr, size_t count);
 __u64 lov_merge_size(struct lov_stripe_md *lsm, int kms);
 int lt_get_mmap_locks(struct ll_lock_tree *tree, struct inode *inode,
                       unsigned long addr, size_t count);

diff --git a/lustre/smfs/audit.c b/lustre/smfs/audit.c
index 93d4d3e..0e7dd0c 100644 (file)
--- a/lustre/smfs/audit.c
+++ b/lustre/smfs/audit.c
@@ -215,7 +215,7 @@ static int smfs_set_fs_audit (struct super_block * sb, __u64 *mask)
         ENTRY;
         
         ctxt = &smb->smsi_exp->exp_obd->obd_lvfs_ctxt;
         ENTRY;
         
         ctxt = &smb->smsi_exp->exp_obd->obd_lvfs_ctxt;

-        push_ctxt(&saved, ctxt, NULL);
+        

         priv = smfs_get_plg_priv(smb, SMFS_PLG_AUDIT);
         if(!priv) {
                 CERROR("error updating audit setting: rc = %d\n", rc);
         priv = smfs_get_plg_priv(smb, SMFS_PLG_AUDIT);
         if(!priv) {
                 CERROR("error updating audit setting: rc = %d\n", rc);

diff --git a/lustre/smfs/smfs_lib.c b/lustre/smfs/smfs_lib.c
index dce98e2..be6bed9 100644 (file)
--- a/lustre/smfs/smfs_lib.c
+++ b/lustre/smfs/smfs_lib.c
@@ -618,7 +618,6 @@ void * smfs_get_plg_priv(struct smfs_super_info * smb, int type)
         struct smfs_plugin *plg, *tmp;
         
         list_for_each_entry_safe(plg, tmp, hlist, plg_list) {
         struct smfs_plugin *plg, *tmp;
         
         list_for_each_entry_safe(plg, tmp, hlist, plg_list) {

-                CERROR("found type %x, needed %x\n", plg->plg_type, type);

                 if (plg->plg_type == type) {
                         return (plg->plg_private);
                 }
                 if (plg->plg_type == type) {
                         return (plg->plg_private);
                 }