NFS: Use non-atomic bit ops when initialising struct nfs_client_initdata

We don't need atomic bit ops when initialising a local structure on the
stack.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

diff --git a/fs/nfs/nfs3client.c b/fs/nfs/nfs3client.c
index 148ceb7..178dc10 100644 (file)
--- a/fs/nfs/nfs3client.c
+++ b/fs/nfs/nfs3client.c
@@ -106,7 +106,7 @@ struct nfs_client *nfs3_set_ds_client(struct nfs_server *mds_srv,
                cl_init.nconnect = mds_clp->cl_nconnect;
 
        if (mds_srv->flags & NFS_MOUNT_NORESVPORT)
-               set_bit(NFS_CS_NORESVPORT, &cl_init.init_flags);
+               __set_bit(NFS_CS_NORESVPORT, &cl_init.init_flags);
 
        /* Use the MDS nfs_client cl_ipaddr. */
        nfs_init_timeout_values(&ds_timeout, ds_proto, ds_timeo, ds_retrans);

diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
index da62040..ebc960d 100644 (file)
--- a/fs/nfs/nfs4client.c
+++ b/fs/nfs/nfs4client.c
@@ -882,11 +882,11 @@ static int nfs4_set_client(struct nfs_server *server,
        if (minorversion > 0 && proto == XPRT_TRANSPORT_TCP)
                cl_init.nconnect = nconnect;
        if (server->flags & NFS_MOUNT_NORESVPORT)
-               set_bit(NFS_CS_NORESVPORT, &cl_init.init_flags);
+               __set_bit(NFS_CS_NORESVPORT, &cl_init.init_flags);
        if (server->options & NFS_OPTION_MIGRATION)
-               set_bit(NFS_CS_MIGRATION, &cl_init.init_flags);
+               __set_bit(NFS_CS_MIGRATION, &cl_init.init_flags);
        if (test_bit(NFS_MIG_TSM_POSSIBLE, &server->mig_status))
-               set_bit(NFS_CS_TSM_POSSIBLE, &cl_init.init_flags);
+               __set_bit(NFS_CS_TSM_POSSIBLE, &cl_init.init_flags);
        server->port = rpc_get_port(addr);
 
        /* Allocate or find a client reference we can use */