x86: make spurious fault handler aware of large mappings

[linux-2.6-omap-h63xx.git] / fs / nfs / namespace.c

diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c
index aea76d0e5fbdf5d9c24dafd89caa94d691277ee4..be4ce1c3a3d8d30e19f9a1e5921253d6e6542589 100644 (file)
--- a/fs/nfs/namespace.c
+++ b/fs/nfs/namespace.c
@@ -176,7 +176,7 @@ static void nfs_expire_automounts(struct work_struct *work)
 void nfs_release_automount_timer(void)
 {
        if (list_empty(&nfs_automount_list))
-               cancel_delayed_work_sync(&nfs_automount_task);
+               cancel_delayed_work(&nfs_automount_task);
 }
 
 /*
@@ -188,7 +188,7 @@ static struct vfsmount *nfs_do_clone_mount(struct nfs_server *server,
 {
 #ifdef CONFIG_NFS_V4
        struct vfsmount *mnt = NULL;
-       switch (server->nfs_client->cl_nfsversion) {
+       switch (server->nfs_client->rpc_ops->version) {
                case 2:
                case 3:
                        mnt = vfs_kern_mount(&nfs_xdev_fs_type, 0, devname, mountdata);