LU-7890 lov: Ensure correct operation for large object sizes

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

diff --git a/lustre/lov/lov_merge.c b/lustre/lov/lov_merge.c
index 7b1601c..b10e7a1 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, 2014, Intel Corporation.
+ * Copyright (c) 2012, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -110,53 +110,3 @@ int lov_merge_lvb_kms(struct lov_stripe_md *lsm,
         lvb->lvb_ctime = current_ctime;
         RETURN(rc);
 }
-
-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;
-
-       if (*set != 0) {
-               tgt->o_valid &= valid;
-               if (valid & OBD_MD_FLSIZE) {
-                       /* this handles sparse files properly */
-                       u64 lov_size;
-
-                       lov_size = lov_stripe_size(lsm, src->o_size, stripeno);
-                       if (lov_size > tgt->o_size)
-                               tgt->o_size = lov_size;
-               }
-               if (valid & OBD_MD_FLBLOCKS)
-                       tgt->o_blocks += src->o_blocks;
-               if (valid & OBD_MD_FLBLKSZ)
-                       tgt->o_blksize += src->o_blksize;
-               if (valid & OBD_MD_FLCTIME && tgt->o_ctime < src->o_ctime)
-                       tgt->o_ctime = src->o_ctime;
-               if (valid & OBD_MD_FLMTIME && tgt->o_mtime < src->o_mtime)
-                       tgt->o_mtime = src->o_mtime;
-               if (valid & OBD_MD_FLDATAVERSION)
-                       tgt->o_data_version += src->o_data_version;
-
-               /* handle flags */
-               if (valid & OBD_MD_FLFLAGS)
-                       tgt->o_flags &= src->o_flags;
-               else
-                       tgt->o_flags = 0;
-       } else {
-               memcpy(tgt, src, sizeof(*tgt));
-               tgt->o_oi = lsm->lsm_oi;
-               tgt->o_valid = valid;
-               if (valid & OBD_MD_FLSIZE)
-                       tgt->o_size = lov_stripe_size(lsm, src->o_size,
-                                                     stripeno);
-               tgt->o_flags = 0;
-               if (valid & OBD_MD_FLFLAGS)
-                       tgt->o_flags = src->o_flags;
-       }
-
-       /* data_version needs to be valid on all stripes to be correct! */
-       if (!(valid & OBD_MD_FLDATAVERSION))
-               tgt->o_valid &= ~OBD_MD_FLDATAVERSION;
-
-       *set += 1;
-}