2013-12-05 02:41:46

by Kinglong Mee

Subject: [PATCH] Define op_iattr for nfsd4_open instead using macro

Signed-off-by: Kinglong Mee <[email protected]>
---
fs/nfsd/xdr4.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h
index b3ed644..e603cdd 100644
--- a/fs/nfsd/xdr4.h
+++ b/fs/nfsd/xdr4.h
@@ -228,7 +228,7 @@ struct nfsd4_open {
u32 op_create; /* request */
u32 op_createmode; /* request */
u32 op_bmval[3]; /* request */
- struct iattr iattr; /* UNCHECKED4, GUARDED4, EXCLUSIVE4_1 */
+ struct iattr op_iattr; /* UNCHECKED4, GUARDED4, EXCLUSIVE4_1 */
nfs4_verifier op_verf __attribute__((aligned(32)));
/* EXCLUSIVE4 */
clientid_t op_clientid; /* request */
@@ -250,7 +250,6 @@ struct nfsd4_open {
struct nfs4_acl *op_acl;
struct xdr_netobj op_label;
};
-#define op_iattr iattr

struct nfsd4_open_confirm {
stateid_t oc_req_stateid /* request */;
--
1.8.4.2

2013-12-05 14:56:08

by J. Bruce Fields

Subject: Re: [PATCH] Define op_iattr for nfsd4_open instead using macro

Thanks, applying.--b.

On Thu, Dec 05, 2013 at 10:41:40AM +0800, Kinglong Mee wrote:
>
> Signed-off-by: Kinglong Mee <[email protected]>
> ---
> fs/nfsd/xdr4.h | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h
> index b3ed644..e603cdd 100644
> --- a/fs/nfsd/xdr4.h
> +++ b/fs/nfsd/xdr4.h
> @@ -228,7 +228,7 @@ struct nfsd4_open {
> u32 op_create; /* request */
> u32 op_createmode; /* request */
> u32 op_bmval[3]; /* request */
> - struct iattr iattr; /* UNCHECKED4, GUARDED4, EXCLUSIVE4_1 */
> + struct iattr op_iattr; /* UNCHECKED4, GUARDED4, EXCLUSIVE4_1 */
> nfs4_verifier op_verf __attribute__((aligned(32)));
> /* EXCLUSIVE4 */
> clientid_t op_clientid; /* request */
> @@ -250,7 +250,6 @@ struct nfsd4_open {
> struct nfs4_acl *op_acl;
> struct xdr_netobj op_label;
> };
> -#define op_iattr iattr
>
> struct nfsd4_open_confirm {
> stateid_t oc_req_stateid /* request */;
> --
> 1.8.4.2