LU-12635 build: Support for gcc -Wimplicit-fallthrough

[fs/lustre-release.git] / lustre / target / tgt_lastrcvd.c

diff --git a/lustre/target/tgt_lastrcvd.c b/lustre/target/tgt_lastrcvd.c
index b869298..bcb4ff9 100644 (file)
--- a/lustre/target/tgt_lastrcvd.c
+++ b/lustre/target/tgt_lastrcvd.c
@@ -23,7 +23,7 @@
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2016, Intel Corporation.
+ * Copyright (c) 2011, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -40,6 +40,8 @@
 
 #include "tgt_internal.h"
 
+/** version recovery epoch */
+#define LR_EPOCH_BITS  32
 
 /* Allocate a bitmap for a chunk of reply data slots */
 static int tgt_bitmap_chunk_alloc(struct lu_target *lut, int chunk)
@@ -146,6 +148,13 @@ static int tgt_clear_reply_slot(struct lu_target *lut, int idx)
        int chunk;
        int b;
 
+       if (lut->lut_obd->obd_stopping)
+               /*
+                * in case of failover keep the bit set in order to
+                * avoid overwriting slots in reply_data which might
+                * be required by resent rpcs
+                */
+               return 0;
        chunk = idx / LUT_REPLY_SLOTS_PER_CHUNK;
        b = idx % LUT_REPLY_SLOTS_PER_CHUNK;
 
@@ -386,6 +395,8 @@ int tgt_client_alloc(struct obd_export *exp)
 
        spin_lock_init(&exp->exp_target_data.ted_nodemap_lock);
        INIT_LIST_HEAD(&exp->exp_target_data.ted_nodemap_member);
+       spin_lock_init(&exp->exp_target_data.ted_fmd_lock);
+       INIT_LIST_HEAD(&exp->exp_target_data.ted_fmd_list);
 
        OBD_ALLOC_PTR(exp->exp_target_data.ted_lcd);
        if (exp->exp_target_data.ted_lcd == NULL)
@@ -409,6 +420,8 @@ void tgt_client_free(struct obd_export *exp)
 
        LASSERT(exp != exp->exp_obd->obd_self_export);
 
+       tgt_fmd_cleanup(exp);
+
        /* free reply data */
        mutex_lock(&ted->ted_lcd_lock);
        list_for_each_entry_safe(trd, tmp, &ted->ted_reply_list, trd_list) {
@@ -447,6 +460,19 @@ void tgt_client_free(struct obd_export *exp)
 }
 EXPORT_SYMBOL(tgt_client_free);
 
+static inline void tgt_check_lcd(const char *obd_name, int index,
+                                struct lsd_client_data *lcd)
+{
+       size_t uuid_size = sizeof(lcd->lcd_uuid);
+
+       if (strnlen((char*)lcd->lcd_uuid, uuid_size) == uuid_size) {
+               lcd->lcd_uuid[uuid_size - 1] = '\0';
+
+               LCONSOLE_ERROR("the client UUID (%s) on %s for exports stored in last_rcvd(index = %d) is bad!\n",
+                              lcd->lcd_uuid, obd_name, index);
+       }
+}
+
 static int tgt_client_data_read(const struct lu_env *env, struct lu_target *tgt,
                                struct lsd_client_data *lcd,
                                loff_t *off, int index)
@@ -457,7 +483,7 @@ static int tgt_client_data_read(const struct lu_env *env, struct lu_target *tgt,
        tti_buf_lcd(tti);
        rc = dt_record_read(env, tgt->lut_last_rcvd, &tti->tti_buf, off);
        if (rc == 0) {
-               check_lcd(tgt->lut_obd->obd_name, index, &tti->tti_lcd);
+               tgt_check_lcd(tgt->lut_obd->obd_name, index, &tti->tti_lcd);
                lcd_le_to_cpu(&tti->tti_lcd, lcd);
                lcd->lcd_last_result = ptlrpc_status_ntoh(lcd->lcd_last_result);
                lcd->lcd_last_close_result =
@@ -785,7 +811,7 @@ void tgt_boot_epoch_update(struct lu_target *tgt)
        }
 
        spin_lock(&tgt->lut_translock);
-       start_epoch = lr_epoch(tgt->lut_last_transno) + 1;
+       start_epoch = (tgt->lut_last_transno >> LR_EPOCH_BITS) + 1;
        tgt->lut_last_transno = (__u64)start_epoch << LR_EPOCH_BITS;
        tgt->lut_lsd.lsd_start_epoch = start_epoch;
        spin_unlock(&tgt->lut_translock);