[patch] patch to make it work with kernel 2.6.11

fistgen-0.1.1-linux-2.6.11.patch (text/plain), 3.64 KB, created by David Guerizec on 2005-05-11 16:47:35 UTC

diff -ru fistgen-0.1.1/templates/Linux-2.6.old/file.c fistgen-0.1.1/templates/Linux-2.6/file.c
--- fistgen-0.1.1/templates/Linux-2.6.old/file.c	2005-05-11 00:13:15.000000000 +0200
+++ fistgen-0.1.1/templates/Linux-2.6/file.c	2005-05-11 00:51:03.000000000 +0200
@@ -693,9 +693,6 @@
 		fl->fl_file = file;
 		if (err < 0)
 			goto out;
-		else if (err == LOCK_USE_CLNT)
-			/* Bypass for NFS with no locking - 2.0.36 compat */
-			tmpfl = posix_test_lock(lower_file, fl);
 	} else {
 		tmpfl = posix_test_lock(lower_file, fl);
 	}
diff -ru fistgen-0.1.1/templates/Linux-2.6.old/inode.c fistgen-0.1.1/templates/Linux-2.6/inode.c
--- fistgen-0.1.1/templates/Linux-2.6.old/inode.c	2005-05-11 00:13:15.000000000 +0200
+++ fistgen-0.1.1/templates/Linux-2.6/inode.c	2005-05-11 16:45:18.000000000 +0200
@@ -208,6 +208,7 @@
         int err = 0;
         dentry_t *lower_dir_dentry;
         dentry_t *lower_dentry = NULL;
+        dentry_t *hidden_dentry = NULL;
         const char *name;
         vnode_t *this_vnode;
         dentry_t *this_dir;
@@ -1131,7 +1132,7 @@
         lower_inode = INODE_TO_LOWER(inode);/* CPW: Moved below print_entry_location */
         mode = inode->i_mode;
 
-        err = vfs_permission(inode, mask);
+        err = generic_permission(inode, mask, NULL);
         if (err)
                 goto out;
 
@@ -1265,7 +1266,7 @@
  * BKL held by caller.
  * dentry->d_inode->i_sem down
  */
-STATIC int
+STATIC ssize_t
 wrapfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
 {
         struct dentry *lower_dentry = NULL;
@@ -1568,7 +1569,7 @@
  * BKL held by caller.
  * dentry->d_inode->i_sem down
  */
-STATIC int
+STATIC ssize_t
 wrapfs_listxattr(struct dentry *dentry, char *list, size_t size)
 {
         struct dentry *lower_dentry = NULL;
diff -ru fistgen-0.1.1/templates/Linux-2.6.old/main.c fistgen-0.1.1/templates/Linux-2.6/main.c
--- fistgen-0.1.1/templates/Linux-2.6.old/main.c	2005-05-11 00:13:15.000000000 +0200
+++ fistgen-0.1.1/templates/Linux-2.6/main.c	2005-05-11 17:42:43.000000000 +0200
@@ -93,8 +93,8 @@
 	/* Fix our inode's address operations to that of the lower inode */
 	if (inode->i_mapping->a_ops != lower_inode->i_mapping->a_ops) {
 		fist_dprint(7, "fixing inode 0x%x a_ops (0x%x -> 0x%x)\n",
-                            (int) inode, (int) inode->i_mapping->a_ops,
-                            (int) lower_inode->i_mapping->a_ops);
+                            inode, inode->i_mapping->a_ops,
+                            lower_inode->i_mapping->a_ops);
 		inode->i_mapping->a_ops = lower_inode->i_mapping->a_ops;
 	}
 #endif /* not FIST_FILTER_DATA */
diff -ru fistgen-0.1.1/templates/Linux-2.6.old/super.c fistgen-0.1.1/templates/Linux-2.6/super.c
--- fistgen-0.1.1/templates/Linux-2.6.old/super.c	2005-05-11 00:13:15.000000000 +0200
+++ fistgen-0.1.1/templates/Linux-2.6/super.c	2005-05-11 17:43:44.000000000 +0200
@@ -66,7 +66,7 @@
         /* I don't think ->a_ops is ever allowed to be NULL */
         inode->i_mapping->a_ops = &wrapfs_empty_aops;
         fist_dprint(7, "setting inode 0x%x a_ops to empty (0x%x)\n",
-                    (int) inode, (int) inode->i_mapping->a_ops);
+                    inode, inode->i_mapping->a_ops);
 #endif /* not FIST_FILTER_DATA */
 
         print_exit_location();
@@ -79,7 +79,7 @@
  * will have been marked 'dirty' anyway. But we might need
  * to write some of our own stuff to disk.
  */
-STATIC void
+STATIC int
 wrapfs_write_inode(inode_t *inode, int sync)
 {
         print_entry_location();
@@ -87,6 +87,7 @@
         wrapfs_idx_write(inode);
 #endif /* FIST_FILTER_SCA */
         print_exit_location();
+	return 0;
 }
 #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */