From e4af835b203bd80ad6c15058241d6f166a4c7257 Mon Sep 17 00:00:00 2001 From: tianzy Date: Mon, 17 Nov 2008 06:19:45 +0000 Subject: [PATCH] Branch b1_8_gate fix the error handling on quota slaves i=johann i=panda --- lustre/quota/quota_context.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lustre/quota/quota_context.c b/lustre/quota/quota_context.c index e79fef92..47bdf55 100644 --- a/lustre/quota/quota_context.c +++ b/lustre/quota/quota_context.c @@ -672,10 +672,6 @@ struct dqacq_async_args { struct lustre_qunit *aa_qunit; }; -#define QUOTA_NOSENT(rc) \ - (rc == -EIO || rc == -EINTR || rc == -ENOTCONN || \ - rc == -ETIMEDOUT || rc == -EWOULDBLOCK) - static int dqacq_interpret(struct ptlrpc_request *req, void *data, int rc) { struct dqacq_async_args *aa = (struct dqacq_async_args *)data; @@ -700,7 +696,7 @@ static int dqacq_interpret(struct ptlrpc_request *req, void *data, int rc) * this situation we should get qdata from request instead of * reply */ rc1 = quota_get_qdata(req, qdata, - QUOTA_NOSENT(rc) ? QUOTA_REQUEST : QUOTA_REPLY, + (rc != 0) ? QUOTA_REQUEST : QUOTA_REPLY, QUOTA_IMPORT); if (rc1 < 0) { DEBUG_REQ(D_ERROR, req, -- 1.8.3.1