lustre: update to AmazonFSxLustreClient v2.10.8-10

Signed-off-by: Shaoying Xu <shaoyi@amazon.com>

Author: shaoyingxu

drivers/staging/lustrefsx/config.h

@@ -981,7 +981,7 @@
 #define LUSTRE_PATCH 8
 
 /* A copy of PACKAGE_VERSION */
-#define LUSTRE_VERSION_STRING "2.10.8"
+#define LUSTRE_VERSION_STRING "2.10.8-10"
 
 /* maximum number of MDS threads */
 /* #undef MDS_MAX_THREADS */
@@ -1014,7 +1014,7 @@
 #define PACKAGE_NAME "Lustre"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Lustre 2.10.8"
+#define PACKAGE_STRING "Lustre 2.10.8-10"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "lustre"
@@ -1023,7 +1023,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.10.8"
+#define PACKAGE_VERSION "2.10.8-10"
 
 /* name of parallel fsck program */
 #define PFSCK "fsck"
@@ -1067,7 +1067,7 @@
 /* #undef USE_LU_REF */
 
 /* Version number of package */
-#define VERSION "2.10.8"
+#define VERSION "2.10.8-10"
 
 /* zfs fix version */
 /* #undef ZFS_FIX */

drivers/staging/lustrefsx/libcfs/include/libcfs/linux/linux-time.h

@@ -259,7 +259,7 @@ static inline cfs_time_t cfs_time_current(void)
 
 static inline time_t cfs_time_current_sec(void)
 {
-	return get_seconds();
+	return ktime_get_real_seconds();
 }
 
 static inline cfs_duration_t cfs_time_seconds(int seconds)

drivers/staging/lustrefsx/lnet/klnds/o2iblnd/o2iblnd_cb.c

@@ -3375,8 +3375,8 @@ kiblnd_connd (void *arg)
                 }
 
 		while (reconn < KIB_RECONN_BREAK) {
-			if (kiblnd_data.kib_reconn_sec != get_seconds()) {
-				kiblnd_data.kib_reconn_sec = get_seconds();
+			if (kiblnd_data.kib_reconn_sec != ktime_get_real_seconds()) {
+				kiblnd_data.kib_reconn_sec = ktime_get_real_seconds();
 				list_splice_init(&kiblnd_data.kib_reconn_wait,
 						 &kiblnd_data.kib_reconn_list);
 			}

drivers/staging/lustrefsx/lustre/include/obd_class.h

@@ -65,13 +65,9 @@ int class_register_type(struct obd_ops *, struct md_ops *, bool enable_proc,
 			const char *nm, struct lu_device_type *ldt);
 int class_unregister_type(const char *nm);
 
-struct obd_device *class_newdev(const char *type_name, const char *name,
-				const char *uuid);
-int class_register_device(struct obd_device *obd);
-void class_unregister_device(struct obd_device *obd);
-void class_free_dev(struct obd_device *obd);
+struct obd_device *class_newdev(const char *type_name, const char *name);
+void class_release_dev(struct obd_device *obd);
 
-struct obd_device *class_dev_by_str(const char *str);
 int class_name2dev(const char *name);
 struct obd_device *class_name2obd(const char *name);
 int class_uuid2dev(struct obd_uuid *uuid);
@@ -319,8 +315,6 @@ struct obd_export *class_export_get(struct obd_export *exp);
 void class_export_put(struct obd_export *exp);
 struct obd_export *class_new_export(struct obd_device *obddev,
                                     struct obd_uuid *cluuid);
-struct obd_export *class_new_export_self(struct obd_device *obd,
-					 struct obd_uuid *uuid);
 void class_unlink_export(struct obd_export *exp);
 
 struct obd_import *class_import_get(struct obd_import *);

drivers/staging/lustrefsx/lustre/ldlm/ldlm_lib.c

@@ -950,6 +950,7 @@ int target_handle_connect(struct ptlrpc_request *req)
 	 * reconnect case */
 	struct lustre_handle conn;
 	struct lustre_handle *tmp;
+        struct obd_uuid tgtuuid;
         struct obd_uuid cluuid;
         char *str;
         int rc = 0;
@@ -958,6 +959,7 @@ int target_handle_connect(struct ptlrpc_request *req)
 	bool	 mds_conn = false, lw_client = false, initial_conn = false;
 	bool	 mds_mds_conn = false;
 	bool	 new_mds_mds_conn = false;
+	bool	 target_referenced = false;
         struct obd_connect_data *data, *tmpdata;
         int size, tmpsize;
         lnet_nid_t *client_nid = NULL;
@@ -971,7 +973,11 @@ int target_handle_connect(struct ptlrpc_request *req)
                 GOTO(out, rc = -EINVAL);
         }
 
-	target = class_dev_by_str(str);
+        obd_str2uuid(&tgtuuid, str);
+        target = class_uuid2obd(&tgtuuid);
+        if (!target)
+                target = class_name2obd(str);
+
 	if (!target) {
 		deuuidify(str, NULL, &target_start, &target_len);
 		LCONSOLE_ERROR_MSG(0x137, "%s: not available for connect "
@@ -983,9 +989,6 @@ int target_handle_connect(struct ptlrpc_request *req)
 	}
 
 	spin_lock(&target->obd_dev_lock);
-
-	target->obd_conn_inprogress++;
-
 	if (target->obd_stopping || !target->obd_set_up) {
 		spin_unlock(&target->obd_dev_lock);
 
@@ -1007,6 +1010,13 @@ int target_handle_connect(struct ptlrpc_request *req)
 		GOTO(out, rc = -EAGAIN);
 	}
 
+	/* Make sure the target isn't cleaned up while we're here. Yes,
+	 * there's still a race between the above check and our incref here.
+	 * Really, class_uuid2obd should take the ref. */
+	class_incref(target, __func__, current);
+	target_referenced = true;
+
+	target->obd_conn_inprogress++;
 	spin_unlock(&target->obd_dev_lock);
 
         str = req_capsule_client_get(&req->rq_pill, &RMF_CLUUID);
@@ -1433,11 +1443,12 @@ int target_handle_connect(struct ptlrpc_request *req)
 
 		class_export_put(export);
 	}
-	if (target != NULL) {
+	if (target_referenced == true && target != NULL) {
 		spin_lock(&target->obd_dev_lock);
 		target->obd_conn_inprogress--;
 		spin_unlock(&target->obd_dev_lock);
-		class_decref(target, "find", current);
+
+		class_decref(target, __func__, current);
 	}
 	req->rq_status = rc;
 	RETURN(rc);

drivers/staging/lustrefsx/lustre/llite/super25.c

@@ -104,6 +104,7 @@ static int __init lustre_init(void)
 	struct lnet_process_id lnet_id;
 	struct timespec64 ts;
 	int i, rc, seed[2];
+	unsigned long lustre_inode_cache_flags;
 
 	CLASSERT(sizeof(LUSTRE_VOLATILE_HDR) == LUSTRE_VOLATILE_HDR_LEN + 1);
 
@@ -113,9 +114,15 @@ static int __init lustre_init(void)
 	CDEBUG(D_INFO, "Lustre client module (%p).\n",
 	       &lustre_super_operations);
 
+	lustre_inode_cache_flags = SLAB_HWCACHE_ALIGN | SLAB_RECLAIM_ACCOUNT |
+				   SLAB_MEM_SPREAD;
+#ifdef SLAB_ACCOUNT
+	lustre_inode_cache_flags |= SLAB_ACCOUNT;
+#endif
+
 	ll_inode_cachep = kmem_cache_create("lustre_inode_cache",
 					    sizeof(struct ll_inode_info),
-					    0, SLAB_HWCACHE_ALIGN, NULL);
+					    0, lustre_inode_cache_flags, NULL);
 	if (ll_inode_cachep == NULL)
 		GOTO(out_cache, rc = -ENOMEM);
 

drivers/staging/lustrefsx/lustre/llite/xattr_security.c

@@ -76,7 +76,13 @@ int ll_dentry_init_security(struct dentry *dentry, int mode, struct qstr *name,
 
 	rc = security_dentry_init_security(dentry, mode, name, secctx,
 					   secctx_size);
-	if (rc == -EOPNOTSUPP)
+	/* Usually, security_dentry_init_security() returns -EOPNOTSUPP when
+	 * SELinux is disabled.
+	 * But on some kernels (e.g. rhel 8.5) it returns 0 when SELinux is
+	 * disabled, and in this case the security context is empty.
+	 */
+	if (rc == -EOPNOTSUPP || (rc == 0 && *secctx_size == 0))
+		/* do nothing */
 		return 0;
 	if (rc < 0)
 		return rc;