2013-03-11 02:55:50

by Yanchuan Nian

[permalink] [raw]
Subject: [PATCH v2] nfsd: rmmove unused macro in nfsv4

From: Yanchuan Nian <[email protected]>

lk_rflags is never used anywhere, and rflags is not defined in struct
nfsd4_lock. Very sorry for my negligence in last version. Maybe I am tired.

Signed-off-by: Yanchuan Nian <[email protected]>
---
fs/nfsd/xdr4.h | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h
index 0889bfb..326724a 100644
--- a/fs/nfsd/xdr4.h
+++ b/fs/nfsd/xdr4.h
@@ -184,7 +184,6 @@ struct nfsd4_lock {
#define lk_old_lock_stateid v.old.lock_stateid
#define lk_old_lock_seqid v.old.lock_seqid

-#define lk_rflags u.ok.rflags
#define lk_resp_stateid u.ok.stateid
#define lk_denied u.denied

--
1.7.4.4


2013-03-11 14:43:44

by J. Bruce Fields

[permalink] [raw]
Subject: Re: [PATCH v2] nfsd: rmmove unused macro in nfsv4

On Mon, Mar 11, 2013 at 10:43:26AM +0800, [email protected] wrote:
> From: Yanchuan Nian <[email protected]>
>
> lk_rflags is never used anywhere, and rflags is not defined in struct
> nfsd4_lock. Very sorry for my negligence in last version. Maybe I am tired.

Applying for 3.10, thanks.--b.

>
> Signed-off-by: Yanchuan Nian <[email protected]>
> ---
> fs/nfsd/xdr4.h | 1 -
> 1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h
> index 0889bfb..326724a 100644
> --- a/fs/nfsd/xdr4.h
> +++ b/fs/nfsd/xdr4.h
> @@ -184,7 +184,6 @@ struct nfsd4_lock {
> #define lk_old_lock_stateid v.old.lock_stateid
> #define lk_old_lock_seqid v.old.lock_seqid
>
> -#define lk_rflags u.ok.rflags
> #define lk_resp_stateid u.ok.stateid
> #define lk_denied u.denied
>
> --
> 1.7.4.4
>