epoll: add syscall epoll_pwait2

[linux-2.6-microblaze.git] / fs / nfs / client.c

diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 4b8cc93..ff5c4d0 100644 (file)
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -571,7 +571,7 @@ static int nfs_start_lockd(struct nfs_server *server)
                                        1 : 0,
                .net            = clp->cl_net,
                .nlmclnt_ops    = clp->cl_nfs_mod->rpc_ops->nlmclnt_ops,
-               .cred           = current_cred(),
+               .cred           = server->cred,
        };
 
        if (nlm_init.nfs_version > 3)
@@ -781,8 +781,8 @@ static void nfs_server_set_fsinfo(struct nfs_server *server,
        server->wtmult = nfs_block_bits(fsinfo->wtmult, NULL);
 
        server->dtsize = nfs_block_size(fsinfo->dtpref, NULL);
-       if (server->dtsize > PAGE_SIZE * NFS_MAX_READDIR_PAGES)
-               server->dtsize = PAGE_SIZE * NFS_MAX_READDIR_PAGES;
+       if (server->dtsize > NFS_MAX_FILE_IO_SIZE)
+               server->dtsize = NFS_MAX_FILE_IO_SIZE;
        if (server->dtsize > server->rsize)
                server->dtsize = server->rsize;
 
@@ -985,7 +985,7 @@ struct nfs_server *nfs_create_server(struct fs_context *fc)
        if (!server)
                return ERR_PTR(-ENOMEM);
 
-       server->cred = get_cred(current_cred());
+       server->cred = get_cred(fc->cred);
 
        error = -ENOMEM;
        fattr = nfs_alloc_fattr();