@@ -1103,7 +1103,7 @@ static int update_open_stateid(struct nfs4_state *state, nfs4_stateid *open_stat
1103
1103
goto no_delegation ;
1104
1104
1105
1105
spin_lock (& deleg_cur -> lock );
1106
- if (nfsi -> delegation != deleg_cur ||
1106
+ if (rcu_dereference ( nfsi -> delegation ) != deleg_cur ||
1107
1107
test_bit (NFS_DELEGATION_RETURNING , & deleg_cur -> flags ) ||
1108
1108
(deleg_cur -> type & fmode ) != fmode )
1109
1109
goto no_delegation_unlock ;
@@ -4632,11 +4632,11 @@ static void nfs4_init_boot_verifier(const struct nfs_client *clp,
4632
4632
/* An impossible timestamp guarantees this value
4633
4633
* will never match a generated boot time. */
4634
4634
verf [0 ] = 0 ;
4635
- verf [1 ] = ( __be32 ) (NSEC_PER_SEC + 1 );
4635
+ verf [1 ] = cpu_to_be32 (NSEC_PER_SEC + 1 );
4636
4636
} else {
4637
4637
struct nfs_net * nn = net_generic (clp -> cl_net , nfs_net_id );
4638
- verf [0 ] = ( __be32 ) nn -> boot_time .tv_sec ;
4639
- verf [1 ] = ( __be32 ) nn -> boot_time .tv_nsec ;
4638
+ verf [0 ] = cpu_to_be32 ( nn -> boot_time .tv_sec ) ;
4639
+ verf [1 ] = cpu_to_be32 ( nn -> boot_time .tv_nsec ) ;
4640
4640
}
4641
4641
memcpy (bootverf -> data , verf , sizeof (bootverf -> data ));
4642
4642
}
@@ -7263,7 +7263,7 @@ static void nfs41_free_stateid_release(void *calldata)
7263
7263
kfree (calldata );
7264
7264
}
7265
7265
7266
- const struct rpc_call_ops nfs41_free_stateid_ops = {
7266
+ static const struct rpc_call_ops nfs41_free_stateid_ops = {
7267
7267
.rpc_call_prepare = nfs41_free_stateid_prepare ,
7268
7268
.rpc_call_done = nfs41_free_stateid_done ,
7269
7269
.rpc_release = nfs41_free_stateid_release ,
@@ -7483,7 +7483,7 @@ const struct nfs4_minor_version_ops *nfs_v4_minor_ops[] = {
7483
7483
#endif
7484
7484
};
7485
7485
7486
- const struct inode_operations nfs4_dir_inode_operations = {
7486
+ static const struct inode_operations nfs4_dir_inode_operations = {
7487
7487
.create = nfs_create ,
7488
7488
.lookup = nfs_lookup ,
7489
7489
.atomic_open = nfs_atomic_open ,
0 commit comments