EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Upgrade fuse-2.7.1 to fuse-2.7.3 to fix breakage (#3246)

Browse Source 
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>

SVN-Revision: 10698
This commit is contained in:
Florian Fainelli 2008-04-01 20:02:27 +00:00
parent ec02c6dd90
commit 3b72dadac9
6 changed files with 354 additions and 600 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/fuse/Makefile
View File

@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=fuse
PKG_VERSION:=2.7.1
PKG_VERSION:=2.7.3
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/$(PKG_NAME)
PKG_MD5SUM:=f95b4a238a3df5a92e9013ecb55c2c17
PKG_MD5SUM:=98563fc7b265b7479a3178181cbcf59a
include $(INCLUDE_DIR)/package.mk

7
package/fuse/patches/100-cross_compile.patch
View File

@ -1,7 +1,6 @@
Index: fuse-2.6.5/kernel/configure
===================================================================
--- fuse-2.6.5.orig/kernel/configure 2007-06-23 13:03:50.000000000 +0200
+++ fuse-2.6.5/kernel/configure 2007-06-23 13:03:50.000000000 +0200
diff -Nru fuse-2.7.3.orig/kernel/configure fuse-2.7.3/kernel/configure
--- fuse-2.7.3.orig/kernel/configure 2008-02-19 15:00:19.000000000 -0500
+++ fuse-2.7.3/kernel/configure 2008-03-17 14:10:14.000000000 -0400
@@ -1851,7 +1851,9 @@
{ echo "$as_me:$LINENO: checking kernel source version" >&5

7
package/fuse/patches/102-no_depmod.patch
View File

@ -1,7 +1,6 @@
Index: fuse-2.6.5/kernel/Makefile.in
===================================================================
--- fuse-2.6.5.orig/kernel/Makefile.in 2007-06-23 13:03:50.000000000 +0200
+++ fuse-2.6.5/kernel/Makefile.in 2007-06-23 13:03:50.000000000 +0200
diff -Nru fuse-2.7.3.orig/kernel/Makefile.in fuse-2.7.3/kernel/Makefile.in
--- fuse-2.7.3.orig/kernel/Makefile.in 2006-12-09 13:51:13.000000000 -0500
+++ fuse-2.7.3/kernel/Makefile.in 2008-03-17 14:12:32.000000000 -0400
@@ -25,11 +25,9 @@
install-y: all
$(mkdir_p) $(DESTDIR)$(fusemoduledir)

8
package/fuse/patches/112-no_break_on_mknod.patch
View File

@ -1,8 +1,6 @@
Index: fuse-2.6.5/util/Makefile.in
===================================================================
--- fuse-2.6.5.orig/util/Makefile.in 2007-06-23 13:03:50.000000000 +0200
+++ fuse-2.6.5/util/Makefile.in 2007-06-23 13:03:50.000000000 +0200
@@ -489,7 +489,7 @@
--- fuse-2.7.3.orig/util/Makefile.in 2008-02-19 15:00:55.000000000 -0500
+++ fuse-2.7.3/util/Makefile.in 2008-03-17 14:14:10.000000000 -0400
@@ -528,7 +528,7 @@
install-exec-hook:
-chown root $(DESTDIR)$(bindir)/fusermount
-chmod u+s $(DESTDIR)$(bindir)/fusermount

158
package/fuse/patches/200-disable_compat.patch
View File

@ -1,7 +1,6 @@
Index: fuse-2.7.1/include/fuse_common_compat.h
===================================================================
--- fuse-2.7.1.orig/include/fuse_common_compat.h 2007-10-20 17:13:51.409738304 +0200
+++ fuse-2.7.1/include/fuse_common_compat.h 2007-10-20 17:14:26.323727941 +0200
diff -Nru fuse-2.7.3.orig/include/fuse_common_compat.h fuse-2.7.3/include/fuse_common_compat.h
--- fuse-2.7.3.orig/include/fuse_common_compat.h 2008-02-19 14:51:23.000000000 -0500
+++ fuse-2.7.3/include/fuse_common_compat.h 2008-03-17 14:55:01.000000000 -0400
@@ -17,6 +17,7 @@
unsigned int keep_cache : 1;
};
@ -10,16 +9,14 @@ Index: fuse-2.7.1/include/fuse_common_compat.h
int fuse_mount_compat25(const char *mountpoint, struct fuse_args *args);
int fuse_mount_compat22(const char *mountpoint, const char *opts);
@@ -24,4 +25,4 @@
@@ -24,3 +25,4 @@
int fuse_mount_compat1(const char *mountpoint, const char *args[]);
void fuse_unmount_compat22(const char *mountpoint);
-
+#endif
Index: fuse-2.7.1/lib/fuse.c
===================================================================
--- fuse-2.7.1.orig/lib/fuse.c 2007-10-20 17:13:51.417738760 +0200
+++ fuse-2.7.1/lib/fuse.c 2007-10-20 17:26:30.657005340 +0200
diff -Nru fuse-2.7.3.orig/lib/fuse.c fuse-2.7.3/lib/fuse.c
--- fuse-2.7.3.orig/lib/fuse.c 2008-02-19 14:51:25.000000000 -0500
+++ fuse-2.7.3/lib/fuse.c 2008-03-17 15:04:54.000000000 -0400
@@ -14,8 +14,6 @@
#include "fuse_lowlevel.h"
#include "fuse_opt.h"
@ -29,7 +26,7 @@ Index: fuse-2.7.1/lib/fuse.c
#include <stdio.h>
#include <string.h>
@@ -621,127 +619,6 @@
@@ -626,129 +624,6 @@
fuse_do_prepare_interrupt(req, d);
}
@ -44,7 +41,8 @@ Index: fuse-2.7.1/lib/fuse.c
- else if (fs->compat == 22) {
- struct fuse_file_info_compat tmp;
- memcpy(&tmp, fi, sizeof(tmp));
- err = ((struct fuse_operations_compat22 *) &fs->op)->open(path, &tmp);
- err = ((struct fuse_operations_compat22 *) &fs->op)->open(path,
- &tmp);
- memcpy(fi, &tmp, sizeof(tmp));
- fi->fh = tmp.fh;
- } else
@ -119,7 +117,8 @@ Index: fuse-2.7.1/lib/fuse.c
- } else {
- struct fuse_statfs_compat1 compatbuf;
- memset(&compatbuf, 0, sizeof(struct fuse_statfs_compat1));
- err = ((struct fuse_operations_compat1 *) &fs->op)->statfs(&compatbuf);
- err = ((struct fuse_operations_compat1 *) &fs->op)
- ->statfs(&compatbuf);
- if (!err)
- convert_statfs_compat(&compatbuf, buf);
- }
@ -157,7 +156,7 @@ Index: fuse-2.7.1/lib/fuse.c
int fuse_fs_getattr(struct fuse_fs *fs, const char *path, struct stat *buf)
{
fuse_get_context()->private_data = fs->user_data;
@@ -814,7 +691,7 @@
@@ -821,7 +696,7 @@
{
fuse_get_context()->private_data = fs->user_data;
if (fs->op.release)
@ -166,7 +165,7 @@ Index: fuse-2.7.1/lib/fuse.c
else
return 0;
}
@@ -824,7 +701,7 @@
@@ -831,7 +706,7 @@
{
fuse_get_context()->private_data = fs->user_data;
if (fs->op.opendir)
@ -175,7 +174,7 @@ Index: fuse-2.7.1/lib/fuse.c
else
return 0;
}
@@ -834,7 +711,7 @@
@@ -841,7 +716,7 @@
{
fuse_get_context()->private_data = fs->user_data;
if (fs->op.open)
@ -184,7 +183,7 @@ Index: fuse-2.7.1/lib/fuse.c
else
return 0;
}
@@ -893,7 +770,7 @@
@@ -900,7 +775,7 @@
{
fuse_get_context()->private_data = fs->user_data;
if (fs->op.statfs)
@ -193,7 +192,7 @@ Index: fuse-2.7.1/lib/fuse.c
else {
buf->f_namemax = 255;
buf->f_bsize = 512;
@@ -3037,7 +2914,6 @@
@@ -3070,7 +2945,6 @@
if (!fs)
goto out_free;
@ -201,7 +200,7 @@ Index: fuse-2.7.1/lib/fuse.c
f->fs = fs;
/* Oh f**k, this is ugly! */
@@ -3079,11 +2955,6 @@
@@ -3114,11 +2988,6 @@
f->conf.readdir_ino = 1;
#endif
@ -213,7 +212,7 @@ Index: fuse-2.7.1/lib/fuse.c
f->se = fuse_lowlevel_new_common(args, &llop, sizeof(llop), f);
if (f->se == NULL) {
if (f->conf.help)
@@ -3217,19 +3088,6 @@
@@ -3254,19 +3123,6 @@
fuse_delete_context_key();
}
@ -233,10 +232,11 @@ Index: fuse-2.7.1/lib/fuse.c
/* called with fuse_context_lock held or during initialization (before
main() has been called) */
void fuse_register_module(struct fuse_module *mod)
@@ -3242,69 +3100,3 @@
@@ -3278,72 +3134,3 @@
mod->next = fuse_modules;
fuse_modules = mod;
}
-
-#ifndef __FreeBSD__
-
-static struct fuse *fuse_new_common_compat(int fd, const char *opts,
@ -272,7 +272,8 @@ Index: fuse-2.7.1/lib/fuse.c
- const struct fuse_operations_compat2 *op)
-{
- return fuse_new_common_compat(fd, opts, (struct fuse_operations *) op,
- sizeof(struct fuse_operations_compat2), 21);
- sizeof(struct fuse_operations_compat2),
- 21);
-}
-
-struct fuse *fuse_new_compat1(int fd, int flags,
@ -282,15 +283,16 @@ Index: fuse-2.7.1/lib/fuse.c
- if (flags & FUSE_DEBUG_COMPAT1)
- opts = "debug";
- return fuse_new_common_compat(fd, opts, (struct fuse_operations *) op,
- sizeof(struct fuse_operations_compat1), 11);
- sizeof(struct fuse_operations_compat1),
- 11);
-}
-
-__asm__(".symver fuse_exited,__fuse_exited@");
-__asm__(".symver fuse_process_cmd,__fuse_process_cmd@");
-__asm__(".symver fuse_read_cmd,__fuse_read_cmd@");
-__asm__(".symver fuse_set_getcontext_func,__fuse_set_getcontext_func@");
-__asm__(".symver fuse_new_compat2,fuse_new@");
-__asm__(".symver fuse_new_compat22,fuse_new@FUSE_2.2");
-FUSE_SYMVER(".symver fuse_exited,__fuse_exited@");
-FUSE_SYMVER(".symver fuse_process_cmd,__fuse_process_cmd@");
-FUSE_SYMVER(".symver fuse_read_cmd,__fuse_read_cmd@");
-FUSE_SYMVER(".symver fuse_set_getcontext_func,__fuse_set_getcontext_func@");
-FUSE_SYMVER(".symver fuse_new_compat2,fuse_new@");
-FUSE_SYMVER(".symver fuse_new_compat22,fuse_new@FUSE_2.2");
-
-#endif /* __FreeBSD__ */
-
@ -302,11 +304,10 @@ Index: fuse-2.7.1/lib/fuse.c
- op_size, 25);
-}
-
-__asm__(".symver fuse_new_compat25,fuse_new@FUSE_2.5");
Index: fuse-2.7.1/lib/fuse_lowlevel.c
===================================================================
--- fuse-2.7.1.orig/lib/fuse_lowlevel.c 2007-10-20 17:13:51.425739218 +0200
+++ fuse-2.7.1/lib/fuse_lowlevel.c 2007-10-20 17:22:46.396225455 +0200
-FUSE_SYMVER(".symver fuse_new_compat25,fuse_new@FUSE_2.5");
diff -Nru fuse-2.7.3.orig/lib/fuse_lowlevel.c fuse-2.7.3/lib/fuse_lowlevel.c
--- fuse-2.7.3.orig/lib/fuse_lowlevel.c 2008-02-19 14:51:26.000000000 -0500
+++ fuse-2.7.3/lib/fuse_lowlevel.c 2008-03-17 15:07:40.000000000 -0400
@@ -11,8 +11,6 @@
#include "fuse_opt.h"
#include "fuse_i.h"
@ -316,10 +317,11 @@ Index: fuse-2.7.1/lib/fuse_lowlevel.c
#include <stdio.h>
#include <stdlib.h>
@@ -1310,129 +1308,3 @@
@@ -1319,130 +1317,3 @@
{
return fuse_lowlevel_new_common(args, op, op_size, userdata);
}
-
-
-#ifndef __FreeBSD__
-
@ -419,9 +421,9 @@ Index: fuse-2.7.1/lib/fuse_lowlevel.c
- return 0;
-}
-
-__asm__(".symver fuse_reply_statfs_compat,fuse_reply_statfs@FUSE_2.4");
-__asm__(".symver fuse_reply_open_compat,fuse_reply_open@FUSE_2.4");
-__asm__(".symver fuse_lowlevel_new_compat,fuse_lowlevel_new@FUSE_2.4");
-FUSE_SYMVER(".symver fuse_reply_statfs_compat,fuse_reply_statfs@FUSE_2.4");
-FUSE_SYMVER(".symver fuse_reply_open_compat,fuse_reply_open@FUSE_2.4");
-FUSE_SYMVER(".symver fuse_lowlevel_new_compat,fuse_lowlevel_new@FUSE_2.4");
-
-#else /* __FreeBSD__ */
-
@ -445,20 +447,19 @@ Index: fuse-2.7.1/lib/fuse_lowlevel.c
- op_size, userdata);
-}
-
-__asm__(".symver fuse_lowlevel_new_compat25,fuse_lowlevel_new@FUSE_2.5");
Index: fuse-2.7.1/lib/helper.c
===================================================================
--- fuse-2.7.1.orig/lib/helper.c 2007-10-20 17:13:51.433739673 +0200
+++ fuse-2.7.1/lib/helper.c 2007-10-20 17:21:32.508014797 +0200
@@ -10,7 +10,6 @@
#include "fuse_i.h"
-FUSE_SYMVER(".symver fuse_lowlevel_new_compat25,fuse_lowlevel_new@FUSE_2.5");
diff -Nru fuse-2.7.3.orig/lib/helper.c fuse-2.7.3/lib/helper.c
--- fuse-2.7.3.orig/lib/helper.c 2008-02-19 14:51:27.000000000 -0500
+++ fuse-2.7.3/lib/helper.c 2008-03-17 15:10:18.000000000 -0400
@@ -11,7 +11,6 @@
#include "fuse_misc.h"
#include "fuse_opt.h"
#include "fuse_lowlevel.h"
-#include "fuse_common_compat.h"
#include <stdio.h>
#include <stdlib.h>
@@ -202,7 +201,7 @@
@@ -206,7 +205,7 @@
close(fd);
} while (fd >= 0 && fd <= 2);
@ -467,7 +468,7 @@ Index: fuse-2.7.1/lib/helper.c
if (fd == -1)
return NULL;
@@ -349,97 +348,3 @@
@@ -353,100 +352,3 @@
{
return FUSE_VERSION;
}
@ -482,7 +483,8 @@ Index: fuse-2.7.1/lib/helper.c
- int *multithreaded, int *fd)
-{
- return fuse_setup_common(argc, argv, (struct fuse_operations *) op,
- op_size, mountpoint, multithreaded, fd, NULL, 22);
- op_size, mountpoint, multithreaded, fd, NULL,
- 22);
-}
-
-struct fuse *fuse_setup_compat2(int argc, char *argv[],
@ -499,8 +501,8 @@ Index: fuse-2.7.1/lib/helper.c
- const struct fuse_operations_compat22 *op,
- size_t op_size)
-{
- return fuse_main_common(argc, argv, (struct fuse_operations *) op, op_size,
- NULL, 22);
- return fuse_main_common(argc, argv, (struct fuse_operations *) op,
- op_size, NULL, 22);
-}
-
-void fuse_main_compat1(int argc, char *argv[],
@ -514,7 +516,8 @@ Index: fuse-2.7.1/lib/helper.c
- const struct fuse_operations_compat2 *op)
-{
- return fuse_main_common(argc, argv, (struct fuse_operations *) op,
- sizeof(struct fuse_operations_compat2), NULL, 21);
- sizeof(struct fuse_operations_compat2), NULL,
- 21);
-}
-
-int fuse_mount_compat1(const char *mountpoint, const char *args[])
@ -524,11 +527,11 @@ Index: fuse-2.7.1/lib/helper.c
- return fuse_mount_compat22(mountpoint, NULL);
-}
-
-__asm__(".symver fuse_setup_compat2,__fuse_setup@");
-__asm__(".symver fuse_setup_compat22,fuse_setup@FUSE_2.2");
-__asm__(".symver fuse_teardown,__fuse_teardown@");
-__asm__(".symver fuse_main_compat2,fuse_main@");
-__asm__(".symver fuse_main_real_compat22,fuse_main_real@FUSE_2.2");
-FUSE_SYMVER(".symver fuse_setup_compat2,__fuse_setup@");
-FUSE_SYMVER(".symver fuse_setup_compat22,fuse_setup@FUSE_2.2");
-FUSE_SYMVER(".symver fuse_teardown,__fuse_teardown@");
-FUSE_SYMVER(".symver fuse_main_compat2,fuse_main@");
-FUSE_SYMVER(".symver fuse_main_real_compat22,fuse_main_real@FUSE_2.2");
-
-#endif /* __FreeBSD__ */
-
@ -539,15 +542,16 @@ Index: fuse-2.7.1/lib/helper.c
- int *multithreaded, int *fd)
-{
- return fuse_setup_common(argc, argv, (struct fuse_operations *) op,
- op_size, mountpoint, multithreaded, fd, NULL, 25);
- op_size, mountpoint, multithreaded, fd, NULL,
- 25);
-}
-
-int fuse_main_real_compat25(int argc, char *argv[],
- const struct fuse_operations_compat25 *op,
- size_t op_size)
-{
- return fuse_main_common(argc, argv, (struct fuse_operations *) op, op_size,
- NULL, 25);
- return fuse_main_common(argc, argv, (struct fuse_operations *) op,
- op_size, NULL, 25);
-}
-
-void fuse_teardown_compat22(struct fuse *fuse, int fd, char *mountpoint)
@ -561,23 +565,22 @@ Index: fuse-2.7.1/lib/helper.c
- return fuse_kern_mount(mountpoint, args);
-}
-
-__asm__(".symver fuse_setup_compat25,fuse_setup@FUSE_2.5");
-__asm__(".symver fuse_teardown_compat22,fuse_teardown@FUSE_2.2");
-__asm__(".symver fuse_main_real_compat25,fuse_main_real@FUSE_2.5");
-__asm__(".symver fuse_mount_compat25,fuse_mount@FUSE_2.5");
Index: fuse-2.7.1/lib/mount.c
===================================================================
--- fuse-2.7.1.orig/lib/mount.c 2007-10-20 17:13:51.441740129 +0200
+++ fuse-2.7.1/lib/mount.c 2007-10-20 17:22:07.209992349 +0200
@@ -9,7 +9,6 @@
#include "config.h"
-FUSE_SYMVER(".symver fuse_setup_compat25,fuse_setup@FUSE_2.5");
-FUSE_SYMVER(".symver fuse_teardown_compat22,fuse_teardown@FUSE_2.2");
-FUSE_SYMVER(".symver fuse_main_real_compat25,fuse_main_real@FUSE_2.5");
-FUSE_SYMVER(".symver fuse_mount_compat25,fuse_mount@FUSE_2.5");
diff -Nru fuse-2.7.3.orig/lib/mount.c fuse-2.7.3/lib/mount.c
--- fuse-2.7.3.orig/lib/mount.c 2008-02-19 14:51:27.000000000 -0500
+++ fuse-2.7.3/lib/mount.c 2008-03-17 15:11:02.000000000 -0400
@@ -10,7 +10,6 @@
#include "fuse_i.h"
#include "fuse_misc.h"
#include "fuse_opt.h"
-#include "fuse_common_compat.h"
#include "mount_util.h"
#include <stdio.h>
@@ -308,11 +307,6 @@
@@ -312,11 +311,6 @@
waitpid(pid, NULL, 0);
}
@ -589,7 +592,7 @@ Index: fuse-2.7.1/lib/mount.c
static int fuse_mount_fusermount(const char *mountpoint, const char *opts,
int quiet)
{
@@ -376,11 +370,6 @@
@@ -380,11 +374,6 @@
return rv;
}
@ -601,9 +604,10 @@ Index: fuse-2.7.1/lib/mount.c
static int fuse_mount_sys(const char *mnt, struct mount_opts *mo,
const char *mnt_opts)
{
@@ -579,5 +568,3 @@
@@ -587,6 +576,3 @@
free(mo.mtab_opts);
return res;
}
-__asm__(".symver fuse_mount_compat22,fuse_mount@FUSE_2.2");
-__asm__(".symver fuse_unmount_compat22,fuse_unmount@FUSE_2.2");
-
-FUSE_SYMVER(".symver fuse_mount_compat22,fuse_mount@FUSE_2.2");
-FUSE_SYMVER(".symver fuse_unmount_compat22,fuse_unmount@FUSE_2.2");

246
package/fuse/patches/300-2.6.24_fixes.patch
View File

@ -1,246 +0,0 @@
# HG changeset patch
# User mszeredi
# Date 1197485983 0
# Node ID 5b8914cfe0fb7ccfb6e7f61512374d8541f2a193
# Parent 81a85541800582144b7381e0b022c10245facc61
Fix kernel module compile for 2.6.24
--- a/kernel/dir.c Wed Dec 12 14:33:17 2007 +0000
+++ b/kernel/dir.c Wed Dec 12 18:59:43 2007 +0000
@@ -191,7 +191,7 @@ static int invalid_nodeid(u64 nodeid)
return !nodeid || nodeid == FUSE_ROOT_ID;
}
-static struct dentry_operations fuse_dentry_operations = {
+struct dentry_operations fuse_dentry_operations = {
.d_revalidate = fuse_dentry_revalidate,
};
@@ -378,6 +378,7 @@ static int fuse_create_open(struct inode
}
fuse_put_request(fc, forget_req);
d_instantiate(entry, inode);
+ fuse_invalidate_attr(dir);
fuse_change_timeout(entry, &outentry);
file = lookup_instantiate_filp(nd, entry, generic_file_open);
if (IS_ERR(file)) {
@@ -619,6 +620,9 @@ static int fuse_rename(struct inode *old
err = req->out.h.error;
fuse_put_request(fc, req);
if (!err) {
+ /* ctime changes */
+ fuse_invalidate_attr(oldent->d_inode);
+
fuse_invalidate_attr(olddir);
if (olddir != newdir)
fuse_invalidate_attr(newdir);
--- a/kernel/fuse_i.h Wed Dec 12 14:33:17 2007 +0000
+++ b/kernel/fuse_i.h Wed Dec 12 18:59:43 2007 +0000
@@ -47,6 +47,9 @@
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
# define KERNEL_2_6_23_PLUS
+#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
+# define KERNEL_2_6_24_PLUS
#endif
#if defined(__arm__) && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
@@ -647,3 +650,5 @@ int fuse_valid_type(int m);
* Is task allowed to perform filesystem operation?
*/
int fuse_allow_task(struct fuse_conn *fc, struct task_struct *task);
+
+extern struct dentry_operations fuse_dentry_operations;
--- a/kernel/inode.c Wed Dec 12 14:33:17 2007 +0000
+++ b/kernel/inode.c Wed Dec 12 18:59:43 2007 +0000
@@ -520,21 +520,26 @@ static struct inode *get_root_inode(stru
#ifdef HAVE_EXPORTFS_H
#include <linux/exportfs.h>
#endif
-static struct dentry *fuse_get_dentry(struct super_block *sb, void *vobjp)
+
+struct fuse_inode_handle
{
- __u32 *objp = vobjp;
- unsigned long nodeid = objp[0];
- __u32 generation = objp[1];
+ u64 nodeid;
+ u32 generation;
+};
+
+static struct dentry *fuse_get_dentry(struct super_block *sb,
+ struct fuse_inode_handle *handle)
+{
struct inode *inode;
struct dentry *entry;
- if (nodeid == 0)
+ if (handle->nodeid == 0)
return ERR_PTR(-ESTALE);
- inode = ilookup5(sb, nodeid, fuse_inode_eq, &nodeid);
+ inode = ilookup5(sb, handle->nodeid, fuse_inode_eq, &handle->nodeid);
if (!inode)
return ERR_PTR(-ESTALE);
- if (inode->i_generation != generation) {
+ if (inode->i_generation != handle->generation) {
iput(inode);
return ERR_PTR(-ESTALE);
}
@@ -544,42 +549,130 @@ static struct dentry *fuse_get_dentry(st
iput(inode);
return ERR_PTR(-ENOMEM);
}
+ entry->d_op = &fuse_dentry_operations;
return entry;
}
-static int fuse_encode_fh(struct dentry *dentry, __u32 *fh, int *max_len,
- int connectable)
+static int fuse_encode_fh(struct dentry *dentry, u32 *fh, int *max_len,
+ int connectable)
{
struct inode *inode = dentry->d_inode;
int len = *max_len;
int type = 1;
+ u64 nodeid;
+ u32 generation;
- if (len < 2 || (connectable && len < 4))
- return 255;
+ if (len < 3 || (connectable && len < 6))
+ return 255;
- len = 2;
- fh[0] = get_fuse_inode(inode)->nodeid;
- fh[1] = inode->i_generation;
+ nodeid = get_fuse_inode(inode)->nodeid;
+ generation = inode->i_generation;
+
+ len = 3;
+ fh[0] = (u32)(nodeid >> 32);
+ fh[1] = (u32)(nodeid & 0xffffffff);
+ fh[2] = generation;
+
if (connectable && !S_ISDIR(inode->i_mode)) {
struct inode *parent;
spin_lock(&dentry->d_lock);
parent = dentry->d_parent->d_inode;
- fh[2] = get_fuse_inode(parent)->nodeid;
- fh[3] = parent->i_generation;
+ nodeid = get_fuse_inode(parent)->nodeid;
+ generation = parent->i_generation;
+
+ fh[3] = (u32)(nodeid >> 32);
+ fh[4] = (u32)(nodeid & 0xffffffff);
+ fh[5] = generation;
spin_unlock(&dentry->d_lock);
- len = 4;
+
+ len = 6;
type = 2;
}
+
*max_len = len;
return type;
}
+#ifdef KERNEL_2_6_24_PLUS
+static struct dentry *fuse_fh_to_dentry(struct super_block *sb,
+ struct fid *fid, int fh_len, int fh_type)
+{
+ struct fuse_inode_handle handle;
+
+ if (fh_len < 3 || fh_type > 2)
+ return NULL;
+
+ handle.nodeid = (u64) fid->raw[0] << 32;
+ handle.nodeid |= (u64) fid->raw[1];
+ handle.generation = fid->raw[2];
+ return fuse_get_dentry(sb, &handle);
+}
+
+static struct dentry *fuse_fh_to_parent(struct super_block *sb,
+ struct fid *fid, int fh_len, int fh_type)
+{
+ struct fuse_inode_handle parent;
+
+ if (fh_type != 2 || fh_len < 6)
+ return NULL;
+
+ parent.nodeid = (u64) fid->raw[3] << 32;
+ parent.nodeid |= (u64) fid->raw[4];
+ parent.generation = fid->raw[5];
+ return fuse_get_dentry(sb, &parent);
+}
+
+
+static const struct export_operations fuse_export_operations = {
+ .fh_to_dentry = fuse_fh_to_dentry,
+ .fh_to_parent = fuse_fh_to_parent,
+ .encode_fh = fuse_encode_fh,
+};
+#else
+static struct dentry *fuse_get_dentry_old(struct super_block *sb, void *objp)
+{
+ return fuse_get_dentry(sb, objp);
+}
+
+static struct dentry *fuse_decode_fh(struct super_block *sb, u32 *fh,
+ int fh_len, int fileid_type,
+ int (*acceptable)(void *context, struct dentry *de),
+ void *context)
+{
+ struct fuse_inode_handle handle;
+ struct fuse_inode_handle parent;
+
+ if (fh_len < 3 || fileid_type > 2)
+ return NULL;
+
+ if (fileid_type == 2) {
+ if (fh_len < 6)
+ return NULL;
+
+ parent.nodeid = (u64) fh[3] << 32;
+ parent.nodeid |= (u64) fh[4];
+ parent.generation = fh[5];
+ } else {
+ parent.nodeid = 0;
+ parent.generation = 0;
+ }
+
+ handle.nodeid = (u64) fh[0] << 32;
+ handle.nodeid |= (u64) fh[1];
+ handle.generation = fh[2];
+
+ return ret = fuse_export_operations.
+ find_exported_dentry(sb, &handle, &parent, acceptable, context);
+}
+
static struct export_operations fuse_export_operations = {
- .get_dentry = fuse_get_dentry,
+ .get_dentry = fuse_get_dentry_old,
.encode_fh = fuse_encode_fh,
+ .decode_fh = fuse_decode_fh,
};
+#endif
#endif
static struct super_operations fuse_super_operations = {
@@ -845,8 +938,12 @@ static decl_subsys(fuse, NULL, NULL);
static decl_subsys(fuse, NULL, NULL);
static decl_subsys(connections, NULL, NULL);
+#ifdef KERNEL_2_6_24_PLUS
+static void fuse_inode_init_once(struct kmem_cache *cachep, void *foo)
+#else
static void fuse_inode_init_once(void *foo, struct kmem_cache *cachep,
unsigned long flags)
+#endif
{
struct inode * inode = foo;