This commit was manufactured by cvs2git to create tag 'auto-ac-shfs-

0_35-58'.

Sprout from AC-branch 2008-01-18 12:26:09 UTC Elan Ruusamäe <glen@pld-linux.org> '- rel 58 (2.6.16.58-1)'
Cherrypick from master 2006-12-10 12:07:13 UTC Adam Gołębiowski <adamg@pld-linux.org> '- fix build on kernels >= 2.6.18':
    shfs-shfs_get_sb.patch -> 1.1

diff --git a/shfs-shfs_get_sb.patch b/shfs-shfs_get_sb.patch
new file mode 100644 (file)
index 0000000..0971c66
--- /dev/null
+++ b/shfs-shfs_get_sb.patch
@@ -0,0 +1,25 @@
+--- shfs-0.35/shfs/Linux-2.6/inode.c.orig      2006-12-10 12:47:30.000000000 +0100
++++ shfs-0.35/shfs/Linux-2.6/inode.c   2006-12-10 12:57:35.000000000 +0100
+@@ -341,12 +341,22 @@
+       return -EINVAL;
+ }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18)
+ static struct super_block *
+ shfs_get_sb(struct file_system_type *fs_type,
+           int flags, const char *dev_name, void *data)
+ {
+       return get_sb_nodev(fs_type, flags, data, shfs_read_super);
+ }
++#else
++static struct super_block *
++shfs_get_sb(struct file_system_type *fs_type,
++          int flags, const char *dev_name, void *data,
++          struct vfsmount *mnt)
++{
++      return get_sb_nodev(fs_type, flags, data, shfs_read_super, mnt);
++}
++#endif
+ 
+ static struct file_system_type sh_fs_type = {
+       .owner          = THIS_MODULE,