LU-8468 kernel: kernel update RHEL7.2 [3.10.0-327.28.2.el7]

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

diff --git a/lustre/fld/fld_request.c b/lustre/fld/fld_request.c
index de6c96a..1999dac 100644 (file)
--- a/lustre/fld/fld_request.c
+++ b/lustre/fld/fld_request.c
@@ -425,10 +425,15 @@ 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 &&
+                   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;
@@ -499,8 +504,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 +537,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 +552,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 +565,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);