LU-6434 ofd: object reference leaks in ofd_preprw_write

[fs/lustre-release.git] / lustre / mdt / mdt_coordinator.c

diff --git a/lustre/mdt/mdt_coordinator.c b/lustre/mdt/mdt_coordinator.c
index f2fd1d6..72ab938 100644 (file)
--- a/lustre/mdt/mdt_coordinator.c
+++ b/lustre/mdt/mdt_coordinator.c
@@ -20,10 +20,11 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012, 2013, Intel Corporation.
- * Use is subject to license terms.
  * Copyright (c) 2011, 2012 Commissariat a l'energie atomique et aux energies
  *                          alternatives
+ *
+ * Copyright (c) 2013, 2014, Intel Corporation.
+ * Use is subject to license terms.
  */
 /*
  * lustre/mdt/mdt_coordinator.c
@@ -311,7 +312,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
@@ -329,7 +330,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,
@@ -448,7 +449,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;
 
@@ -542,7 +543,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,
@@ -1269,7 +1270,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;