On Aug 21, 2013, at 8:26 PM, Trond Myklebust <Trond.Myklebust@xxxxxxxxxx> wrote:
> Technically, we don't really need to convert these time stamps,
> since they are actually cookies.
>
> Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
> Cc: Chuck Lever <Chuck.Lever@xxxxxxxxxx>
Acked-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
> ---
> fs/nfs/nfs4proc.c | 12 ++++++------
> fs/nfs/nfs4xdr.c | 2 +-
> 2 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
> index 155c2fa..b577ebb 100644
> --- a/fs/nfs/nfs4proc.c
> +++ b/fs/nfs/nfs4proc.c
> @@ -1099,7 +1099,7 @@ static int update_open_stateid(struct nfs4_state *state, nfs4_stateid *open_stat
> goto no_delegation;
>
> spin_lock(&deleg_cur->lock);
> - if (nfsi->delegation != deleg_cur ||
> + if (rcu_dereference(nfsi->delegation) != deleg_cur ||
> test_bit(NFS_DELEGATION_RETURNING, &deleg_cur->flags) ||
> (deleg_cur->type & fmode) != fmode)
> goto no_delegation_unlock;
> @@ -4628,11 +4628,11 @@ static void nfs4_init_boot_verifier(const struct nfs_client *clp,
> /* An impossible timestamp guarantees this value
> * will never match a generated boot time. */
> verf[0] = 0;
> - verf[1] = (__be32)(NSEC_PER_SEC + 1);
> + verf[1] = cpu_to_be32(NSEC_PER_SEC + 1);
> } else {
> struct nfs_net *nn = net_generic(clp->cl_net, nfs_net_id);
> - verf[0] = (__be32)nn->boot_time.tv_sec;
> - verf[1] = (__be32)nn->boot_time.tv_nsec;
> + verf[0] = cpu_to_be32(nn->boot_time.tv_sec);
> + verf[1] = cpu_to_be32(nn->boot_time.tv_nsec);
> }
> memcpy(bootverf->data, verf, sizeof(bootverf->data));
> }
> @@ -7259,7 +7259,7 @@ static void nfs41_free_stateid_release(void *calldata)
> kfree(calldata);
> }
>
> -const struct rpc_call_ops nfs41_free_stateid_ops = {
> +static const struct rpc_call_ops nfs41_free_stateid_ops = {
> .rpc_call_prepare = nfs41_free_stateid_prepare,
> .rpc_call_done = nfs41_free_stateid_done,
> .rpc_release = nfs41_free_stateid_release,
> @@ -7479,7 +7479,7 @@ const struct nfs4_minor_version_ops *nfs_v4_minor_ops[] = {
> #endif
> };
>
> -const struct inode_operations nfs4_dir_inode_operations = {
> +static const struct inode_operations nfs4_dir_inode_operations = {
> .create = nfs_create,
> .lookup = nfs_lookup,
> .atomic_open = nfs_atomic_open,
> diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
> index 1a4a3bd..1336263 100644
> --- a/fs/nfs/nfs4xdr.c
> +++ b/fs/nfs/nfs4xdr.c
> @@ -1816,7 +1816,7 @@ static void encode_create_session(struct xdr_stream *xdr,
> *p++ = cpu_to_be32(RPC_AUTH_UNIX); /* auth_sys */
>
> /* authsys_parms rfc1831 */
> - *p++ = (__be32)nn->boot_time.tv_nsec; /* stamp */
> + *p++ = cpu_to_be32(nn->boot_time.tv_nsec); /* stamp */
> p = xdr_encode_opaque(p, machine_name, len);
> *p++ = cpu_to_be32(0); /* UID */
> *p++ = cpu_to_be32(0); /* GID */
> --
> 1.8.3.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
