leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NFSv4: Deal with some more sparse warnings

Browse Source 
Technically, we don't really need to convert these time stamps,
since they are actually cookies.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: Chuck Lever <Chuck.Lever@oracle.com>
This commit is contained in:
Trond Myklebust 2013-08-21 15:48:42 -04:00
parent c281fa9c1f
commit 17f26b1246
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/nfs/nfs4proc.c
View File

@ -1103,7 +1103,7 @@ static int update_open_stateid(struct nfs4_state *state, nfs4_stateid *open_stat
goto no_delegation; goto no_delegation;
spin_lock(&deleg_cur->lock); 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) || test_bit(NFS_DELEGATION_RETURNING, &deleg_cur->flags) ||
(deleg_cur->type & fmode) != fmode) (deleg_cur->type & fmode) != fmode)
goto no_delegation_unlock; goto no_delegation_unlock;
@ -4632,11 +4632,11 @@ static void nfs4_init_boot_verifier(const struct nfs_client *clp,
/* An impossible timestamp guarantees this value /* An impossible timestamp guarantees this value
* will never match a generated boot time. */ * will never match a generated boot time. */
verf[0] = 0; verf[0] = 0;
verf[1] = (__be32)(NSEC_PER_SEC + 1); verf[1] = cpu_to_be32(NSEC_PER_SEC + 1);
} else { } else {
struct nfs_net *nn = net_generic(clp->cl_net, nfs_net_id); struct nfs_net *nn = net_generic(clp->cl_net, nfs_net_id);
verf[0] = (__be32)nn->boot_time.tv_sec; verf[0] = cpu_to_be32(nn->boot_time.tv_sec);
verf[1] = (__be32)nn->boot_time.tv_nsec; verf[1] = cpu_to_be32(nn->boot_time.tv_nsec);
} }
memcpy(bootverf->data, verf, sizeof(bootverf->data)); memcpy(bootverf->data, verf, sizeof(bootverf->data));
} }
@ -7263,7 +7263,7 @@ static void nfs41_free_stateid_release(void *calldata)
kfree(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_prepare = nfs41_free_stateid_prepare,
.rpc_call_done = nfs41_free_stateid_done, .rpc_call_done = nfs41_free_stateid_done,
.rpc_release = nfs41_free_stateid_release, .rpc_release = nfs41_free_stateid_release,
@ -7483,7 +7483,7 @@ const struct nfs4_minor_version_ops *nfs_v4_minor_ops[] = {
#endif #endif
}; };
const struct inode_operations nfs4_dir_inode_operations = { static const struct inode_operations nfs4_dir_inode_operations = {
.create = nfs_create, .create = nfs_create,
.lookup = nfs_lookup, .lookup = nfs_lookup,
.atomic_open = nfs_atomic_open, .atomic_open = nfs_atomic_open,

2
fs/nfs/nfs4xdr.c
View File

@ -1816,7 +1816,7 @@ static void encode_create_session(struct xdr_stream *xdr,
*p++ = cpu_to_be32(RPC_AUTH_UNIX); /* auth_sys */ *p++ = cpu_to_be32(RPC_AUTH_UNIX); /* auth_sys */
/* authsys_parms rfc1831 */ /* 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 = xdr_encode_opaque(p, machine_name, len);
*p++ = cpu_to_be32(0); /* UID */ *p++ = cpu_to_be32(0); /* UID */
*p++ = cpu_to_be32(0); /* GID */ *p++ = cpu_to_be32(0); /* GID */