Add patch for 2.6.17 compilation (bug #149715)

Package-Manager: portage-2.1.2_pre3-r1

3 files changed, 158 insertions, 5 deletions

diff --git a/net-fs/shfs/ChangeLog b/net-fs/shfs/ChangeLog
index 0381f99876a4..2e383b71292a 100644
--- a/net-fs/shfs/ChangeLog
+++ b/net-fs/shfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/shfs
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/ChangeLog,v 1.34 2006/07/12 20:12:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/ChangeLog,v 1.35 2006/10/16 02:31:03 compnerd Exp $
+
+  16 Oct 2006; <compnerd@gentoo.org>
+  +files/0.35/shfs-0.35-2.6.18-dentry.patch:
+  Add a patch for compiling with kernel >=2.6.17 from Daniel Drake <dsd (at)
+  gentoo (dot) org>
 
   12 Jul 2006; Aron Griffis <agriffis@gentoo.org> shfs-0.35-r3.ebuild:
   Mark 0.35-r3 stable on ia64. #133613
diff --git a/net-fs/shfs/Manifest b/net-fs/shfs/Manifest
index 13eda65b55ae..798a1961e91e 100644
--- a/net-fs/shfs/Manifest
+++ b/net-fs/shfs/Manifest
@@ -2,6 +2,10 @@ AUX 0.35/df.patch 1652 RMD160 88344860762ea85470e330e971707b24ffe07030 SHA1 5852
 MD5 29b3f063e5feb8c259abc86d07f92f85 files/0.35/df.patch 1652
 RMD160 88344860762ea85470e330e971707b24ffe07030 files/0.35/df.patch 1652
 SHA256 7d775f368e42e250040d48487c1123bd17ba0c953b7d5a5ec9538df6e12a2db4 files/0.35/df.patch 1652
+AUX 0.35/shfs-0.35-2.6.18-dentry.patch 4055 RMD160 a487e70f18089855236c35eb24ba46fa19abdc78 SHA1 0c6c7b85e8a19feb24e061bde9362d0df07c2685 SHA256 2555c9f26793a353946732f9f9b210d89b8d7ec350f7f2866fb77f1ca472e6e4
+MD5 d3d022b4dfb3f6cab5ac8fca8552091f files/0.35/shfs-0.35-2.6.18-dentry.patch 4055
+RMD160 a487e70f18089855236c35eb24ba46fa19abdc78 files/0.35/shfs-0.35-2.6.18-dentry.patch 4055
+SHA256 2555c9f26793a353946732f9f9b210d89b8d7ec350f7f2866fb77f1ca472e6e4 files/0.35/shfs-0.35-2.6.18-dentry.patch 4055
 AUX 0.35/shfs-0.35-clean-inode-clear.patch 496 RMD160 950527770374b1a55f08cf1d779a7ae5940bcf8c SHA1 285b782e575f568f9038177deb3b9866d0921680 SHA256 7513c2a3f25a7ac42c94c89f9dda3e658558fcd716210dde94cc1c8df16915a9
 MD5 47388261d70d4dc5210fd93021dc8479 files/0.35/shfs-0.35-clean-inode-clear.patch 496
 RMD160 950527770374b1a55f08cf1d779a7ae5940bcf8c files/0.35/shfs-0.35-clean-inode-clear.patch 496
@@ -47,10 +51,10 @@ EBUILD shfs-0.35-r3.ebuild 2974 RMD160 2ceb1f0940af8e4d076655482bfd52b040a18032
 MD5 d299ae4382555595a5444633a63d614b shfs-0.35-r3.ebuild 2974
 RMD160 2ceb1f0940af8e4d076655482bfd52b040a18032 shfs-0.35-r3.ebuild 2974
 SHA256 58f2ae41ec236fa941d88be594d56e7ff76de1e8124617bca1241f3f85d8c9ad shfs-0.35-r3.ebuild 2974
-MISC ChangeLog 5303 RMD160 33f3d11f1c6f95e794b9a17ed63aa578e4dffcda SHA1 78ee7fc3172ef5e8484d99fbf5f449edd32ff9e0 SHA256 093858bfa461894bb55d34e38532f0eb0dd4ebfe3d4dc08adc904cf7781af1a6
-MD5 d682f0e0efc9f1d6fd061437b66344cf ChangeLog 5303
-RMD160 33f3d11f1c6f95e794b9a17ed63aa578e4dffcda ChangeLog 5303
-SHA256 093858bfa461894bb55d34e38532f0eb0dd4ebfe3d4dc08adc904cf7781af1a6 ChangeLog 5303
+MISC ChangeLog 5483 RMD160 b4ab3811b1e77907c2e248fff99ce0557549efe8 SHA1 3785e333f523261e3a696fbf20bb24602821b9e3 SHA256 dbb1e21883cc278df4fddf729df51255339f688e7ca9a81422e91b7415e38c40
+MD5 c2800fc32d6c8721f771010794150ed8 ChangeLog 5483
+RMD160 b4ab3811b1e77907c2e248fff99ce0557549efe8 ChangeLog 5483
+SHA256 dbb1e21883cc278df4fddf729df51255339f688e7ca9a81422e91b7415e38c40 ChangeLog 5483
 MISC metadata.xml 316 RMD160 30fe60772d122936494f213695185bb0813573cd SHA1 61bd32ae3070498a6de3293057e635857ebd02d9 SHA256 b35b4409d798f1bbed76ec77c74cd92f7a039d9ce6a46a354d923dadaacbf5f2
 MD5 b66027267bc1b372e656d834984ad137 metadata.xml 316
 RMD160 30fe60772d122936494f213695185bb0813573cd metadata.xml 316
diff --git a/net-fs/shfs/files/0.35/shfs-0.35-2.6.18-dentry.patch b/net-fs/shfs/files/0.35/shfs-0.35-2.6.18-dentry.patch
new file mode 100644
index 000000000000..972b0ef0016f
--- /dev/null
+++ b/net-fs/shfs/files/0.35/shfs-0.35-2.6.18-dentry.patch
@@ -0,0 +1,144 @@
+Index: shfs-0.35/shfs/Linux-2.6/inode.c
+===================================================================
+--- shfs-0.35.orig/shfs/Linux-2.6/inode.c
++++ shfs-0.35/shfs/Linux-2.6/inode.c
+@@ -341,12 +341,21 @@ out:
+ 	return -EINVAL;
+ }
+ 
++#ifdef NEW_VFS_DENTRY_API
++static int
++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);
++}
++#else
+ 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);
+ }
++#endif
+ 
+ static struct file_system_type sh_fs_type = {
+ 	.owner		= THIS_MODULE,
+Index: shfs-0.35/shfs/Linux-2.6/file.c
+===================================================================
+--- shfs-0.35.orig/shfs/Linux-2.6/file.c
++++ shfs-0.35/shfs/Linux-2.6/file.c
+@@ -199,7 +199,7 @@ shfs_file_open(struct inode *inode, stru
+ }
+ 
+ static int
+-shfs_file_flush(struct file *f)
++do_file_flush(struct file *f)
+ {
+ 	struct dentry *dentry = f->f_dentry;
+ 	struct shfs_sb_info *info = info_from_dentry(dentry);
+@@ -222,6 +222,16 @@ shfs_file_flush(struct file *f)
+ }
+ 
+ static int
++#ifdef FLUSH_HAS_LOCK_OWNER
++shfs_file_flush(struct file *f, fl_owner_t id)
++#else
++shfs_file_flush(struct file *f)
++#endif
++{
++	return do_file_flush(f);
++}
++
++static int
+ shfs_file_release(struct inode *inode, struct file *f)
+ {
+ 	struct dentry *dentry = f->f_dentry;
+@@ -311,7 +321,7 @@ shfs_slow_write(struct file *f, const ch
+ 	DEBUG("\n");
+ 	written = generic_file_write(f, buf, count, offset);
+ 	if (written > 0) {
+-		result = shfs_file_flush(f);
++		result = do_file_flush(f);
+ 		written = result < 0 ? result: written;
+ 	}
+ 	
+Index: shfs-0.35/shfs/Linux-2.6/proc.c
+===================================================================
+--- shfs-0.35.orig/shfs/Linux-2.6/proc.c
++++ shfs-0.35/shfs/Linux-2.6/proc.c
+@@ -570,6 +570,16 @@ error:
+ 	return result;
+ }
+ 
++#ifdef NEW_VFS_DENTRY_API
++int
++shfs_statfs(struct dentry *dentry, struct kstatfs *attr)
++{
++	struct shfs_sb_info *info = info_from_sb(dentry->d_sb);
++
++	DEBUG("\n");
++	return info->fops.statfs(info, attr);
++}
++#else
+ int
+ shfs_statfs(struct super_block *sb, struct kstatfs *attr)
+ {
+@@ -578,4 +588,5 @@ shfs_statfs(struct super_block *sb, stru
+ 	DEBUG("\n");
+ 	return info->fops.statfs(info, attr);
+ }
++#endif
+ 
+Index: shfs-0.35/shfs/Linux-2.6/shfs_fs.h
+===================================================================
+--- shfs-0.35.orig/shfs/Linux-2.6/shfs_fs.h
++++ shfs-0.35/shfs/Linux-2.6/shfs_fs.h
+@@ -9,6 +9,12 @@
+ 
+ #include <linux/ioctl.h>
+ #include <linux/pagemap.h>
++#include <linux/version.h>
++
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17)
++#define NEW_VFS_DENTRY_API
++#define FLUSH_HAS_LOCK_OWNER
++#endif
+ 
+ #define SHFS_MAX_AGE(info)	(((info)->ttl * HZ) / 1000)
+ #define SOCKBUF_SIZE		(SHFS_PATH_MAX * 10)
+@@ -100,7 +106,12 @@ int reply(char *s);
+ void set_garbage(struct shfs_sb_info *info, int write, int count);
+ int get_name(struct dentry *d, char *name);
+ int shfs_notify_change(struct dentry *dentry, struct iattr *attr);
++
++#ifdef NEW_VFS_DENTRY_API
++int shfs_statfs(struct dentry *dentry, struct kstatfs *attr);
++#else
+ int shfs_statfs(struct super_block *sb, struct kstatfs *attr);
++#endif
+ 	
+ /* shfs/inode.c */
+ void shfs_set_inode_attr(struct inode *inode, struct shfs_fattr *fattr);
+Index: shfs-0.35/shfs/Linux-2.6/symlink.c
+===================================================================
+--- shfs-0.35.orig/shfs/Linux-2.6/symlink.c
++++ shfs-0.35/shfs/Linux-2.6/symlink.c
+@@ -41,7 +41,7 @@ error:
+ 	return result;
+ }
+ 
+-static int
++static void *
+ shfs_follow_link(struct dentry *dentry, struct nameidata *nd)
+ {
+ 	struct shfs_sb_info *info = info_from_dentry(dentry);
+@@ -61,7 +61,7 @@ shfs_follow_link(struct dentry *dentry, 
+ 	DEBUG("%s\n", real_name);
+ 	result = vfs_follow_link(nd, real_name);
+ error:
+-	return result;
++	return NULL;
+ }
+ 
+ struct inode_operations shfs_symlink_inode_operations = {