From 3ff69309fed8ac3755864addfa064b51abfcde06 Mon Sep 17 00:00:00 2001 From: Kinglong Mee Date: Thu, 5 Dec 2013 10:41:40 +0800 Subject: Define op_iattr for nfsd4_open instead using macro Signed-off-by: Kinglong Mee Signed-off-by: J. Bruce Fields --- fs/nfsd/xdr4.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'fs/nfsd') diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h index 916a40737313..d278a0d03496 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 */; -- cgit v1.2.1