X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_coordinator.c;h=27ff1e34e4ec4fc1aae3c2494d87652568c5aae5;hb=b046468f58a1f40e85cb59ed9abf75fd2fd5ea5a;hp=63d958238bcc38d3d1990dd12f176ba7e6c62d9c;hpb=2b294992edce5af7b79d4300ed3aa1ea6a8db850;p=fs%2Flustre-release.git

diff --git a/lustre/mdt/mdt_coordinator.c b/lustre/mdt/mdt_coordinator.c
index 63d9582..27ff1e3 100644
--- a/lustre/mdt/mdt_coordinator.c
+++ b/lustre/mdt/mdt_coordinator.c
@@ -38,15 +38,17 @@
 
 #define DEBUG_SUBSYSTEM S_MDS
 
+#include <linux/kthread.h>
 #include <obd_support.h>
 #include <lustre_net.h>
 #include <lustre_export.h>
 #include <obd.h>
 #include <lprocfs_status.h>
 #include <lustre_log.h>
+#include <lustre_kernelcomm.h>
 #include "mdt_internal.h"
 
-static struct lprocfs_seq_vars lprocfs_mdt_hsm_vars[];
+static struct lprocfs_vars lprocfs_mdt_hsm_vars[];
 
 /**
  * get obj and HSM attributes on a fid
@@ -185,8 +187,8 @@ static int mdt_coordinator_cb(const struct lu_env *env,
 		    cdt->cdt_max_requests)
 			break;
 
-		/* first search if the request if known in the list we have
-		 * build and if there is room in the request vector */
+		/* first search whether the request is found in the list we
+		 * have built and if there is room in the request vector */
 		empty_slot = -1;
 		found = -1;
 		for (i = 0; i < hsd->max_requests &&
@@ -312,7 +314,7 @@ static int mdt_coordinator_cb(const struct lu_env *env,
 			struct hsm_progress_kernel pgs;
 
 			dump_llog_agent_req_rec("mdt_coordinator_cb(): "
-						"request timeouted, start "
+						"request timed out, start "
 						"cleaning", larr);
 			/* a too old cancel request just needs to be removed
 			 * this can happen, if copy tool does not support cancel
@@ -330,7 +332,7 @@ static int mdt_coordinator_cb(const struct lu_env *env,
 			 */
 			rc = mdt_hsm_update_request_state(hsd->mti, &pgs, 0);
 			if (rc)
-				CERROR("%s: Cannot cleanup timeouted request: "
+				CERROR("%s: Cannot cleanup timed out request: "
 				       DFID" for cookie "LPX64" action=%s\n",
 				       mdt_obd_name(mdt),
 				       PFID(&pgs.hpk_fid), pgs.hpk_cookie,
@@ -401,7 +403,7 @@ int hsm_cdt_procfs_init(struct mdt_device *mdt)
 	ENTRY;
 
 	/* init /proc entries, failure is not critical */
-	cdt->cdt_proc_dir = lprocfs_seq_register("hsm",
+	cdt->cdt_proc_dir = lprocfs_register("hsm",
 					     mdt2obd_dev(mdt)->obd_proc_entry,
 					     lprocfs_mdt_hsm_vars, mdt);
 	if (IS_ERR(cdt->cdt_proc_dir)) {
@@ -433,7 +435,7 @@ void  hsm_cdt_procfs_fini(struct mdt_device *mdt)
  * \param none
  * \retval var vector
  */
-struct lprocfs_seq_vars *hsm_cdt_get_proc_vars(void)
+struct lprocfs_vars *hsm_cdt_get_proc_vars(void)
 {
 	return lprocfs_mdt_hsm_vars;
 }
@@ -449,7 +451,7 @@ static int mdt_coordinator(void *data)
 	struct mdt_thread_info	*mti = data;
 	struct mdt_device	*mdt = mti->mti_mdt;
 	struct coordinator	*cdt = &mdt->mdt_coordinator;
-	struct hsm_scan_data	 hsd = { 0 };
+	struct hsm_scan_data	 hsd = { NULL };
 	int			 rc = 0;
 	ENTRY;
 
@@ -543,7 +545,7 @@ static int mdt_coordinator(void *data)
 		CDEBUG(D_HSM, "Found %d requests to send and %d"
 			      " requests to cancel\n",
 		       hsd.request_cnt, hsd.cookie_cnt);
-		/* first we cancel llog records of the timeouted requests */
+		/* first we cancel llog records of the timed out requests */
 		if (hsd.cookie_cnt > 0) {
 			rc = mdt_agent_record_update(mti->mti_env, mdt,
 						     hsd.cookies,
@@ -1270,7 +1272,7 @@ static int hsm_cdt_request_completed(struct mdt_thread_info *mti,
 			 * ENOSYS only if does not support cancel
 			 */
 			/* this can also happen when cdt calls it to
-			 * for a timeouted request */
+			 * for a timed out request */
 			*status = ARS_FAILED;
 			/* to have a cancel event in changelog */
 			pgs->hpk_errval = ECANCELED;
@@ -1400,7 +1402,7 @@ unlock:
 		struct cdt_restore_handle	*crh;
 
 		/* restore in data FID done, we swap the layouts
-		 * only if restore is successfull */
+		 * only if restore is successful */
 		if (pgs->hpk_errval == 0) {
 			rc = hsm_swap_layouts(mti, &car->car_hai->hai_fid,
 					      &car->car_hai->hai_dfid, &mh);
@@ -1711,7 +1713,7 @@ out:
 }
 
 /**
- * check if a request is comptaible with file status
+ * check if a request is compatible with file status
  * \param hai [IN] request description
  * \param hal_an [IN] request archive number (not used)
  * \param rq_flags [IN] request flags
@@ -2213,7 +2215,7 @@ LPROC_SEQ_FOPS(mdt_hsm_user_request_mask);
 LPROC_SEQ_FOPS(mdt_hsm_group_request_mask);
 LPROC_SEQ_FOPS(mdt_hsm_other_request_mask);
 
-static struct lprocfs_seq_vars lprocfs_mdt_hsm_vars[] = {
+static struct lprocfs_vars lprocfs_mdt_hsm_vars[] = {
 	{ .name	=	"agents",
 	  .fops	=	&mdt_hsm_agent_fops			},
 	{ .name	=	"actions",