X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Flov%2Flov_merge.c;h=fdd160fca411ecf8156c46f7c6552c4aa6881c0e;hb=2b23ad0d183141dc25377f2d37de6e6e36ba1169;hp=e52a349651daf259485519d490c76718e3bdf966;hpb=98060d83459ba10409f295898f0ec917f938b4d3;p=fs%2Flustre-release.git

diff --git a/lustre/lov/lov_merge.c b/lustre/lov/lov_merge.c
index e52a349..fdd160f 100644
--- a/lustre/lov/lov_merge.c
+++ b/lustre/lov/lov_merge.c
@@ -64,9 +64,9 @@ int lov_merge_lvb_kms(struct lov_stripe_md *lsm,
 	int i;
 	int rc = 0;
 
-	LASSERT_SPIN_LOCKED(&lsm->lsm_lock);
+	LASSERT(spin_is_locked(&lsm->lsm_lock));
 #ifdef __KERNEL__
-	LASSERT(lsm->lsm_lock_owner == cfs_curproc_pid());
+	LASSERT(lsm->lsm_lock_owner == current_pid());
 #endif
 
 	CDEBUG(D_INODE, "MDT ID "DOSTID" initial value: s="LPU64" m="LPU64
@@ -155,9 +155,9 @@ int lov_adjust_kms(struct obd_export *exp, struct lov_stripe_md *lsm,
         __u64 kms;
         ENTRY;
 
-        LASSERT_SPIN_LOCKED(&lsm->lsm_lock);
+	LASSERT(spin_is_locked(&lsm->lsm_lock));
 #ifdef __KERNEL__
-        LASSERT(lsm->lsm_lock_owner == cfs_curproc_pid());
+	LASSERT(lsm->lsm_lock_owner == current_pid());
 #endif
 
         if (shrink) {
@@ -189,38 +189,49 @@ int lov_adjust_kms(struct obd_export *exp, struct lov_stripe_md *lsm,
 void lov_merge_attrs(struct obdo *tgt, struct obdo *src, obd_valid valid,
                      struct lov_stripe_md *lsm, int stripeno, int *set)
 {
-        valid &= src->o_valid;
-
-        if (*set) {
-                if (valid & OBD_MD_FLSIZE) {
-                        /* this handles sparse files properly */
-                        obd_size 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;
+	valid &= src->o_valid;
+
+	if (*set != 0) {
+		tgt->o_valid &= valid;
+		if (valid & OBD_MD_FLSIZE) {
+			/* this handles sparse files properly */
+			obd_size 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;
+	/* 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;
+	*set += 1;
 }