From fdce92e184608c0e2c67aff88bcb020e284704d2 Mon Sep 17 00:00:00 2001 From: adilger Date: Thu, 7 Oct 2004 17:01:23 +0000 Subject: [PATCH] Branch: b1_2 Don't clear GRANT flag for a grant we just set. b=3751 --- lustre/ChangeLog | 1 + lustre/obdfilter/filter_io.c | 8 +++++--- lustre/utils/lconf | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 983ead3..cf0f99a 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -11,6 +11,7 @@ tbd Cluster File Systems, Inc. - don't unlink "objects" from directory with default EA (4554) - hold socknal file ref over connect in case target is down (4394) - allow more than 32000 subdirectories in a single directory (3244) + - fix blocks count for O_DIRECT writes (3751) - OST returns ENOSPC from object create when no space left (4539) - don't send truncate RPC if file size isn't changing (4410) - limit OSC precreate to 1/2 of value OST considers bogus (4778) diff --git a/lustre/obdfilter/filter_io.c b/lustre/obdfilter/filter_io.c index 43d0ed7..4a82206 100644 --- a/lustre/obdfilter/filter_io.c +++ b/lustre/obdfilter/filter_io.c @@ -601,10 +601,12 @@ static int filter_preprw_write(int cmd, struct obd_export *exp, struct obdo *oa, /* We're finishing using body->oa as an input variable, so reset * o_valid here. */ - if (oa && oa->o_valid & OBD_MD_FLGRANT) + if (oa && oa->o_valid & OBD_MD_FLGRANT) { oa->o_grant = filter_grant(exp,oa->o_grant,oa->o_undirty,left); - - oa->o_valid = 0; + oa->o_valid = OBD_MD_FLGRANT; + } else if (oa) { + oa->o_valid = 0; + } spin_unlock(&exp->exp_obd->obd_osfs_lock); diff --git a/lustre/utils/lconf b/lustre/utils/lconf index 082baaa..cb8d14a 100755 --- a/lustre/utils/lconf +++ b/lustre/utils/lconf @@ -441,7 +441,7 @@ class LCTLInterface: def connect(self, srv): self.add_uuid(srv.net_type, srv.nid_uuid, srv.nid) if srv.net_type in ('tcp',) and not config.lctl_dump: - flags = 's' + flags = 'se' if srv.irq_affinity: flags = flags + 'i' self.add_autoconn(srv.net_type, srv.send_mem, srv.recv_mem, -- 1.8.3.1