- removed not used var in pinger.

- make filter_preprw_read() do not complain about not existing OSt object, as it nicely handles that case.

diff --git a/lustre/obdclass/genops.c b/lustre/obdclass/genops.c
index 27c3138..2040cd8 100644 (file)
--- a/lustre/obdclass/genops.c
+++ b/lustre/obdclass/genops.c
@@ -1167,8 +1167,6 @@ void class_update_export_timer(struct obd_export *exp, time_t extra_delay)
 
         /* Note - racing to start/reset the obd_eviction timer is safe */
         if (exp->exp_obd->obd_eviction_timer == 0) {
-                unsigned long interval = PING_INTERVAL;
-                
                 /* Check if the oldest entry is expired. */
                 if (CURRENT_SECONDS > (oldest_time +
                                        (3 * obd_timeout / 2) + extra_delay)) {

diff --git a/lustre/obdfilter/filter_internal.h b/lustre/obdfilter/filter_internal.h
index a2c2267..af8dc29 100644 (file)
--- a/lustre/obdfilter/filter_internal.h
+++ b/lustre/obdfilter/filter_internal.h
@@ -102,6 +102,7 @@ struct dentry *filter_fid2dentry(struct obd_device *, struct dentry *dir,
 struct dentry *__filter_oa2dentry(struct obd_device *obd, struct obdo *oa,
                                   const char *what, int quiet);
 #define filter_oa2dentry(obd, oa) __filter_oa2dentry(obd, oa, __FUNCTION__, 0)
+#define filter_oa2dentry_quiet(obd, oa) __filter_oa2dentry(obd, oa, __FUNCTION__, 1)
 
 int filter_finish_transno(struct obd_export *, struct obd_trans_info *, int rc);
 __u64 filter_last_id(struct filter_obd *, int group);

diff --git a/lustre/obdfilter/filter_io.c b/lustre/obdfilter/filter_io.c
index 0b68a84..41097b5 100644 (file)
--- a/lustre/obdfilter/filter_io.c
+++ b/lustre/obdfilter/filter_io.c
@@ -294,7 +294,7 @@ static int filter_preprw_read(int cmd, struct obd_export *exp, struct obdo *oa,
 
         iobuf = filter_iobuf_get(oti->oti_thread, &exp->exp_obd->u.filter);
 
-        dentry = filter_oa2dentry(obd, oa);
+        dentry = filter_oa2dentry_quiet(obd, oa);
         if (IS_ERR(dentry)) {
                 if (PTR_ERR(dentry) == -ENOENT) {
                         dentry = NULL;