aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfs4xdr.c
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2013-04-16 21:29:03 -0400
committerJ. Bruce Fields <bfields@redhat.com>2013-04-16 21:51:55 -0400
commit9aeb5aeeb09d59794896ccefd60d58c44987f52f (patch)
tree4bbea0fd3087f4b226fe5aae891fdf19918cea3d /fs/nfsd/nfs4xdr.c
parent53584f66529d4c5940901e4ffe98ad7012dc6e0c (diff)
nfsd4: remove unused macro
Cleanup a piece I forgot to remove in 9411b1d4c7df26dca6bc6261b5dc87a5b4c81e5c "nfsd4: cleanup handling of nfsv4.0 closed stateid's". Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4xdr.c')
-rw-r--r--fs/nfsd/nfs4xdr.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index a5e8a6424843..1cf154511dae 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1693,14 +1693,6 @@ static void write_cinfo(__be32 **p, struct nfsd4_change_info *c)
1693} while (0) 1693} while (0)
1694#define ADJUST_ARGS() resp->p = p 1694#define ADJUST_ARGS() resp->p = p
1695 1695
1696/*
1697 * Header routine to setup seqid operation replay cache
1698 */
1699#define ENCODE_SEQID_OP_HEAD \
1700 __be32 *save; \
1701 \
1702 save = resp->p;
1703
1704/* Encode as an array of strings the string given with components 1696/* Encode as an array of strings the string given with components
1705 * separated @sep, escaped with esc_enter and esc_exit. 1697 * separated @sep, escaped with esc_enter and esc_exit.
1706 */ 1698 */
@@ -2640,8 +2632,6 @@ static __be32 nfsd4_encode_bind_conn_to_session(struct nfsd4_compoundres *resp,
2640static __be32 2632static __be32
2641nfsd4_encode_close(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_close *close) 2633nfsd4_encode_close(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_close *close)
2642{ 2634{
2643 ENCODE_SEQID_OP_HEAD;
2644
2645 if (!nfserr) 2635 if (!nfserr)
2646 nfsd4_encode_stateid(resp, &close->cl_stateid); 2636 nfsd4_encode_stateid(resp, &close->cl_stateid);
2647 2637
@@ -2740,8 +2730,6 @@ nfsd4_encode_lock_denied(struct nfsd4_compoundres *resp, struct nfsd4_lock_denie
2740static __be32 2730static __be32
2741nfsd4_encode_lock(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_lock *lock) 2731nfsd4_encode_lock(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_lock *lock)
2742{ 2732{
2743 ENCODE_SEQID_OP_HEAD;
2744
2745 if (!nfserr) 2733 if (!nfserr)
2746 nfsd4_encode_stateid(resp, &lock->lk_resp_stateid); 2734 nfsd4_encode_stateid(resp, &lock->lk_resp_stateid);
2747 else if (nfserr == nfserr_denied) 2735 else if (nfserr == nfserr_denied)
@@ -2761,8 +2749,6 @@ nfsd4_encode_lockt(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_l
2761static __be32 2749static __be32
2762nfsd4_encode_locku(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_locku *locku) 2750nfsd4_encode_locku(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_locku *locku)
2763{ 2751{
2764 ENCODE_SEQID_OP_HEAD;
2765
2766 if (!nfserr) 2752 if (!nfserr)
2767 nfsd4_encode_stateid(resp, &locku->lu_stateid); 2753 nfsd4_encode_stateid(resp, &locku->lu_stateid);
2768 2754
@@ -2788,7 +2774,6 @@ static __be32
2788nfsd4_encode_open(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_open *open) 2774nfsd4_encode_open(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_open *open)
2789{ 2775{
2790 __be32 *p; 2776 __be32 *p;
2791 ENCODE_SEQID_OP_HEAD;
2792 2777
2793 if (nfserr) 2778 if (nfserr)
2794 goto out; 2779 goto out;
@@ -2866,8 +2851,6 @@ out:
2866static __be32 2851static __be32
2867nfsd4_encode_open_confirm(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_open_confirm *oc) 2852nfsd4_encode_open_confirm(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_open_confirm *oc)
2868{ 2853{
2869 ENCODE_SEQID_OP_HEAD;
2870
2871 if (!nfserr) 2854 if (!nfserr)
2872 nfsd4_encode_stateid(resp, &oc->oc_resp_stateid); 2855 nfsd4_encode_stateid(resp, &oc->oc_resp_stateid);
2873 2856
@@ -2877,8 +2860,6 @@ nfsd4_encode_open_confirm(struct nfsd4_compoundres *resp, __be32 nfserr, struct
2877static __be32 2860static __be32
2878nfsd4_encode_open_downgrade(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_open_downgrade *od) 2861nfsd4_encode_open_downgrade(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_open_downgrade *od)
2879{ 2862{
2880 ENCODE_SEQID_OP_HEAD;
2881
2882 if (!nfserr) 2863 if (!nfserr)
2883 nfsd4_encode_stateid(resp, &od->od_stateid); 2864 nfsd4_encode_stateid(resp, &od->od_stateid);
2884 2865