summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-08-28 01:08:05 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-08-28 01:08:05 -0300
commit47854c7621b1f39ba2167ad64a51ad4dd31bca15 (patch)
treeab3f81f5912a557b4276d49355b791551da86da1
parent975000d0555bb5ec1133cab1a426a294670a3f78 (diff)
cdfs-libre-2.6.27-27: fixing patches
-rw-r--r--libre/cdfs-libre/cdfs-3.0.patch22
-rw-r--r--libre/cdfs-libre/cdfs-3.2.patch2
-rw-r--r--libre/cdfs-libre/cdfs-3.4.patch2
3 files changed, 13 insertions, 13 deletions
diff --git a/libre/cdfs-libre/cdfs-3.0.patch b/libre/cdfs-libre/cdfs-3.0.patch
index 445a28970..20194b848 100644
--- a/libre/cdfs-libre/cdfs-3.0.patch
+++ b/libre/cdfs-libre/cdfs-3.0.patch
@@ -28,8 +28,8 @@ diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
extern struct seq_operations cdfs_operations;
extern struct _track_info *dummy_track_p;
--#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24)
- struct inode *cdfs_iget(struct super_block *sp, unsigned long ino);
+-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24)
+ struct inode *cdfs_iget(struct super_block *sp, unsigned long ino);
-#endif
/*============================================================================*
* cdfs_open() *
@@ -47,7 +47,7 @@ diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
static int cdfs_fill_super(struct super_block *sb, void *data, int silent){
int i, t;
-#endif
- struct cdrom_tocentry entry;
+ struct cdrom_tocentry entry;
int no_audio=0, no_data=0;
cd * this_cd;
@@ -131,24 +117,13 @@
@@ -67,7 +67,7 @@ diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
if (!(this_cd = cdfs_info(sb) = kmalloc(sizeof(cd), GFP_KERNEL))){
-#ifdef OLD_KERNEL
-- MOD_DEC_USE_COUNT;
+- MOD_DEC_USE_COUNT;
- return NULL;
-#else
return -ENOMEM;
@@ -144,7 +144,7 @@ diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
/************************************************************************/
@@ -410,27 +362,12 @@
// Remove /proc entry
- cdfs_proc_cd = NULL;
+ cdfs_proc_cd = NULL;
kfree(cdfs_info(sb));
-
-#ifdef OLD_KERNEL
@@ -210,7 +210,7 @@ diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
-#endif
i->i_mode = this_cd->mode;
if ((this_cd->track[i->i_ino].type==DATA) && this_cd->track[i->i_ino].iso_size) {
- i->i_fop = &cdfs_cddata_file_operations;
+ i->i_fop = &cdfs_cddata_file_operations;
@@ -587,33 +510,21 @@
/******************************************************************/
@@ -251,7 +251,7 @@ diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
@@ -621,10 +532,6 @@
MODULE_DESCRIPTION("CDfs: a CD filesystem");
- MODULE_LICENSE("GPL");
+ MODULE_LICENSE("GPL");
-#ifdef OLD_KERNEL
-EXPORT_NO_SYMBOLS;
@@ -261,14 +261,14 @@ diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
static int __init cdfs_init(void) {
@@ -676,11 +583,7 @@
-
+
if (!options) return;
-
+
-#ifdef OLD_KERNEL
- for (this_char = strtok(options,","); this_char; this_char = strtok(NULL,",")) {
-#else
while ((this_char = strsep(&options,",")) != NULL) {
-#endif
-
- if (!strcmp(this_char,"single"))
+
+ if (!strcmp(this_char,"single"))
this_cd->single=TRUE;
diff --git a/libre/cdfs-libre/cdfs-3.2.patch b/libre/cdfs-libre/cdfs-3.2.patch
index b4ea610b5..d3300bdbc 100644
--- a/libre/cdfs-libre/cdfs-3.2.patch
+++ b/libre/cdfs-libre/cdfs-3.2.patch
@@ -2,7 +2,7 @@ diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
--- cdfs-2.6.27/root.c 2009-12-21 16:38:31.000000000 +0300
+++ cdfs-2.6.27.my/root.c 2012-01-18 11:23:03.000000000 +0400
@@ -517,7 +517,7 @@
-
+
i->i_uid = this_cd->uid;
i->i_gid = this_cd->gid;
- i->i_nlink = 1;
diff --git a/libre/cdfs-libre/cdfs-3.4.patch b/libre/cdfs-libre/cdfs-3.4.patch
index 8e66bd85c..5c2cb9b24 100644
--- a/libre/cdfs-libre/cdfs-3.4.patch
+++ b/libre/cdfs-libre/cdfs-3.4.patch
@@ -9,4 +9,4 @@ diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
+ sb->s_root = d_make_root(retinode);
cdfs_proc_cd = this_cd;
- \ No newline at end of file
+