Date: Thu, 6 Oct 2005 01:17:28 GMT From: soc-chenk <soc-chenk@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 84877 for review Message-ID: <200510060117.j961HSqI094915@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=84877 Change 84877 by soc-chenk@soc-chenk_leavemealone on 2005/10/06 01:16:41 Upgrade userspace to 2.4.0 (completed) Submitted by: soc-chenk Affected files ... .. //depot/projects/soc2005/fuse4bsd2/fuselib/fuselib-2.4.0.diff#2 edit Differences ... ==== //depot/projects/soc2005/fuse4bsd2/fuselib/fuselib-2.4.0.diff#2 (text+ko) ==== @@ -1,6 +1,6 @@ diff -Naur linuxfuse/example/fusexmp.c bsdfuse/example/fusexmp.c --- linuxfuse/example/fusexmp.c Tue Sep 13 21:26:12 2005 -+++ bsdfuse/example/fusexmp.c Tue Oct 4 23:02:55 2005 ++++ bsdfuse/example/fusexmp.c Thu Oct 6 02:38:03 2005 @@ -20,7 +20,12 @@ #include <fcntl.h> #include <dirent.h> @@ -37,7 +37,7 @@ diff -Naur linuxfuse/example/fusexmp_fh.c bsdfuse/example/fusexmp_fh.c --- linuxfuse/example/fusexmp_fh.c Tue Sep 13 21:26:12 2005 -+++ bsdfuse/example/fusexmp_fh.c Tue Oct 4 23:04:44 2005 ++++ bsdfuse/example/fusexmp_fh.c Thu Oct 6 02:38:03 2005 @@ -17,7 +17,12 @@ #include <fcntl.h> #include <dirent.h> @@ -99,8 +99,8 @@ if(res == -1) return -errno; diff -Naur linuxfuse/include/fuse.h bsdfuse/include/fuse.h ---- linuxfuse/include/fuse.h Thu Sep 8 17:16:48 2005 -+++ bsdfuse/include/fuse.h Fri Sep 30 11:29:31 2005 +--- linuxfuse/include/fuse.h Mon Oct 3 16:12:50 2005 ++++ bsdfuse/include/fuse.h Thu Oct 6 02:38:03 2005 @@ -20,7 +20,12 @@ #include <sys/types.h> @@ -115,8 +115,8 @@ #ifdef __cplusplus diff -Naur linuxfuse/include/fuse_lowlevel.h bsdfuse/include/fuse_lowlevel.h ---- linuxfuse/include/fuse_lowlevel.h Thu Sep 15 13:26:16 2005 -+++ bsdfuse/include/fuse_lowlevel.h Fri Sep 30 11:29:31 2005 +--- linuxfuse/include/fuse_lowlevel.h Mon Oct 3 16:12:50 2005 ++++ bsdfuse/include/fuse_lowlevel.h Thu Oct 6 02:38:03 2005 @@ -18,7 +18,12 @@ #include <utime.h> #include <sys/types.h> @@ -131,8 +131,8 @@ #ifdef __cplusplus diff -Naur linuxfuse/lib/fuse.c bsdfuse/lib/fuse.c ---- linuxfuse/lib/fuse.c Thu Sep 8 17:16:49 2005 -+++ bsdfuse/lib/fuse.c Fri Sep 30 17:59:29 2005 +--- linuxfuse/lib/fuse.c Mon Oct 3 17:02:37 2005 ++++ bsdfuse/lib/fuse.c Thu Oct 6 02:38:03 2005 @@ -1414,7 +1414,12 @@ static int default_statfs(struct statfs *buf) @@ -184,8 +184,8 @@ } diff -Naur linuxfuse/lib/fuse_lowlevel.c bsdfuse/lib/fuse_lowlevel.c ---- linuxfuse/lib/fuse_lowlevel.c Thu Sep 8 17:16:49 2005 -+++ bsdfuse/lib/fuse_lowlevel.c Fri Sep 30 11:29:31 2005 +--- linuxfuse/lib/fuse_lowlevel.c Mon Oct 3 17:15:05 2005 ++++ bsdfuse/lib/fuse_lowlevel.c Thu Oct 6 02:38:03 2005 @@ -194,7 +194,11 @@ kstatfs->bavail = stbuf->f_bavail; kstatfs->files = stbuf->f_files; @@ -198,7 +198,7 @@ } static int send_reply_ok(fuse_req_t req, const void *arg, size_t argsize) -@@ -705,7 +709,11 @@ +@@ -690,7 +694,11 @@ req->ch = ch; if (!f->got_init && in->opcode != FUSE_INIT) @@ -212,7 +212,7 @@ in->opcode != FUSE_WRITE && in->opcode != FUSE_FSYNC && diff -Naur linuxfuse/lib/helper.c bsdfuse/lib/helper.c --- linuxfuse/lib/helper.c Mon Aug 15 16:03:59 2005 -+++ bsdfuse/lib/helper.c Fri Sep 30 17:57:56 2005 ++++ bsdfuse/lib/helper.c Thu Oct 6 02:38:03 2005 @@ -22,7 +22,11 @@ { if (progname) @@ -274,8 +274,8 @@ } diff -Naur linuxfuse/lib/mount.c bsdfuse/lib/mount.c ---- linuxfuse/lib/mount.c Wed Aug 3 12:22:32 2005 -+++ bsdfuse/lib/mount.c Fri Sep 30 11:29:31 2005 +--- linuxfuse/lib/mount.c Sun Oct 2 11:16:12 2005 ++++ bsdfuse/lib/mount.c Thu Oct 6 02:38:03 2005 @@ -21,7 +21,7 @@ #define FUSERMOUNT_PROG "fusermount" #define FUSE_COMMFD_ENV "_FUSE_COMMFD" @@ -393,14 +393,14 @@ int fuse_mount_compat1(const char *mountpoint, const char *args[]) diff -Naur linuxfuse/util/fusermount.c bsdfuse/util/fusermount.c ---- linuxfuse/util/fusermount.c Mon Sep 26 13:18:07 2005 -+++ bsdfuse/util/fusermount.c Fri Sep 30 11:29:31 2005 +--- linuxfuse/util/fusermount.c Mon Oct 3 17:02:37 2005 ++++ bsdfuse/util/fusermount.c Thu Oct 6 02:38:03 2005 @@ -1,3 +1,4 @@ +#ifndef __FreeBSD__ /* FUSE: Filesystem in Userspace Copyright (C) 2001-2005 Miklos Szeredi <miklos@szeredi.hu> -@@ -1108,3 +1109,12 @@ +@@ -1113,3 +1114,12 @@ return 0; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200510060117.j961HSqI094915>