LU-3285 lvbo: pass lock as parameter to lvbo_update()

[fs/lustre-release.git] / lustre / ofd / ofd_lvb.c

diff --git a/lustre/ofd/ofd_lvb.c b/lustre/ofd/ofd_lvb.c
index ec1cae3..c4e43b4 100644 (file)
--- a/lustre/ofd/ofd_lvb.c
+++ b/lustre/ofd/ofd_lvb.c
@@ -23,7 +23,7 @@
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2014 Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -77,7 +77,7 @@ static int ofd_lvbo_free(struct ldlm_resource *res)
  *
  * Called with res->lr_lvb_sem held.
  *
- * \param[in] res      LDLM resource
+ * \param[in] lock     LDLM lock on resource
  *
  * \retval             0 on successful setup
  * \retval             negative value on error
@@ -133,8 +133,8 @@ static int ofd_lvbo_init(struct ldlm_resource *res)
        lvb->lvb_atime = info->fti_attr.la_atime;
        lvb->lvb_ctime = info->fti_attr.la_ctime;
 
-       CDEBUG(D_DLMTRACE, "res: "DFID" initial lvb size: "LPU64", "
-              "mtime: "LPX64", blocks: "LPX64"\n",
+       CDEBUG(D_DLMTRACE, "res: "DFID" initial lvb size: %llu, "
+              "mtime: %#llx, blocks: %#llx\n",
               PFID(&info->fti_fid), lvb->lvb_size,
               lvb->lvb_mtime, lvb->lvb_blocks);
 
@@ -172,14 +172,14 @@ out_env:
  *  \a req != NULL : called by the DLM itself after a glimpse callback
  *  \a req == NULL : called by the OFD after a disk write
  *
- * \param[in] res              LDLM resource
+ * \param[in] lock             LDLM lock
  * \param[in] req              PTLRPC request
  * \param[in] increase_only    don't allow LVB values to decrease
  *
  * \retval             0 on successful setup
  * \retval             negative value on error
  */
-static int ofd_lvbo_update(struct ldlm_resource *res,
+static int ofd_lvbo_update(struct ldlm_resource *res, struct ldlm_lock *lock,
                           struct ptlrpc_request *req, int increase_only)
 {
        struct ofd_device       *ofd;
@@ -244,31 +244,31 @@ static int ofd_lvbo_update(struct ldlm_resource *res,
                lock_res(res);
                if (rpc_lvb->lvb_size > lvb->lvb_size || !increase_only) {
                        CDEBUG(D_DLMTRACE, "res: "DFID" updating lvb size: "
-                              LPU64" -> "LPU64"\n", PFID(&info->fti_fid),
+                              "%llu -> %llu\n", PFID(&info->fti_fid),
                               lvb->lvb_size, rpc_lvb->lvb_size);
                        lvb->lvb_size = rpc_lvb->lvb_size;
                }
                if (rpc_lvb->lvb_mtime > lvb->lvb_mtime || !increase_only) {
                        CDEBUG(D_DLMTRACE, "res: "DFID" updating lvb mtime: "
-                              LPU64" -> "LPU64"\n", PFID(&info->fti_fid),
+                              "%llu -> %llu\n", PFID(&info->fti_fid),
                               lvb->lvb_mtime, rpc_lvb->lvb_mtime);
                        lvb->lvb_mtime = rpc_lvb->lvb_mtime;
                }
                if (rpc_lvb->lvb_atime > lvb->lvb_atime || !increase_only) {
                        CDEBUG(D_DLMTRACE, "res: "DFID" updating lvb atime: "
-                              LPU64" -> "LPU64"\n", PFID(&info->fti_fid),
+                              "%llu -> %llu\n", PFID(&info->fti_fid),
                               lvb->lvb_atime, rpc_lvb->lvb_atime);
                        lvb->lvb_atime = rpc_lvb->lvb_atime;
                }
                if (rpc_lvb->lvb_ctime > lvb->lvb_ctime || !increase_only) {
                        CDEBUG(D_DLMTRACE, "res: "DFID" updating lvb ctime: "
-                              LPU64" -> "LPU64"\n", PFID(&info->fti_fid),
+                              "%llu -> %llu\n", PFID(&info->fti_fid),
                               lvb->lvb_ctime, rpc_lvb->lvb_ctime);
                        lvb->lvb_ctime = rpc_lvb->lvb_ctime;
                }
                if (rpc_lvb->lvb_blocks > lvb->lvb_blocks || !increase_only) {
                        CDEBUG(D_DLMTRACE, "res: "DFID" updating lvb blocks: "
-                              LPU64" -> "LPU64"\n", PFID(&info->fti_fid),
+                              "%llu -> %llu\n", PFID(&info->fti_fid),
                               lvb->lvb_blocks, rpc_lvb->lvb_blocks);
                        lvb->lvb_blocks = rpc_lvb->lvb_blocks;
                }
@@ -290,32 +290,32 @@ disk_update:
        lock_res(res);
        if (info->fti_attr.la_size > lvb->lvb_size || !increase_only) {
                CDEBUG(D_DLMTRACE, "res: "DFID" updating lvb size from disk: "
-                      LPU64" -> %llu\n", PFID(&info->fti_fid),
+                      "%llu -> %llu\n", PFID(&info->fti_fid),
                       lvb->lvb_size, info->fti_attr.la_size);
                lvb->lvb_size = info->fti_attr.la_size;
        }
 
        if (info->fti_attr.la_mtime >lvb->lvb_mtime || !increase_only) {
                CDEBUG(D_DLMTRACE, "res: "DFID" updating lvb mtime from disk: "
-                      LPU64" -> "LPU64"\n", PFID(&info->fti_fid),
+                      "%llu -> %llu\n", PFID(&info->fti_fid),
                       lvb->lvb_mtime, info->fti_attr.la_mtime);
                lvb->lvb_mtime = info->fti_attr.la_mtime;
        }
        if (info->fti_attr.la_atime >lvb->lvb_atime || !increase_only) {
                CDEBUG(D_DLMTRACE, "res: "DFID" updating lvb atime from disk: "
-                      LPU64" -> "LPU64"\n", PFID(&info->fti_fid),
+                      "%llu -> %llu\n", PFID(&info->fti_fid),
                       lvb->lvb_atime, info->fti_attr.la_atime);
                lvb->lvb_atime = info->fti_attr.la_atime;
        }
        if (info->fti_attr.la_ctime >lvb->lvb_ctime || !increase_only) {
                CDEBUG(D_DLMTRACE, "res: "DFID" updating lvb ctime from disk: "
-                      LPU64" -> "LPU64"\n", PFID(&info->fti_fid),
+                      "%llu -> %llu\n", PFID(&info->fti_fid),
                       lvb->lvb_ctime, info->fti_attr.la_ctime);
                lvb->lvb_ctime = info->fti_attr.la_ctime;
        }
        if (info->fti_attr.la_blocks > lvb->lvb_blocks || !increase_only) {
                CDEBUG(D_DLMTRACE, "res: "DFID" updating lvb blocks from disk: "
-                      LPU64" -> %llu\n", PFID(&info->fti_fid), lvb->lvb_blocks,
+                      "%llu -> %llu\n", PFID(&info->fti_fid), lvb->lvb_blocks,
                       (unsigned long long)info->fti_attr.la_blocks);
                lvb->lvb_blocks = info->fti_attr.la_blocks;
        }