bdb1ee51f8
Fix locking and lock usage, making it compile for SMP. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 43578
44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
--- a/fs/yaffs2/yaffs_vfs.c
|
|
+++ b/fs/yaffs2/yaffs_vfs.c
|
|
@@ -3025,6 +3025,7 @@ static DECLARE_FSTYPE(yaffs2_fs_type, "y
|
|
#endif
|
|
|
|
|
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0))
|
|
static struct proc_dir_entry *my_proc_entry;
|
|
|
|
static char *yaffs_dump_dev_part0(char *buf, struct yaffs_dev *dev)
|
|
@@ -3398,6 +3399,7 @@ static int yaffs_proc_write(struct file
|
|
return yaffs_proc_debug_write(file, buf, count, data);
|
|
return yaffs_proc_write_trace_options(file, buf, count, data);
|
|
}
|
|
+#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)) */
|
|
|
|
/* Stuff to handle installation of file systems */
|
|
struct file_system_to_install {
|
|
@@ -3421,6 +3423,7 @@ static int __init init_yaffs_fs(void)
|
|
|
|
mutex_init(&yaffs_context_lock);
|
|
|
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0))
|
|
/* Install the proc_fs entries */
|
|
my_proc_entry = create_proc_entry("yaffs",
|
|
S_IRUGO | S_IFREG, YPROC_ROOT);
|
|
@@ -3432,6 +3435,7 @@ static int __init init_yaffs_fs(void)
|
|
} else {
|
|
return -ENOMEM;
|
|
}
|
|
+#endif
|
|
|
|
/* Now add the file system entries */
|
|
|
|
@@ -3468,7 +3472,9 @@ static void __exit exit_yaffs_fs(void)
|
|
yaffs_trace(YAFFS_TRACE_ALWAYS,
|
|
"yaffs built " __DATE__ " " __TIME__ " removing.");
|
|
|
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0))
|
|
remove_proc_entry("yaffs", YPROC_ROOT);
|
|
+#endif
|
|
|
|
fsinst = fs_to_install;
|
|
|