| 1 |
commit: 164ca436e0192c15ffe52de1cd867bf2085d9dea |
| 2 |
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org> |
| 3 |
AuthorDate: Tue Jun 4 00:02:04 2013 +0000 |
| 4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 4 00:02:04 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=164ca436 |
| 7 |
|
| 8 |
sys-fs/wrapfs: Add missing patch |
| 9 |
|
| 10 |
--- |
| 11 |
.../wrapfs/files/wrapfs-0.1_p20101202-2.6.39.patch | 85 ++++++++++++++++++++++ |
| 12 |
1 file changed, 85 insertions(+) |
| 13 |
|
| 14 |
diff --git a/sys-fs/wrapfs/files/wrapfs-0.1_p20101202-2.6.39.patch b/sys-fs/wrapfs/files/wrapfs-0.1_p20101202-2.6.39.patch |
| 15 |
new file mode 100644 |
| 16 |
index 0000000..48a4f31 |
| 17 |
--- /dev/null |
| 18 |
+++ b/sys-fs/wrapfs/files/wrapfs-0.1_p20101202-2.6.39.patch |
| 19 |
@@ -0,0 +1,85 @@ |
| 20 |
+From eadfd09170914cc2a2e366338dd828a1a6b2d04f Mon Sep 17 00:00:00 2001 |
| 21 |
+From: Erez Zadok <ezk@×××××××××.edu> |
| 22 |
+Date: Fri, 18 Mar 2011 13:22:50 -0400 |
| 23 |
+Subject: [PATCH] Wrapfs: port to 2.6.39 |
| 24 |
+ |
| 25 |
+Remove lock/unlock_kernel in ->fasync. |
| 26 |
+Convert from ->get_sb to ->mount op. |
| 27 |
+Remove include to smp_lock.h, added sched.h. |
| 28 |
+ |
| 29 |
+Signed-off-by: Erez Zadok <ezk@×××××××××.edu> |
| 30 |
+--- |
| 31 |
+ fs/wrapfs/file.c | 2 -- |
| 32 |
+ fs/wrapfs/main.c | 13 +++++-------- |
| 33 |
+ fs/wrapfs/wrapfs.h | 2 +- |
| 34 |
+ 3 files changed, 6 insertions(+), 11 deletions(-) |
| 35 |
+ |
| 36 |
+diff --git a/fs/wrapfs/file.c b/fs/wrapfs/file.c |
| 37 |
+index e837637..e16b21c 100644 |
| 38 |
+--- a/fs/wrapfs/file.c |
| 39 |
++++ b/fs/wrapfs/file.c |
| 40 |
+@@ -254,11 +254,9 @@ static int wrapfs_fasync(int fd, struct file *file, int flag) |
| 41 |
+ int err = 0; |
| 42 |
+ struct file *lower_file = NULL; |
| 43 |
+ |
| 44 |
+- lock_kernel(); |
| 45 |
+ lower_file = wrapfs_lower_file(file); |
| 46 |
+ if (lower_file->f_op && lower_file->f_op->fasync) |
| 47 |
+ err = lower_file->f_op->fasync(fd, lower_file, flag); |
| 48 |
+- unlock_kernel(); |
| 49 |
+ |
| 50 |
+ return err; |
| 51 |
+ } |
| 52 |
+diff --git a/fs/wrapfs/main.c b/fs/wrapfs/main.c |
| 53 |
+index d9249f1..6281840 100644 |
| 54 |
+--- a/fs/wrapfs/main.c |
| 55 |
++++ b/fs/wrapfs/main.c |
| 56 |
+@@ -131,22 +131,19 @@ out: |
| 57 |
+ return err; |
| 58 |
+ } |
| 59 |
+ |
| 60 |
+-static int wrapfs_get_sb(struct file_system_type *fs_type, |
| 61 |
+- int flags, const char *dev_name, |
| 62 |
+- void *raw_data, struct vfsmount *mnt) |
| 63 |
++struct dentry *wrapfs_mount(struct file_system_type *fs_type, int flags, |
| 64 |
++ const char *dev_name, void *raw_data) |
| 65 |
+ { |
| 66 |
+- int err; |
| 67 |
+ void *lower_path_name = (void *) dev_name; |
| 68 |
+ |
| 69 |
+- err = get_sb_nodev(fs_type, flags, lower_path_name, |
| 70 |
+- wrapfs_read_super, mnt); |
| 71 |
+- return err; |
| 72 |
++ return mount_nodev(fs_type, flags, lower_path_name, |
| 73 |
++ wrapfs_read_super); |
| 74 |
+ } |
| 75 |
+ |
| 76 |
+ static struct file_system_type wrapfs_fs_type = { |
| 77 |
+ .owner = THIS_MODULE, |
| 78 |
+ .name = WRAPFS_NAME, |
| 79 |
+- .get_sb = wrapfs_get_sb, |
| 80 |
++ .mount = wrapfs_mount, |
| 81 |
+ .kill_sb = generic_shutdown_super, |
| 82 |
+ .fs_flags = FS_REVAL_DOT, |
| 83 |
+ }; |
| 84 |
+diff --git a/fs/wrapfs/wrapfs.h b/fs/wrapfs/wrapfs.h |
| 85 |
+index 0e5901cd..778d79a 100644 |
| 86 |
+--- a/fs/wrapfs/wrapfs.h |
| 87 |
++++ b/fs/wrapfs/wrapfs.h |
| 88 |
+@@ -19,12 +19,12 @@ |
| 89 |
+ #include <linux/mount.h> |
| 90 |
+ #include <linux/namei.h> |
| 91 |
+ #include <linux/seq_file.h> |
| 92 |
+-#include <linux/smp_lock.h> |
| 93 |
+ #include <linux/statfs.h> |
| 94 |
+ #include <linux/fs_stack.h> |
| 95 |
+ #include <linux/magic.h> |
| 96 |
+ #include <linux/uaccess.h> |
| 97 |
+ #include <linux/slab.h> |
| 98 |
++#include <linux/sched.h> |
| 99 |
+ |
| 100 |
+ /* the file system name */ |
| 101 |
+ #define WRAPFS_NAME "wrapfs" |
| 102 |
+-- |
| 103 |
+1.7.4.4 |
| 104 |
+ |
Archives