diff options
| author | root <root@rshg054.dnsready.net> | 2012-08-29 00:04:41 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-08-29 00:04:41 +0000 |
| commit | 498a4346616c33beac56d48a246cf27fe3812341 (patch) | |
| tree | 333cfc0154a280d9dcf65c08900913200c33d988 /libre/cdfs-libre/cdfs-3.0.patch | |
| parent | 559da5e6e5aff9ccc57e29b6a91c35a528424b6c (diff) | |
Wed Aug 29 00:04:40 UTC 2012
Diffstat (limited to 'libre/cdfs-libre/cdfs-3.0.patch')
| -rw-r--r-- | libre/cdfs-libre/cdfs-3.0.patch | 22 |
1 files changed, 11 insertions, 11 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; |