diff options
| author | Nicolás Reynolds <fauno@parabola.nu> | 2013-03-21 12:12:27 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@parabola.nu> | 2013-03-21 12:12:27 -0300 |
| commit | 9f59cbc1fd9ac9b0c5b08f81447dbd1794992f3d (patch) | |
| tree | 61c08b7025d4d1044347d9efd42cf5d9680b7072 /libre/cdfs-libre/cdfs-3.8.patch | |
| parent | 55f42c86ab5e8509098cc9763975b58bf9ce6504 (diff) | |
| parent | 199598529a8f378b590f77ca6d5434bbd1a58c8d (diff) | |
Merge branch 'master' of ssh://gparabola/srv/git/abslibre
Diffstat (limited to 'libre/cdfs-libre/cdfs-3.8.patch')
| -rw-r--r-- | libre/cdfs-libre/cdfs-3.8.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/libre/cdfs-libre/cdfs-3.8.patch b/libre/cdfs-libre/cdfs-3.8.patch new file mode 100644 index 000000000..10d9c8b47 --- /dev/null +++ b/libre/cdfs-libre/cdfs-3.8.patch @@ -0,0 +1,42 @@ +diff -upr cdfs-2.6.27.orig/daemon.c cdfs-2.6.27/daemon.c +--- cdfs-2.6.27.orig/daemon.c 2009-12-21 16:02:50.000000000 +0200 ++++ cdfs-2.6.27/daemon.c 2013-02-21 06:14:45.000000000 +0200 +@@ -158,7 +158,6 @@ int kcdfsd_thread(void *unused){ + exit_files(current); /* daemonize doesn't do exit_files */ + daemonize(); + #else +- daemonize("k"FSNAME"d"); + + /* Allow SIGTERM to quit properly when removing module */ + /* By default with daemonize all signals are dropped */ +diff -upr cdfs-2.6.27.orig/root.c cdfs-2.6.27/root.c +--- cdfs-2.6.27.orig/root.c 2009-12-21 15:38:31.000000000 +0200 ++++ cdfs-2.6.27/root.c 2013-02-21 06:15:20.000000000 +0200 +@@ -25,6 +25,7 @@ + #include "cdfs.h" + + #include <linux/module.h> ++#include <linux/kthread.h> + + + /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++* +@@ -643,14 +644,15 @@ static int __init cdfs_init(void) { + cdfs_proc_cd=NULL; + + // start kernel thread +- if ((kcdfsd_pid = kernel_thread(kcdfsd_thread, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGHAND)) >0 ) { +- return 0; +- } else { +- printk(FSNAME" kernel_thread failed.\n"); ++ kcdfsd_pid = kthread_run(kcdfsd_thread, NULL, "kcdfsd_thread"); ++ if (IS_ERR(kcdfsd_pid)) { ++ printk(FSNAME" kthread_run failed.\n"); + if (cdfs_proc_entry) remove_proc_entry(FSNAME, NULL); + unregister_filesystem(&cdfs_fs_type); + return -1; + } ++ ++ return 0; + } + + /******************************************************************/ |