From e8b6453a73a5d0ddbb47738d9336237b637431a6 Mon Sep 17 00:00:00 2001 From: cvs2git Date: Tue, 27 Mar 2007 22:17:47 +0000 Subject: [PATCH] This commit was manufactured by cvs2git to create tag 'AC-STABLE'. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Sprout from AC-branch 2007-03-27 22:17:47 UTC Elan Ruusamäe '- rel 21 (kernel 2.6.16.45)' Cherrypick from master 2006-12-10 12:07:13 UTC Adam Gołębiowski '- fix build on kernels >= 2.6.18': shfs-shfs_get_sb.patch -> 1.1 --- shfs-shfs_get_sb.patch | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 shfs-shfs_get_sb.patch diff --git a/shfs-shfs_get_sb.patch b/shfs-shfs_get_sb.patch new file mode 100644 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, -- 2.44.0