diff -NurpP --minimal linux-2.6.15-vs2.0.2-rc1/Makefile linux-2.6.15-vs2.0.2-rc1.1/Makefile
--- linux-2.6.15-vs2.0.2-rc1/Makefile	2006-02-13 03:57:48 +0100
+++ linux-2.6.15-vs2.0.2-rc1.1/Makefile	2006-01-27 22:46:01 +0100
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 15
-EXTRAVERSION = -vs2.0.2-rc1
+EXTRAVERSION =
 NAME=Sliding Snow Leopard
 
 # *DOCUMENTATION*
diff -NurpP --minimal linux-2.6.15-vs2.0.2-rc1/fs/hfsplus/ioctl.c linux-2.6.15-vs2.0.2-rc1.1/fs/hfsplus/ioctl.c
--- linux-2.6.15-vs2.0.2-rc1/fs/hfsplus/ioctl.c	2006-02-12 15:23:59 +0100
+++ linux-2.6.15-vs2.0.2-rc1.1/fs/hfsplus/ioctl.c	2006-02-13 05:03:27 +0100
@@ -15,6 +15,7 @@
 #include <linux/fs.h>
 #include <linux/sched.h>
 #include <linux/xattr.h>
+#include <linux/mount.h>
 #include <asm/uaccess.h>
 #include "hfsplus_fs.h"
 
diff -NurpP --minimal linux-2.6.15-vs2.0.2-rc1/fs/nfs/dir.c linux-2.6.15-vs2.0.2-rc1.1/fs/nfs/dir.c
--- linux-2.6.15-vs2.0.2-rc1/fs/nfs/dir.c	2006-02-12 15:23:59 +0100
+++ linux-2.6.15-vs2.0.2-rc1.1/fs/nfs/dir.c	2006-02-13 07:23:05 +0100
@@ -28,6 +28,7 @@
 #include <linux/sunrpc/clnt.h>
 #include <linux/nfs_fs.h>
 #include <linux/nfs_mount.h>
+#include <linux/mount.h>
 #include <linux/pagemap.h>
 #include <linux/smp_lock.h>
 #include <linux/namei.h>
diff -NurpP --minimal linux-2.6.15-vs2.0.2-rc1/fs/nfsd/nfs4recover.c linux-2.6.15-vs2.0.2-rc1.1/fs/nfsd/nfs4recover.c
--- linux-2.6.15-vs2.0.2-rc1/fs/nfsd/nfs4recover.c	2005-10-28 20:49:44 +0200
+++ linux-2.6.15-vs2.0.2-rc1.1/fs/nfsd/nfs4recover.c	2006-02-13 07:28:45 +0100
@@ -155,7 +155,7 @@ nfsd4_create_clid_dir(struct nfs4_client
 		dprintk("NFSD: nfsd4_create_clid_dir: DIRECTORY EXISTS\n");
 		goto out_put;
 	}
-	status = vfs_mkdir(rec_dir.dentry->d_inode, dentry, S_IRWXU);
+	status = vfs_mkdir(rec_dir.dentry->d_inode, dentry, S_IRWXU, NULL);
 out_put:
 	dput(dentry);
 out_unlock:
@@ -260,7 +260,7 @@ nfsd4_remove_clid_file(struct dentry *di
 		return -EINVAL;
 	}
 	down(&dir->d_inode->i_sem);
-	status = vfs_unlink(dir->d_inode, dentry);
+	status = vfs_unlink(dir->d_inode, dentry, NULL);
 	up(&dir->d_inode->i_sem);
 	return status;
 }
@@ -275,7 +275,7 @@ nfsd4_clear_clid_dir(struct dentry *dir,
 	 * a kernel from the future.... */
 	nfsd4_list_rec_dir(dentry, nfsd4_remove_clid_file);
 	down(&dir->d_inode->i_sem);
-	status = vfs_rmdir(dir->d_inode, dentry);
+	status = vfs_rmdir(dir->d_inode, dentry, NULL);
 	up(&dir->d_inode->i_sem);
 	return status;
 }