X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=fs%2Flibfs.c;h=4a3ec9ad8bed354b2d4db49bb4adf9ba454dc466;hb=1f5ce9e93aa96a867f195ed45f6f77935175f12e;hp=4fdeaceb892cb83d0206f2024f1bbc229dba1192;hpb=88e3c1da8b3258a81c5c81d4e7e22557b7d71ba7;p=linux-2.6-omap-h63xx.git

diff --git a/fs/libfs.c b/fs/libfs.c
index 4fdeaceb892..4a3ec9ad8be 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -179,7 +179,7 @@ ssize_t generic_read_dir(struct file *filp, char __user *buf, size_t siz, loff_t
 	return -EISDIR;
 }
 
-struct file_operations simple_dir_operations = {
+const struct file_operations simple_dir_operations = {
 	.open		= dcache_dir_open,
 	.release	= dcache_dir_close,
 	.llseek		= dcache_dir_lseek,
@@ -424,13 +424,13 @@ out:
 
 static DEFINE_SPINLOCK(pin_fs_lock);
 
-int simple_pin_fs(char *name, struct vfsmount **mount, int *count)
+int simple_pin_fs(struct file_system_type *type, struct vfsmount **mount, int *count)
 {
 	struct vfsmount *mnt = NULL;
 	spin_lock(&pin_fs_lock);
 	if (unlikely(!*mount)) {
 		spin_unlock(&pin_fs_lock);
-		mnt = do_kern_mount(name, 0, name, NULL);
+		mnt = vfs_kern_mount(type, 0, type->name, NULL);
 		if (IS_ERR(mnt))
 			return PTR_ERR(mnt);
 		spin_lock(&pin_fs_lock);