From e0fd79365f9ec50c1b98077c8d7f0e6c2fa144e4 Mon Sep 17 00:00:00 2001
From: huanghua <huanghua>
Date: Fri, 11 Jul 2008 05:22:07 +0000
Subject: [PATCH] Branch b1_8_gate b=11930 i=adilger i=nikita.danilov i=alex
---
lustre/llite/rw.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/lustre/llite/rw.c b/lustre/llite/rw.c
index e79fa25ec2..c3e22e4d3b 100644
--- a/lustre/llite/rw.c
+++ b/lustre/llite/rw.c
@@ -119,7 +119,8 @@ int ll_file_punch(struct inode * inode, loff_t new_size, int srvlock)
oinfo.oi_policy.l_extent.end = OBD_OBJECT_EOF;
oinfo.oi_oa = &oa;
oa.o_id = lli->lli_smd->lsm_object_id;
- oa.o_valid = OBD_MD_FLID;
+ oa.o_gr = lli->lli_smd->lsm_object_gr;
+ oa.o_valid = OBD_MD_FLID | OBD_MD_FLGROUP;
if (srvlock) {
/* set OBD_MD_FLFLAGS in o_valid, only if we
* set OBD_FL_TRUNCLOCK, otherwise ost_punch
@@ -254,7 +255,9 @@ int ll_prepare_write(struct file *file, struct page *page, unsigned from,
oa.o_mode = inode->i_mode;
oa.o_id = lsm->lsm_object_id;
- oa.o_valid = OBD_MD_FLID | OBD_MD_FLMODE | OBD_MD_FLTYPE;
+ oa.o_gr = lsm->lsm_object_gr;
+ oa.o_valid = OBD_MD_FLID | OBD_MD_FLMODE |
+ OBD_MD_FLTYPE | OBD_MD_FLGROUP;
obdo_from_inode(&oa, inode, OBD_MD_FLFID | OBD_MD_FLGENER);
oinfo.oi_oa = &oa;
@@ -414,7 +417,8 @@ void ll_inode_fill_obdo(struct inode *inode, int cmd, struct obdo *oa)
lsm = ll_i2info(inode)->lli_smd;
oa->o_id = lsm->lsm_object_id;
- oa->o_valid = OBD_MD_FLID;
+ oa->o_gr = lsm->lsm_object_gr;
+ oa->o_valid = OBD_MD_FLID | OBD_MD_FLGROUP;
valid_flags = OBD_MD_FLTYPE | OBD_MD_FLATIME;
if (cmd & OBD_BRW_WRITE) {
oa->o_valid |= OBD_MD_FLEPOCH;
--
GitLab