From cb1eec273a30c2c20b8140443f357f5e31855daa Mon Sep 17 00:00:00 2001 From: wangdi Date: Tue, 12 Dec 2006 09:18:39 +0000 Subject: [PATCH] Branch:b_new_cmd 2 typo fixes --- lustre/llite/llite_close.c | 7 +++---- lustre/obdfilter/filter.c | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lustre/llite/llite_close.c b/lustre/llite/llite_close.c index 4947776..115b0c0 100644 --- a/lustre/llite/llite_close.c +++ b/lustre/llite/llite_close.c @@ -110,7 +110,7 @@ void ll_epoch_close(struct inode *inode, struct md_op_data *op_data, ENTRY; spin_lock(&lli->lli_lock); - if (!(list_empty(&lli->lli_pending_write_llaps)) && + if (!(list_empty(&lli->lli_pending_write_llaps)) && !(lli->lli_flags & LLIF_EPOCH_PENDING)) { LASSERT(*och != NULL); LASSERT(lli->lli_pending_och == NULL); @@ -119,7 +119,7 @@ void ll_epoch_close(struct inode *inode, struct md_op_data *op_data, lli->lli_flags |= LLIF_EPOCH_PENDING; lli->lli_pending_och = *och; spin_unlock(&lli->lli_lock); - + inode = igrab(inode); LASSERT(inode); GOTO(out, 0); @@ -133,8 +133,7 @@ void ll_epoch_close(struct inode *inode, struct md_op_data *op_data, LASSERT(lli->lli_flags & LLIF_SOM_DIRTY); *och = lli->lli_pending_och; lli->lli_pending_och = NULL; - lli->lli_flags &= ~(LLIF_DONE_WRITING | LLIF_EPOCH_PENDING | - LLIF_EPOCH_PENDING); + lli->lli_flags &= ~(LLIF_DONE_WRITING | LLIF_EPOCH_PENDING); } else { /* Pack Size-on-MDS inode attributes only if they has changed */ if (!(lli->lli_flags & LLIF_SOM_DIRTY)) { diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c index 343289c..8e9b7f4 100644 --- a/lustre/obdfilter/filter.c +++ b/lustre/obdfilter/filter.c @@ -3590,7 +3590,7 @@ cleanup: FSFILT_OP_UNLINK); CDEBUG(rc ? D_ERROR : D_QUOTA, - "filter adjust qunit! (rc:%d)\n", rc2); + "filter adjust qunit! (rc:%d)\n", rc? rc : rc2); return rc; } -- 1.8.3.1