LU-6349 ptlrpc: remove old protocol compatibility

[fs/lustre-release.git] / lustre / lov / lov_merge.c

diff --git a/lustre/lov/lov_merge.c b/lustre/lov/lov_merge.c
index fd74179..7b1601c 100644 (file)
--- a/lustre/lov/lov_merge.c
+++ b/lustre/lov/lov_merge.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -36,11 +36,7 @@
 
 #define DEBUG_SUBSYSTEM S_LOV
 
-#ifdef __KERNEL__
 #include <libcfs/libcfs.h>
-#else
-#include <liblustre.h>
-#endif
 
 #include <obd_class.h>
 #include "lov_internal.h"
@@ -53,27 +49,26 @@
 int lov_merge_lvb_kms(struct lov_stripe_md *lsm,
                       struct ost_lvb *lvb, __u64 *kms_place)
 {
-       __u64 size = 0;
-       __u64 kms = 0;
-       __u64 blocks = 0;
-       obd_time current_mtime = lvb->lvb_mtime;
-       obd_time current_atime = lvb->lvb_atime;
-       obd_time current_ctime = lvb->lvb_ctime;
+       u64 size = 0;
+       u64 kms = 0;
+       u64 blocks = 0;
+       s64 current_mtime = lvb->lvb_mtime;
+       s64 current_atime = lvb->lvb_atime;
+       s64 current_ctime = lvb->lvb_ctime;
        int i;
        int rc = 0;
 
        assert_spin_locked(&lsm->lsm_lock);
-#ifdef __KERNEL__
        LASSERT(lsm->lsm_lock_owner == current_pid());
-#endif
 
        CDEBUG(D_INODE, "MDT ID "DOSTID" initial value: s="LPU64" m="LPU64
               " a="LPU64" c="LPU64" b="LPU64"\n", POSTID(&lsm->lsm_oi),
               lvb->lvb_size, lvb->lvb_mtime, lvb->lvb_atime, lvb->lvb_ctime,
               lvb->lvb_blocks);
        for (i = 0; i < lsm->lsm_stripe_count; i++) {
-                struct lov_oinfo *loi = lsm->lsm_oinfo[i];
-                obd_size lov_size, tmpsize;
+               struct lov_oinfo *loi = lsm->lsm_oinfo[i];
+               u64 lov_size;
+               u64 tmpsize;
 
                 if (OST_LVB_IS_ERR(loi->loi_lvb.lvb_blocks)) {
                         rc = OST_LVB_GET_ERR(loi->loi_lvb.lvb_blocks);
@@ -116,8 +111,8 @@ int lov_merge_lvb_kms(struct lov_stripe_md *lsm,
         RETURN(rc);
 }
 
-void lov_merge_attrs(struct obdo *tgt, struct obdo *src, obd_valid valid,
-                     struct lov_stripe_md *lsm, int stripeno, int *set)
+void lov_merge_attrs(struct obdo *tgt, struct obdo *src, u64 valid,
+                    struct lov_stripe_md *lsm, int stripeno, int *set)
 {
        valid &= src->o_valid;
 
@@ -125,7 +120,7 @@ void lov_merge_attrs(struct obdo *tgt, struct obdo *src, obd_valid valid,
                tgt->o_valid &= valid;
                if (valid & OBD_MD_FLSIZE) {
                        /* this handles sparse files properly */
-                       obd_size lov_size;
+                       u64 lov_size;
 
                        lov_size = lov_stripe_size(lsm, src->o_size, stripeno);
                        if (lov_size > tgt->o_size)