Return-Path: Received: from cn.fujitsu.com ([222.73.24.84]:59063 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752174Ab1BQJCP (ORCPT ); Thu, 17 Feb 2011 04:02:15 -0500 Message-ID: <4D5CE432.10304@cn.fujitsu.com> Date: Thu, 17 Feb 2011 17:02:42 +0800 From: Mi Jinlong To: Chuck Lever CC: NFS , andros@netapp.com, bhalevy@panasas.com Subject: [PATCH] nfsd41: modify the members value of nfsd4_op_flags Content-Type: text/plain; charset=ISO-2022-JP Sender: linux-nfs-owner@vger.kernel.org List-ID: MIME-Version: 1.0 The members of nfsd4_op_flags, (ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS) equals to ALLOWED_AS_FIRST_OP, maybe that's not what we want. OP_PUTROOTFH with op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS, can't appears as the first operation with out SEQUENCE ops. This patch modify the wrong value of ALLOWED_WITHOUT_FH etc which was introduced by f9bb94c4. Signed-off-by: Mi Jinlong --- fs/nfsd/nfs4proc.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index db52546..8605d38 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -983,9 +983,9 @@ static inline void nfsd4_increment_op_stats(u32 opnum) typedef __be32(*nfsd4op_func)(struct svc_rqst *, struct nfsd4_compound_state *, void *); enum nfsd4_op_flags { - ALLOWED_WITHOUT_FH = 1 << 0, /* No current filehandle required */ - ALLOWED_ON_ABSENT_FS = 2 << 0, /* ops processed on absent fs */ - ALLOWED_AS_FIRST_OP = 3 << 0, /* ops reqired first in compound */ + ALLOWED_WITHOUT_FH = 1 << 1, /* No current filehandle required */ + ALLOWED_ON_ABSENT_FS = 1 << 2, /* ops processed on absent fs */ + ALLOWED_AS_FIRST_OP = 1 << 3, /* ops reqired first in compound */ }; struct nfsd4_operation { -- 1.7.4.1