Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[~andy/linux] / fs / nfs / client.c

diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 5fea638743e4107aadcd8cbd18cd46d78e331cf0..23ab145daa2d2289cd6721457b3f555a9d16cbaf 100644 (file)
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -143,7 +143,7 @@ static struct nfs_client *nfs_alloc_client(const char *hostname,
        INIT_LIST_HEAD(&clp->cl_state_owners);
        INIT_LIST_HEAD(&clp->cl_unused);
        spin_lock_init(&clp->cl_lock);
-       INIT_WORK(&clp->cl_renewd, nfs4_renew_state, clp);
+       INIT_DELAYED_WORK(&clp->cl_renewd, nfs4_renew_state);
        rpc_init_wait_queue(&clp->cl_rpcwaitq, "NFS client");
        clp->cl_boot_time = CURRENT_TIME;
        clp->cl_state = 1 << NFS4CLNT_LEASE_EXPIRED;