[kernel] r15925 - in dists/sid/linux-2.6/debian/patches: debian series

[Ben Hutchings]

Author: benh
Date: Fri Jul  2 03:41:33 2010
New Revision: 15925

Log:
Revert "wrong type for 'magic' argument in simple_fill_super()"

Added:
   dists/sid/linux-2.6/debian/patches/debian/revert-wrong-type-for-magic-argument-in-simple_fill_super.patch
Modified:
   dists/sid/linux-2.6/debian/patches/series/16

Added: dists/sid/linux-2.6/debian/patches/debian/revert-wrong-type-for-magic-argument-in-simple_fill_super.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/debian/revert-wrong-type-for-magic-argument-in-simple_fill_super.patch	Fri Jul  2 03:41:33 2010	(r15925)
@@ -0,0 +1,30 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: Revert "wrong type for 'magic' argument in simple_fill_super()"
+
+This is an ABI change and is only required for IMA which we don't enable.
+
+reverted:
+--- b/fs/libfs.c
++++ a/fs/libfs.c
+@@ -415,8 +415,7 @@
+  * unique inode values later for this filesystem, then you must take care
+  * to pass it an appropriate max_reserved value to avoid collisions.
+  */
++int simple_fill_super(struct super_block *s, int magic, struct tree_descr *files)
+-int simple_fill_super(struct super_block *s, unsigned long magic,
+-		      struct tree_descr *files)
+ {
+ 	struct inode *inode;
+ 	struct dentry *root;
+reverted:
+--- b/include/linux/fs.h
++++ a/include/linux/fs.h
+@@ -2376,7 +2376,7 @@
+ extern const struct inode_operations simple_dir_inode_operations;
+ struct tree_descr { char *name; const struct file_operations *ops; int mode; };
+ struct dentry *d_alloc_name(struct dentry *, const char *);
++extern int simple_fill_super(struct super_block *, int, struct tree_descr *);
+-extern int simple_fill_super(struct super_block *, unsigned long, struct tree_descr *);
+ extern int simple_pin_fs(struct file_system_type *, struct vfsmount **mount, int *count);
+ extern void simple_release_fs(struct vfsmount **mount, int *count);
+ 

Modified: dists/sid/linux-2.6/debian/patches/series/16
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/16	Fri Jul  2 03:20:26 2010	(r15924)
+++ dists/sid/linux-2.6/debian/patches/series/16	Fri Jul  2 03:41:33 2010	(r15925)
@@ -182,5 +182,6 @@
 - features/all/USB-option-Use-generic-USB-wwan-code.patch
 + bugfix/all/stable/2.6.32.16-rc1.patch
 + features/all/USB-option-Use-generic-USB-wwan-code-2.patch
++ debian/revert-wrong-type-for-magic-argument-in-simple_fill_super.patch
 - bugfix/all/drm-edid-Fix-1024x768 at 85Hz.patch
 + bugfix/all/stable/2.6.33.6-rc1.patch