From 50d6f02a72434bff9c87c1a8461ad8e0f33ec8ce Mon Sep 17 00:00:00 2001
From: girish <girish>
Date: Sat, 6 Sep 2008 11:45:11 +0000
Subject: [PATCH] Revert the changes made for bug-fix (16526)
---
lustre/llite/llite_lib.c | 4 ++--
lustre/mds/mds_lib.c | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index 3fa5fc803b..97f04b3bdf 100644
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -1815,8 +1815,8 @@ void ll_update_inode(struct inode *inode, struct lustre_md *md)
if (body->valid & OBD_MD_FLGID)
inode->i_gid = body->gid;
if (body->valid & OBD_MD_FLFLAGS)
- inode->i_flags = ll_ext_to_inode_flags(body->flags |
- MDS_BFLAG_EXT_FLAGS);
+ inode->i_flags = ll_ext_to_inode_flags(body->flags);
+
if (body->valid & OBD_MD_FLNLINK)
inode->i_nlink = body->nlink;
if (body->valid & OBD_MD_FLGENER)
diff --git a/lustre/mds/mds_lib.c b/lustre/mds/mds_lib.c
index 4aa3864ab5..b1bad61d85 100644
--- a/lustre/mds/mds_lib.c
+++ b/lustre/mds/mds_lib.c
@@ -93,7 +93,9 @@ void mds_pack_inode2body(struct mds_body *b, struct inode *inode)
b->blocks = inode->i_blocks;
b->uid = inode->i_uid;
b->gid = inode->i_gid;
- b->flags = ll_inode_to_ext_flags(inode->i_flags, MDS_BFLAG_EXT_FLAGS);
+ b->flags = (b->flags & MDS_BFLAG_EXT_FLAGS) |
+ ll_inode_to_ext_flags(inode->i_flags,
+ !(b->flags & MDS_BFLAG_EXT_FLAGS));
b->rdev = inode->i_rdev;
/* Return the correct link count for orphan inodes */
b->nlink = mds_inode_is_orphan(inode) ? 0 : inode->i_nlink;
--
GitLab