LU-9280 osd-zfs: don't mark existing on failed creation

[fs/lustre-release.git] / lustre / fld / fld_request.c

diff --git a/lustre/fld/fld_request.c b/lustre/fld/fld_request.c
index e8a41af..19b5789 100644 (file)
--- a/lustre/fld/fld_request.c
+++ b/lustre/fld/fld_request.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2014, Intel Corporation.
+ * Copyright (c) 2011, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -92,7 +88,7 @@ again:
                goto again;
        }
 
-        CERROR("%s: Can't find target by hash %d (seq "LPX64"). "
+       CERROR("%s: Can't find target by hash %d (seq %#llx). "
                "Targets (%d):\n", fld->lcf_name, hash, seq,
                fld->lcf_count);
 
@@ -103,7 +99,7 @@ again:
                         (char *)target->ft_exp->exp_obd->obd_uuid.uuid :
                         "<null>";
 
-                CERROR("  exp: 0x%p (%s), srv: 0x%p (%s), idx: "LPU64"\n",
+               CERROR("  exp: 0x%p (%s), srv: 0x%p (%s), idx: %llu\n",
                        target->ft_exp, exp_name, target->ft_srv,
                        srv_name, target->ft_idx);
         }
@@ -140,8 +136,8 @@ fld_client_get_target(struct lu_client_fld *fld, u64 seq)
        spin_unlock(&fld->lcf_lock);
 
         if (target != NULL) {
-                CDEBUG(D_INFO, "%s: Found target (idx "LPU64
-                       ") by seq "LPX64"\n", fld->lcf_name,
+               CDEBUG(D_INFO, "%s: Found target (idx %llu"
+                      ") by seq %#llx\n", fld->lcf_name,
                        target->ft_idx, seq);
         }
 
@@ -164,7 +160,7 @@ int fld_client_add_target(struct lu_client_fld *fld,
         LASSERT(name != NULL);
         LASSERT(tar->ft_srv != NULL || tar->ft_exp != NULL);
 
-       CDEBUG(D_INFO, "%s: Adding target %s (idx "LPU64")\n", fld->lcf_name,
+       CDEBUG(D_INFO, "%s: Adding target %s (idx %llu)\n", fld->lcf_name,
               name, tar->ft_idx);
 
         OBD_ALLOC_PTR(target);
@@ -176,7 +172,7 @@ int fld_client_add_target(struct lu_client_fld *fld,
                if (tmp->ft_idx == tar->ft_idx) {
                        spin_unlock(&fld->lcf_lock);
                         OBD_FREE_PTR(target);
-                        CERROR("Target %s exists in FLD and known as %s:#"LPU64"\n",
+                       CERROR("Target %s exists in FLD and known as %s:#%llu\n",
                                name, fld_target_name(tmp), tmp->ft_idx);
                         RETURN(-EEXIST);
                 }
@@ -398,7 +394,7 @@ again:
                        RETURN(-ENOMEM);
 
                req_capsule_set_size(&req->rq_pill, &RMF_GENERIC_DATA,
-                                    RCL_SERVER, PAGE_CACHE_SIZE);
+                                    RCL_SERVER, PAGE_SIZE);
                break;
        default:
                rc = -EINVAL;
@@ -425,10 +421,16 @@ again:
        }
 
        if (rc != 0) {
-               if (imp->imp_state != LUSTRE_IMP_CLOSED && !imp->imp_deactive) {
+               if (imp->imp_state != LUSTRE_IMP_CLOSED &&
+                   !imp->imp_deactive &&
+                   imp->imp_connect_flags_orig & OBD_CONNECT_MDS_MDS &&
+                   OCD_HAS_FLAG(&imp->imp_connect_data, LIGHTWEIGHT) &&
+                   rc != -ENOTSUPP) {
                        /* Since LWP is not replayable, so it will keep
-                        * trying unless umount happens, otherwise it would
-                        * cause unecessary failure of the application. */
+                        * trying unless umount happens or the remote
+                        * target does not support the operation, otherwise
+                        * it would cause unecessary failure of the
+                        * application. */
                        ptlrpc_req_finished(req);
                        rc = 0;
                        goto again;
@@ -477,8 +479,8 @@ int fld_client_lookup(struct lu_client_fld *fld, u64 seq, u32 *mds,
         LASSERT(target != NULL);
        origin = target;
 again:
-        CDEBUG(D_INFO, "%s: Lookup fld entry (seq: "LPX64") on "
-               "target %s (idx "LPU64")\n", fld->lcf_name, seq,
+       CDEBUG(D_INFO, "%s: Lookup fld entry (seq: %#llx) on "
+              "target %s (idx %llu)\n", fld->lcf_name, seq,
                fld_target_name(target), target->ft_idx);
 
        res.lsr_start = seq;
@@ -499,8 +501,13 @@ again:
                 * then try next target in the list, until trying all targets
                 * or fld lookup succeeds */
                spin_lock(&fld->lcf_lock);
-               if (target->ft_chain.next == fld->lcf_targets.prev)
-                       target = list_entry(fld->lcf_targets.next,
+
+               /* If the next entry in the list is the head of the list,
+                * move to the next entry after the head and retrieve
+                * the target. Else retreive the next target entry. */
+
+               if (target->ft_chain.next == &fld->lcf_targets)
+                       target = list_entry(target->ft_chain.next->next,
                                            struct lu_fld_target, ft_chain);
                else
                        target = list_entry(target->ft_chain.next,
@@ -527,7 +534,7 @@ void fld_client_flush(struct lu_client_fld *fld)
 
 struct proc_dir_entry *fld_type_proc_dir;
 
-static int __init fld_mod_init(void)
+static int __init fld_init(void)
 {
        fld_type_proc_dir = lprocfs_register(LUSTRE_FLD_NAME,
                                             proc_lustre_root,
@@ -542,7 +549,7 @@ static int __init fld_mod_init(void)
        return 0;
 }
 
-static void __exit fld_mod_exit(void)
+static void __exit fld_exit(void)
 {
 #ifdef HAVE_SERVER_SUPPORT
        fld_server_mod_exit();
@@ -555,9 +562,9 @@ static void __exit fld_mod_exit(void)
 }
 
 MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
-MODULE_DESCRIPTION("Lustre FLD");
+MODULE_DESCRIPTION("Lustre FID Location Database");
 MODULE_VERSION(LUSTRE_VERSION_STRING);
 MODULE_LICENSE("GPL");
 
-module_init(fld_mod_init);
-module_exit(fld_mod_exit);
+module_init(fld_init);
+module_exit(fld_exit);