Received: by 2002:a05:7412:b795:b0:e2:908c:2ebd with SMTP id iv21csp303685rdb; Thu, 2 Nov 2023 04:26:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEpYqoxL4fybmcuxtyRpMY1wX1Vqs3RNaf6V6AHZFClJGmON5061vzmXLvaxZOiaQNcPChz X-Received: by 2002:a17:902:dac3:b0:1cc:2c45:757a with SMTP id q3-20020a170902dac300b001cc2c45757amr18974854plx.10.1698924380042; Thu, 02 Nov 2023 04:26:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698924379; cv=none; d=google.com; s=arc-20160816; b=msr7/cXvh5K6ET8JflfvrJxe/2FkWFWNyZO40tdsgYWd/FeLXrnjUO6s1UojvfmAqR vSDLkJl92pka+ple0WguKVnYVruqxqUO5ladpVWgxy5wGgJLhuSMJdJjUYc+VoVBz7k+ laBaDO0KldDz3qFC369RX3EJZ0ZRgGu+E5kSg79YZm7w6A31/Y7wfIcbNjffAUb174Yd qunFYh1j37dvD5FMQI5vUudbqWt6pc/x6A+XFfilVEZ7tABfjTBsAwmCl/FwaGeCozJo 2HduBpXhesUgzNbltJZKCZA2mAaZcE/BSiIxlwAvxuP7qJ/Zjjowbr2cJ7iz5LRRvOTL qk7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:user-agent :content-transfer-encoding:references:in-reply-to:date:cc:to:from :subject:message-id:dkim-signature; bh=D4NMRQb2DzaBztNLuZXx9llc+GBI2YaAsOhbffLNC3k=; fh=OcKsFOYHXkFUuroZFv0kDoaH9wMEljnKMGoW5XIvX+Q=; b=G95PxZ58hItUXSffbG8xaEdT8mcZZDE8cQjvpWUD3k+OqPEgJMYlIvEEoBgd2Ua5Lt YWc2ERiYC4sbCTVlY3AJwqE20rbavQPJnXq6Y6gAEYouSuoUME0OHS3xbAv15SWe06nz hNxSoCa10guUi6N62sDnTnOL9Dk6Ts0bQj3GNjBH1DqziEvb3QsWHTlNasMp0kwnxkDi D736lDX0yWKSv/TLpmMsaK5beJxSGiBMdoA5sto9BpG6HTlPwTL+Ikqw5XYtk7TptiS5 1ODTDU/r6ZBLxFMs+xMDiQYOzFxwI8s7yqHqiUEB/9z8YlSNyoAVaRPzV1TXkxFjNnxO fxKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=B5CznCPe; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id w1-20020a170902d10100b001c589ba4a0bsi4530224plw.195.2023.11.02.04.26.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Nov 2023 04:26:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=B5CznCPe; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 0D74C8029566; Thu, 2 Nov 2023 04:26:16 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347360AbjKBL0A (ORCPT + 99 others); Thu, 2 Nov 2023 07:26:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38860 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347339AbjKBLZ7 (ORCPT ); Thu, 2 Nov 2023 07:25:59 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 576E0137 for ; Thu, 2 Nov 2023 04:25:56 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 64F6DC433C7; Thu, 2 Nov 2023 11:25:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698924356; bh=zjnfkjvm+MhA640KFMpUCjD/ixLHzL/dfZNjEllMP40=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=B5CznCPetxzQTmLjC4plTWGB26g/6zP+hy18BG+2H/DtZP0Zki+DMG7JD0H/urDZx WSE2g55Hgjc1yAL6cPheEn4qyjcBN+tWOs08pJEIqBT/gimZtzzzD65pWG8IRUQQSM 6bE4suB09GnqitZtdw1ob34+e2IjOfQDaTGdlWnGYWznZ5O0f62fQrLyttPD+cnEFc suugUJo4Mvpq+ZR87Ee0YbiS3dqm9OX/jVm2TrYwcUBcpUqg87JUGJg4bihDqoMWJn 7arkMJ4IVJA6snd/JBSsIO3dWwjr/uXHQlnA0c2ZnoqXT7dicbu/v9gdXvKdmQ+ciE UNT2Fy2qaT5kw== Message-ID: <3b5d0e59d3889339c263b284a5663c6264c47da8.camel@kernel.org> Subject: Re: [PATCH 1/6] nfsd: prepare for supporting admin-revocation of state From: Jeff Layton To: NeilBrown , Chuck Lever Cc: linux-nfs@vger.kernel.org, Olga Kornievskaia , Dai Ngo , Tom Talpey Date: Thu, 02 Nov 2023 07:25:54 -0400 In-Reply-To: <20231101010049.27315-2-neilb@suse.de> References: <20231101010049.27315-1-neilb@suse.de> <20231101010049.27315-2-neilb@suse.de> Content-Type: text/plain; charset="ISO-8859-15" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 (3.48.4-1.fc38) MIME-Version: 1.0 X-Spam-Status: No, score=-1.6 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Thu, 02 Nov 2023 04:26:16 -0700 (PDT) On Wed, 2023-11-01 at 11:57 +1100, NeilBrown wrote: > The NFSv4 protocol allows state to be revoked by the admin and has error > codes which allow this to be communicated to the client. >=20 > This patch > - introduces 3 new state-id types for revoked open, lock, and > delegation state. This requires the bitmask to be 'short', > not 'char' > - reports NFS4ERR_ADMIN_REVOKED when these are accessed > - introduces a per-client counter of these states and returns > SEQ4_STATUS_ADMIN_STATE_REVOKED when the counter is not zero. > Decrement this when freeing any admin-revoked state. > - introduces stub code to find all interesting states for a given > superblock so they can be revoked via the 'unlock_filesystem' > file in /proc/fs/nfsd/ > No actual states are handled yet. >=20 > Signed-off-by: NeilBrown > --- > fs/nfsd/nfs4layouts.c | 2 +- > fs/nfsd/nfs4state.c | 93 +++++++++++++++++++++++++++++++++++++++---- > fs/nfsd/nfsctl.c | 1 + > fs/nfsd/nfsd.h | 1 + > fs/nfsd/state.h | 35 +++++++++++----- > fs/nfsd/trace.h | 8 +++- > 6 files changed, 120 insertions(+), 20 deletions(-) >=20 > diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c > index 5e8096bc5eaa..09d0363bfbc4 100644 > --- a/fs/nfsd/nfs4layouts.c > +++ b/fs/nfsd/nfs4layouts.c > @@ -269,7 +269,7 @@ nfsd4_preprocess_layout_stateid(struct svc_rqst *rqst= p, > { > struct nfs4_layout_stateid *ls; > struct nfs4_stid *stid; > - unsigned char typemask =3D NFS4_LAYOUT_STID; > + unsigned short typemask =3D NFS4_LAYOUT_STID; > __be32 status; > =20 > if (create) > diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c > index 65fd5510323a..f3ba53a16105 100644 > --- a/fs/nfsd/nfs4state.c > +++ b/fs/nfsd/nfs4state.c > @@ -1202,6 +1202,13 @@ alloc_init_deleg(struct nfs4_client *clp, struct n= fs4_file *fp, > return NULL; > } > =20 > +void nfs4_unhash_stid(struct nfs4_stid *s) > +{ > + if (s->sc_type & NFS4_ALL_ADMIN_REVOKED_STIDS) > + atomic_dec(&s->sc_client->cl_admin_revoked); > + s->sc_type =3D 0; > +} > + Another thing that would be helpful to clarify here is the locking (if any) around sc_type. Currently, it's just a bare non-atomic variable, but we do change it occasionally and it has never been clear whether and how it should be protected. Any thoughts? > void > nfs4_put_stid(struct nfs4_stid *s) > { > @@ -1215,6 +1222,7 @@ nfs4_put_stid(struct nfs4_stid *s) > return; > } > idr_remove(&clp->cl_stateids, s->sc_stateid.si_opaque.so_id); > + nfs4_unhash_stid(s); > nfs4_free_cpntf_statelist(clp->net, s); > spin_unlock(&clp->cl_lock); > s->sc_free(s); > @@ -1265,11 +1273,6 @@ static void destroy_unhashed_deleg(struct nfs4_del= egation *dp) > nfs4_put_stid(&dp->dl_stid); > } > =20 > -void nfs4_unhash_stid(struct nfs4_stid *s) > -{ > - s->sc_type =3D 0; > -} > - > /** > * nfs4_delegation_exists - Discover if this delegation already exists > * @clp: a pointer to the nfs4_client we're granting a delegation to > @@ -1536,6 +1539,7 @@ static void put_ol_stateid_locked(struct nfs4_ol_st= ateid *stp, > } > =20 > idr_remove(&clp->cl_stateids, s->sc_stateid.si_opaque.so_id); > + nfs4_unhash_stid(s); > list_add(&stp->st_locks, reaplist); > } > =20 > @@ -1680,6 +1684,53 @@ static void release_openowner(struct nfs4_openowne= r *oo) > nfs4_put_stateowner(&oo->oo_owner); > } > =20 > +static struct nfs4_stid *find_one_sb_stid(struct nfs4_client *clp, > + struct super_block *sb, > + unsigned short sc_types) > +{ > + unsigned long id, tmp; > + struct nfs4_stid *stid; > + > + spin_lock(&clp->cl_lock); > + idr_for_each_entry_ul(&clp->cl_stateids, stid, tmp, id) > + if ((stid->sc_type & sc_types) && > + stid->sc_file->fi_inode->i_sb =3D=3D sb) { > + refcount_inc(&stid->sc_count); > + break; > + } > + spin_unlock(&clp->cl_lock); > + return stid; > +} > + > +void nfsd4_revoke_states(struct net *net, struct super_block *sb) > +{ > + struct nfsd_net *nn =3D net_generic(net, nfsd_net_id); > + unsigned int idhashval; > + unsigned short sc_types; > + > + sc_types =3D 0; > + > + spin_lock(&nn->client_lock); > + for (idhashval =3D 0; idhashval < CLIENT_HASH_MASK; idhashval++) { > + struct list_head *head =3D &nn->conf_id_hashtbl[idhashval]; > + struct nfs4_client *clp; > + retry: > + list_for_each_entry(clp, head, cl_idhash) { > + struct nfs4_stid *stid =3D find_one_sb_stid(clp, sb, > + sc_types); > + if (stid) { > + spin_unlock(&nn->client_lock); > + switch (stid->sc_type) { > + } > + nfs4_put_stid(stid); > + spin_lock(&nn->client_lock); > + goto retry; > + } > + } > + } > + spin_unlock(&nn->client_lock); > +} > + > static inline int > hash_sessionid(struct nfs4_sessionid *sessionid) > { > @@ -2465,7 +2516,8 @@ find_stateid_locked(struct nfs4_client *cl, stateid= _t *t) > } > =20 > static struct nfs4_stid * > -find_stateid_by_type(struct nfs4_client *cl, stateid_t *t, char typemask= ) > +find_stateid_by_type(struct nfs4_client *cl, stateid_t *t, > + unsigned short typemask) > { > struct nfs4_stid *s; > =20 > @@ -2549,6 +2601,8 @@ static int client_info_show(struct seq_file *m, voi= d *v) > } > seq_printf(m, "callback state: %s\n", cb_state2str(clp->cl_cb_state)); > seq_printf(m, "callback address: %pISpc\n", &clp->cl_cb_conn.cb_addr); > + seq_printf(m, "admin-revoked states: %d\n", > + atomic_read(&clp->cl_admin_revoked)); > drop_client(clp); > =20 > return 0; > @@ -4108,6 +4162,8 @@ nfsd4_sequence(struct svc_rqst *rqstp, struct nfsd4= _compound_state *cstate, > } > if (!list_empty(&clp->cl_revoked)) > seq->status_flags |=3D SEQ4_STATUS_RECALLABLE_STATE_REVOKED; > + if (atomic_read(&clp->cl_admin_revoked)) > + seq->status_flags |=3D SEQ4_STATUS_ADMIN_STATE_REVOKED; > out_no_session: > if (conn) > free_conn(conn); > @@ -5200,6 +5256,11 @@ nfs4_check_deleg(struct nfs4_client *cl, struct nf= sd4_open *open, > status =3D nfserr_deleg_revoked; > goto out; > } > + if (deleg->dl_stid.sc_type =3D=3D NFS4_ADMIN_REVOKED_DELEG_STID) { > + nfs4_put_stid(&deleg->dl_stid); > + status =3D nfserr_admin_revoked; > + goto out; > + } > flags =3D share_access_to_flags(open->op_share_access); > status =3D nfs4_check_delegmode(deleg, flags); > if (status) { > @@ -6478,6 +6539,11 @@ static __be32 nfsd4_validate_stateid(struct nfs4_c= lient *cl, stateid_t *stateid) > case NFS4_REVOKED_DELEG_STID: > status =3D nfserr_deleg_revoked; > break; > + case NFS4_ADMIN_REVOKED_STID: > + case NFS4_ADMIN_REVOKED_LOCK_STID: > + case NFS4_ADMIN_REVOKED_DELEG_STID: > + status =3D nfserr_admin_revoked; > + break; > case NFS4_OPEN_STID: > case NFS4_LOCK_STID: > status =3D nfsd4_check_openowner_confirmed(openlockstateid(s)); > @@ -6496,7 +6562,7 @@ static __be32 nfsd4_validate_stateid(struct nfs4_cl= ient *cl, stateid_t *stateid) > =20 > __be32 > nfsd4_lookup_stateid(struct nfsd4_compound_state *cstate, > - stateid_t *stateid, unsigned char typemask, > + stateid_t *stateid, unsigned short typemask, > struct nfs4_stid **s, struct nfsd_net *nn) > { > __be32 status; > @@ -6512,6 +6578,13 @@ nfsd4_lookup_stateid(struct nfsd4_compound_state *= cstate, > else if (typemask & NFS4_DELEG_STID) > typemask |=3D NFS4_REVOKED_DELEG_STID; > =20 > + if (typemask & NFS4_OPEN_STID) > + typemask |=3D NFS4_ADMIN_REVOKED_STID; > + if (typemask & NFS4_LOCK_STID) > + typemask |=3D NFS4_ADMIN_REVOKED_LOCK_STID; > + if (typemask & NFS4_DELEG_STID) > + typemask |=3D NFS4_ADMIN_REVOKED_DELEG_STID; > + > if (ZERO_STATEID(stateid) || ONE_STATEID(stateid) || > CLOSE_STATEID(stateid)) > return nfserr_bad_stateid; > @@ -6532,6 +6605,10 @@ nfsd4_lookup_stateid(struct nfsd4_compound_state *= cstate, > return nfserr_deleg_revoked; > return nfserr_bad_stateid; > } > + if (stid->sc_type & NFS4_ALL_ADMIN_REVOKED_STIDS) { > + nfs4_put_stid(stid); > + return nfserr_admin_revoked; > + } > *s =3D stid; > return nfs_ok; > } > @@ -6899,7 +6976,7 @@ static __be32 nfs4_seqid_op_checks(struct nfsd4_com= pound_state *cstate, stateid_ > */ > static __be32 > nfs4_preprocess_seqid_op(struct nfsd4_compound_state *cstate, u32 seqid, > - stateid_t *stateid, char typemask, > + stateid_t *stateid, unsigned short typemask, > struct nfs4_ol_stateid **stpp, > struct nfsd_net *nn) > { > diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c > index 739ed5bf71cd..50368eec86b0 100644 > --- a/fs/nfsd/nfsctl.c > +++ b/fs/nfsd/nfsctl.c > @@ -281,6 +281,7 @@ static ssize_t write_unlock_fs(struct file *file, cha= r *buf, size_t size) > * 3. Is that directory the root of an exported file system? > */ > error =3D nlmsvc_unlock_all_by_sb(path.dentry->d_sb); > + nfsd4_revoke_states(netns(file), path.dentry->d_sb); > =20 > path_put(&path); > return error; > diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h > index f5ff42f41ee7..d46203eac3c8 100644 > --- a/fs/nfsd/nfsd.h > +++ b/fs/nfsd/nfsd.h > @@ -280,6 +280,7 @@ void nfsd_lockd_shutdown(void); > #define nfserr_no_grace cpu_to_be32(NFSERR_NO_GRACE) > #define nfserr_reclaim_bad cpu_to_be32(NFSERR_RECLAIM_BAD) > #define nfserr_badname cpu_to_be32(NFSERR_BADNAME) > +#define nfserr_admin_revoked cpu_to_be32(NFS4ERR_ADMIN_REVOKED) > #define nfserr_cb_path_down cpu_to_be32(NFSERR_CB_PATH_DOWN) > #define nfserr_locked cpu_to_be32(NFSERR_LOCKED) > #define nfserr_wrongsec cpu_to_be32(NFSERR_WRONGSEC) > diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h > index f96eaa8e9413..3af5ab55c978 100644 > --- a/fs/nfsd/state.h > +++ b/fs/nfsd/state.h > @@ -88,17 +88,23 @@ struct nfsd4_callback_ops { > */ > struct nfs4_stid { > refcount_t sc_count; > -#define NFS4_OPEN_STID 1 > -#define NFS4_LOCK_STID 2 > -#define NFS4_DELEG_STID 4 > + struct list_head sc_cp_list; > + unsigned short sc_type; > +#define NFS4_OPEN_STID BIT(0) > +#define NFS4_LOCK_STID BIT(1) > +#define NFS4_DELEG_STID BIT(2) > /* For an open stateid kept around *only* to process close replays: */ > -#define NFS4_CLOSED_STID 8 > +#define NFS4_CLOSED_STID BIT(3) > /* For a deleg stateid kept around only to process free_stateid's: */ > -#define NFS4_REVOKED_DELEG_STID 16 > -#define NFS4_CLOSED_DELEG_STID 32 > -#define NFS4_LAYOUT_STID 64 > - struct list_head sc_cp_list; > - unsigned char sc_type; > +#define NFS4_REVOKED_DELEG_STID BIT(4) > +#define NFS4_CLOSED_DELEG_STID BIT(5) > +#define NFS4_LAYOUT_STID BIT(6) > +#define NFS4_ADMIN_REVOKED_STID BIT(7) > +#define NFS4_ADMIN_REVOKED_LOCK_STID BIT(8) > +#define NFS4_ADMIN_REVOKED_DELEG_STID BIT(9) > +#define NFS4_ALL_ADMIN_REVOKED_STIDS (NFS4_ADMIN_REVOKED_STID | \ > + NFS4_ADMIN_REVOKED_LOCK_STID | \ > + NFS4_ADMIN_REVOKED_DELEG_STID) > stateid_t sc_stateid; > spinlock_t sc_lock; > struct nfs4_client *sc_client; > @@ -372,6 +378,7 @@ struct nfs4_client { > clientid_t cl_clientid; /* generated by server */ > nfs4_verifier cl_confirm; /* generated by server */ > u32 cl_minorversion; > + atomic_t cl_admin_revoked; /* count of admin-revoked states */ > /* NFSv4.1 client implementation id: */ > struct xdr_netobj cl_nii_domain; > struct xdr_netobj cl_nii_name; > @@ -694,7 +701,7 @@ extern __be32 nfs4_preprocess_stateid_op(struct svc_r= qst *rqstp, > stateid_t *stateid, int flags, struct nfsd_file **filp, > struct nfs4_stid **cstid); > __be32 nfsd4_lookup_stateid(struct nfsd4_compound_state *cstate, > - stateid_t *stateid, unsigned char typemask, > + stateid_t *stateid, unsigned short typemask, > struct nfs4_stid **s, struct nfsd_net *nn); > struct nfs4_stid *nfs4_alloc_stid(struct nfs4_client *cl, struct kmem_ca= che *slab, > void (*sc_free)(struct nfs4_stid *)); > @@ -736,6 +743,14 @@ static inline void get_nfs4_file(struct nfs4_file *f= i) > } > struct nfsd_file *find_any_file(struct nfs4_file *f); > =20 > +#ifdef CONFIG_NFSD_V4 > +void nfsd4_revoke_states(struct net *net, struct super_block *sb); > +#else > +static inline void nfsd4_revoke_states(struct net *net, struct super_blo= ck *sb) > +{ > +} > +#endif > + > /* grace period management */ > void nfsd4_end_grace(struct nfsd_net *nn); > =20 > diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h > index fbc0ccb40424..e359d531402c 100644 > --- a/fs/nfsd/trace.h > +++ b/fs/nfsd/trace.h > @@ -648,6 +648,9 @@ TRACE_DEFINE_ENUM(NFS4_CLOSED_STID); > TRACE_DEFINE_ENUM(NFS4_REVOKED_DELEG_STID); > TRACE_DEFINE_ENUM(NFS4_CLOSED_DELEG_STID); > TRACE_DEFINE_ENUM(NFS4_LAYOUT_STID); > +TRACE_DEFINE_ENUM(NFS4_ADMIN_REVOKED_STID); > +TRACE_DEFINE_ENUM(NFS4_ADMIN_REVOKED_LOCK_STID); > +TRACE_DEFINE_ENUM(NFS4_ADMIN_REVOKED_DELEG_STID); > =20 > #define show_stid_type(x) \ > __print_flags(x, "|", \ > @@ -657,7 +660,10 @@ TRACE_DEFINE_ENUM(NFS4_LAYOUT_STID); > { NFS4_CLOSED_STID, "CLOSED" }, \ > { NFS4_REVOKED_DELEG_STID, "REVOKED" }, \ > { NFS4_CLOSED_DELEG_STID, "CLOSED_DELEG" }, \ > - { NFS4_LAYOUT_STID, "LAYOUT" }) > + { NFS4_LAYOUT_STID, "LAYOUT" }, \ > + { NFS4_ADMIN_REVOKED_STID, "ADMIN_REVOKED" }, \ > + { NFS4_ADMIN_REVOKED_LOCK_STID, "ADMIN_REVOKED_LOCK" }, \ > + { NFS4_ADMIN_REVOKED_DELEG_STID,"ADMIN_REVOKED_DELEG" }) > =20 > DECLARE_EVENT_CLASS(nfsd_stid_class, > TP_PROTO( --=20 Jeff Layton