Skip to content

Commit d594097

Browse files
amschuma-ntapTrond Myklebust
authored andcommitted
NFSv4.2: Clean up nfs4_xdr_dec_*xattr() functions
I add commends above each function to match the style of the other nfs4_xdr_dec_*() functions. I also remove the unnecessary #ifdef CONFIG_NFS_V4_2 that was added around this code, since we are already in a v4.2-only file. Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com> Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
1 parent 31f1bd8 commit d594097

1 file changed

Lines changed: 12 additions & 2 deletions

File tree

fs/nfs/nfs42xdr.c

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1562,7 +1562,9 @@ static int nfs4_xdr_dec_layouterror(struct rpc_rqst *rqstp,
15621562
return status;
15631563
}
15641564

1565-
#ifdef CONFIG_NFS_V4_2
1565+
/*
1566+
* Decode SETXATTR request
1567+
*/
15661568
static int nfs4_xdr_dec_setxattr(struct rpc_rqst *req, struct xdr_stream *xdr,
15671569
void *data)
15681570
{
@@ -1585,6 +1587,9 @@ static int nfs4_xdr_dec_setxattr(struct rpc_rqst *req, struct xdr_stream *xdr,
15851587
return status;
15861588
}
15871589

1590+
/*
1591+
* Decode GETXATTR request
1592+
*/
15881593
static int nfs4_xdr_dec_getxattr(struct rpc_rqst *rqstp,
15891594
struct xdr_stream *xdr, void *data)
15901595
{
@@ -1606,6 +1611,9 @@ static int nfs4_xdr_dec_getxattr(struct rpc_rqst *rqstp,
16061611
return status;
16071612
}
16081613

1614+
/*
1615+
* Decode LISTXATTR request
1616+
*/
16091617
static int nfs4_xdr_dec_listxattrs(struct rpc_rqst *rqstp,
16101618
struct xdr_stream *xdr, void *data)
16111619
{
@@ -1629,6 +1637,9 @@ static int nfs4_xdr_dec_listxattrs(struct rpc_rqst *rqstp,
16291637
return status;
16301638
}
16311639

1640+
/*
1641+
* Decode REMOVEXATTR request
1642+
*/
16321643
static int nfs4_xdr_dec_removexattr(struct rpc_rqst *req,
16331644
struct xdr_stream *xdr, void *data)
16341645
{
@@ -1650,5 +1661,4 @@ static int nfs4_xdr_dec_removexattr(struct rpc_rqst *req,
16501661
out:
16511662
return status;
16521663
}
1653-
#endif
16541664
#endif /* __LINUX_FS_NFS_NFS4_2XDR_H */

0 commit comments

Comments
 (0)