LU-6210 utils: Use C99 initializer in jt_nodemap_set_fileset()

[fs/lustre-release.git] / lustre / quota / qsd_entry.c

diff --git a/lustre/quota/qsd_entry.c b/lustre/quota/qsd_entry.c
index 4dbbeb0..eb3f176 100644 (file)
--- a/lustre/quota/qsd_entry.c
+++ b/lustre/quota/qsd_entry.c
@@ -21,17 +21,13 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2011, 2012, Intel, Inc.
+ * Copyright (c) 2012, Intel Corporation.
  * Use is subject to license terms.
  *
  * Author: Johann Lombardi <johann.lombardi@intel.com>
  * Author: Niu    Yawei    <yawei.niu@intel.com>
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
-
 #define DEBUG_SUBSYSTEM S_LQUOTA
 
 #include "qsd_internal.h"
@@ -51,7 +47,7 @@ static void qsd_lqe_init(struct lquota_entry *lqe, void *arg)
        memset(&lqe->lqe_lockh, 0, sizeof(lqe->lqe_lockh));
        lqe->lqe_pending_write = 0;
        lqe->lqe_pending_req   = 0;
-       cfs_waitq_init(&lqe->lqe_waiters);
+       init_waitqueue_head(&lqe->lqe_waiters);
        lqe->lqe_usage    = 0;
        lqe->lqe_nopreacq = false;
 }
@@ -142,10 +138,10 @@ static void qsd_lqe_debug(struct lquota_entry *lqe, void *arg,
        struct qsd_qtype_info   *qqi = (struct qsd_qtype_info *)arg;
 
        libcfs_debug_vmsg2(msgdata, fmt, args,
-                          "qsd:%s qtype:%s id:"LPU64" enforced:%d granted:"
-                          LPU64" pending:"LPU64" waiting:"LPU64" req:%d usage:"
-                          LPU64" qunit:"LPU64" qtune:"LPU64" edquot:%d\n",
-                          qqi->qqi_qsd->qsd_svname, QTYPE_NAME(qqi->qqi_qtype),
+                          "qsd:%s qtype:%s id:%llu enforced:%d granted:"
+                          "%llu pending:%llu waiting:%llu req:%d usage:"
+                          "%llu qunit:%llu qtune:%llu edquot:%d\n",
+                          qqi->qqi_qsd->qsd_svname, qtype_name(qqi->qqi_qtype),
                           lqe->lqe_id.qid_uid, lqe->lqe_enforced,
                           lqe->lqe_granted, lqe->lqe_pending_write,
                           lqe->lqe_waiting_write, lqe->lqe_pending_req,
@@ -216,7 +212,7 @@ int qsd_refresh_usage(const struct lu_env *env, struct lquota_entry *lqe)
                RETURN(rc);
        }
 
-       LQUOTA_DEBUG(lqe, "disk usage: "LPU64, lqe->lqe_usage);
+       LQUOTA_DEBUG(lqe, "disk usage: %llu", lqe->lqe_usage);
        RETURN(0);
 }
 
@@ -265,15 +261,15 @@ int qsd_update_index(const struct lu_env *env, struct qsd_qtype_info *qqi,
                /* Update record in global index copy */
                struct lquota_glb_rec *glb_rec = (struct lquota_glb_rec *)rec;
 
-               CDEBUG(D_QUOTA, "%s: updating global index hardlimit: "LPU64", "
-                      "softlimit: "LPU64" for id "LPU64"\n",
+               CDEBUG(D_QUOTA, "%s: updating global index hardlimit: %llu, "
+                      "softlimit: %llu for id %llu\n",
                       qqi->qqi_qsd->qsd_svname, glb_rec->qbr_hardlimit,
                       glb_rec->qbr_softlimit, qid->qid_uid);
        } else {
                /* Update record in slave index copy */
                struct lquota_slv_rec *slv_rec = (struct lquota_slv_rec *)rec;
 
-               CDEBUG(D_QUOTA, "%s: update granted to "LPU64" for id "LPU64
+               CDEBUG(D_QUOTA, "%s: update granted to %llu for id %llu"
                       "\n", qqi->qqi_qsd->qsd_svname, slv_rec->qsr_granted,
                       qid->qid_uid);
        }
@@ -290,8 +286,8 @@ int qsd_update_index(const struct lu_env *env, struct qsd_qtype_info *qqi,
 out:
        dt_trans_stop(env, qqi->qqi_qsd->qsd_dev, th);
        if (rc)
-               CERROR("%s: failed to update %s index copy for id "LPU64", rc:"
-                      "%d\n", qqi->qqi_qsd->qsd_svname,
+               CERROR("%s: failed to update %s index copy for id %llu, : rc = %d\n",
+                      qqi->qqi_qsd->qsd_svname,
                       global ? "global" : "slave", qid->qid_uid, rc);
        else if (flags == LQUOTA_SET_VER)
                qsd_bump_version(qqi, ver, global);
@@ -313,14 +309,11 @@ out:
 int qsd_update_lqe(const struct lu_env *env, struct lquota_entry *lqe,
                   bool global, void *rec)
 {
-       struct qsd_qtype_info *qqi;
        ENTRY;
 
        LASSERT(lqe != NULL);
        LASSERT(!lqe_is_master(lqe));
 
-       qqi = lqe2qqi(lqe);
-
        /* updating lqe is always serialized, no locking needed. */
        if (global) {
                struct lquota_glb_rec *glb_rec = (struct lquota_glb_rec *)rec;
@@ -329,15 +322,15 @@ int qsd_update_lqe(const struct lu_env *env, struct lquota_entry *lqe,
                lqe->lqe_enforced = (glb_rec->qbr_hardlimit ||
                                     glb_rec->qbr_softlimit) ? true : false;
 
-               LQUOTA_DEBUG(lqe, "updating global index hardlimit: "LPU64", "
-                            "softlimit: "LPU64, glb_rec->qbr_hardlimit,
+               LQUOTA_DEBUG(lqe, "updating global index hardlimit: %llu, "
+                            "softlimit: %llu", glb_rec->qbr_hardlimit,
                             glb_rec->qbr_softlimit);
        } else {
                struct lquota_slv_rec *slv_rec = (struct lquota_slv_rec *)rec;
 
                lqe->lqe_granted = slv_rec->qsr_granted;
 
-               LQUOTA_DEBUG(lqe, "updating slave index, granted:"LPU64"",
+               LQUOTA_DEBUG(lqe, "updating slave index, granted:%llu",
                             slv_rec->qsr_granted);
        }