diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-03-04 18:13:56 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-03-06 10:32:45 -0500 |
commit | d0b496d2fc08cc51000fcdd9739235d1cab890cd (patch) | |
tree | ff7ac1293aad02f070a88ec7432f5099896d4aa3 /fs/nfs/nfs4xdr.c | |
parent | 36281caa839f4441c793c81d2e3cc5ea44ad5aa2 (diff) |
NFSv4: Rename encode_stateid() to encode_open_stateid()
The current version of encode_stateid really only applies to open stateids.
You can't use it for locks, delegations or layouts.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4xdr.c')
-rw-r--r-- | fs/nfs/nfs4xdr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index bca8c77e5fe0..af11e8b5d367 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c | |||
@@ -1528,7 +1528,7 @@ static void encode_putrootfh(struct xdr_stream *xdr, struct compound_hdr *hdr) | |||
1528 | hdr->replen += decode_putrootfh_maxsz; | 1528 | hdr->replen += decode_putrootfh_maxsz; |
1529 | } | 1529 | } |
1530 | 1530 | ||
1531 | static void encode_stateid(struct xdr_stream *xdr, const struct nfs_open_context *ctx, const struct nfs_lock_context *l_ctx, int zero_seqid) | 1531 | static void encode_open_stateid(struct xdr_stream *xdr, const struct nfs_open_context *ctx, const struct nfs_lock_context *l_ctx, int zero_seqid) |
1532 | { | 1532 | { |
1533 | nfs4_stateid stateid; | 1533 | nfs4_stateid stateid; |
1534 | __be32 *p; | 1534 | __be32 *p; |
@@ -1550,7 +1550,7 @@ static void encode_read(struct xdr_stream *xdr, const struct nfs_readargs *args, | |||
1550 | p = reserve_space(xdr, 4); | 1550 | p = reserve_space(xdr, 4); |
1551 | *p = cpu_to_be32(OP_READ); | 1551 | *p = cpu_to_be32(OP_READ); |
1552 | 1552 | ||
1553 | encode_stateid(xdr, args->context, args->lock_context, | 1553 | encode_open_stateid(xdr, args->context, args->lock_context, |
1554 | hdr->minorversion); | 1554 | hdr->minorversion); |
1555 | 1555 | ||
1556 | p = reserve_space(xdr, 12); | 1556 | p = reserve_space(xdr, 12); |
@@ -1739,7 +1739,7 @@ static void encode_write(struct xdr_stream *xdr, const struct nfs_writeargs *arg | |||
1739 | p = reserve_space(xdr, 4); | 1739 | p = reserve_space(xdr, 4); |
1740 | *p = cpu_to_be32(OP_WRITE); | 1740 | *p = cpu_to_be32(OP_WRITE); |
1741 | 1741 | ||
1742 | encode_stateid(xdr, args->context, args->lock_context, | 1742 | encode_open_stateid(xdr, args->context, args->lock_context, |
1743 | hdr->minorversion); | 1743 | hdr->minorversion); |
1744 | 1744 | ||
1745 | p = reserve_space(xdr, 16); | 1745 | p = reserve_space(xdr, 16); |