From 836d786dfdd41e91d39606a3adc8f8f9ec418431 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Fri, 9 May 2008 15:09:14 +0000 Subject: [PATCH] Update to 1.3.8 final. --- .cvsignore | 2 +- glusterfs-1.3.8pre6-tla751.patch | 96 -------------------------------- glusterfs.spec | 11 ++-- sources | 2 +- 4 files changed, 8 insertions(+), 103 deletions(-) delete mode 100644 glusterfs-1.3.8pre6-tla751.patch diff --git a/.cvsignore b/.cvsignore index 701281f..025cfa4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -glusterfs-1.3.8pre6.tar.gz +glusterfs-1.3.8.tar.gz diff --git a/glusterfs-1.3.8pre6-tla751.patch b/glusterfs-1.3.8pre6-tla751.patch deleted file mode 100644 index 95b2d91..0000000 --- a/glusterfs-1.3.8pre6-tla751.patch +++ /dev/null @@ -1,96 +0,0 @@ ---- glusterfs-1.3.8pre6/glusterfs/src/glusterfs.c 2008-04-15 17:30:12.000000000 +0200 -+++ glusterfs-1.3.8/glusterfs/src/glusterfs.c 2008-04-22 11:08:52.000000000 +0200 -@@ -492,7 +492,7 @@ main (int32_t argc, char *argv[]) - signal (SIGUSR1, (sighandler_t)malloc_stats); - #endif - /* This is used to dump details */ -- signal (SIGUSR2, (sighandler_t)glusterfs_stats); -+ signal (SIGUSR2, glusterfs_stats); - - #if HAVE_BACKTRACE - /* Handle SIGABORT and SIGSEGV */ -@@ -540,11 +540,21 @@ main (int32_t argc, char *argv[]) - - if (ctx->mount_point) { - graph = fuse_graph (graph); -+ /* Initialize the FUSE before the transport */ -+ if (graph->init (graph) == -1) { -+ gf_log ("glusterfs", GF_LOG_ERROR, "Initializing FUSE failed"); -+ return -1; -+ } -+ graph->ready = 1; /* Initialization Done */ - } - - if (xlator_graph_init (graph) == -1) { - gf_log ("glusterfs", GF_LOG_ERROR, - "Initializing graph failed"); -+ if (ctx->mount_point) { -+ /* Just call umount of FUSE */ -+ graph->fini (graph); -+ } - return -1; - } - ---- glusterfs-1.3.8pre6/libglusterfs/src/common-utils.h 2008-04-04 20:49:55.000000000 +0200 -+++ glusterfs-1.3.8/libglusterfs/src/common-utils.h 2008-04-22 11:08:51.000000000 +0200 -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - void trap (void); - ---- glusterfs-1.3.8pre6/libglusterfs/src/revision.h 2008-04-17 20:21:59.000000000 +0200 -+++ glusterfs-1.3.8/libglusterfs/src/revision.h 2008-04-22 11:08:52.000000000 +0200 -@@ -1 +1 @@ --#define GLUSTERFS_REPOSITORY_REVISION "glusterfs--mainline--2.5--patch-748" -+#define GLUSTERFS_REPOSITORY_REVISION "glusterfs--mainline--2.5--patch-751" ---- glusterfs-1.3.8pre6/xlators/mount/fuse/src/fuse-bridge.c 2008-04-03 20:27:48.000000000 +0200 -+++ glusterfs-1.3.8/xlators/mount/fuse/src/fuse-bridge.c 2008-04-22 11:08:52.000000000 +0200 -@@ -2658,8 +2658,11 @@ init (xlator_t *this) - void - fini (xlator_t *this) - { -- -- -+ struct fuse_private *priv = this->private; -+ if (dict_get (this->options, "mount-point")) { -+ char *mount_point = data_to_str (dict_get (this->options, "mount-point")); -+ fuse_unmount (mount_point, priv->ch); -+ } - } - - struct xlator_fops fops = { ---- glusterfs-1.3.8pre6/xlators/storage/posix/src/posix.c 2008-04-02 18:44:05.000000000 +0200 -+++ glusterfs-1.3.8/xlators/storage/posix/src/posix.c 2008-04-22 11:08:51.000000000 +0200 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #include "glusterfs.h" - #include "dict.h" -@@ -2162,16 +2163,18 @@ posix_readdir (call_frame_t *frame, - /* TODO - consider endianness here */ - this_entry = (void *)(buf + filled); - this_entry->d_ino = entry->d_ino; -- this_entry->d_type = entry->d_type; - this_entry->d_len = entry->d_reclen; - --#ifdef GF_LINUX_HOST_OS -- this_entry->d_off = entry->d_off; -+#ifndef GF_SOLARIS_HOST_OS -+ this_entry->d_type = entry->d_type; - #endif - #ifdef GF_DARWIN_HOST_OS - this_entry->d_off = telldir(dir); - /* d_reclen in Linux == d_namlen in Darwin */ - this_entry->d_len = entry->d_namlen; -+#else -+ /* For all other OS types */ -+ this_entry->d_off = entry->d_off; - #endif - - strncpy (this_entry->d_name, entry->d_name, this_entry->d_len); diff --git a/glusterfs.spec b/glusterfs.spec index 651ede2..79bc529 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -14,17 +14,16 @@ Summary: Cluster File System Name: glusterfs Version: 1.3.8 -Release: 0.10%{?dist} +Release: 1%{?dist} License: GPLv3+ Group: System Environment/Base URL: http://www.gluster.org/docs/index.php/GlusterFS -Source0: http://ftp.zresearch.com/pub/gluster/glusterfs/1.3/glusterfs-%{version}pre6.tar.gz +Source0: http://ftp.zresearch.com/pub/gluster/glusterfs/1.3/glusterfs-%{version}.tar.gz Source1: glusterfsd.init Source2: glusterfsd.sysconfig Source3: umount.glusterfs Patch0: glusterfs-1.3.7-ocreat.patch Patch1: glusterfs-1.3.8-mount.patch -Patch2: glusterfs-1.3.8pre6-tla751.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires(post): /sbin/chkconfig Requires(preun): /sbin/service, /sbin/chkconfig @@ -115,10 +114,9 @@ This package provides the development libraries. %prep -%setup -q -n %{name}-%{version}pre6 +%setup -q %patch0 -p1 -b .ocreat %patch1 -p1 -b .mount -%patch2 -p1 -b .tla751 %build @@ -219,6 +217,9 @@ fi %changelog +* Fri May 9 2008 Matthias Saou 1.3.8-1 +- Update to 1.3.8 final. + * Tue Apr 23 2008 Matthias Saou 1.3.8-0.10 - Include short patch to include fixes from latest TLA 751. diff --git a/sources b/sources index 6002bb6..7ff269d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -98d53572f463d472d016616c75ca0f60 glusterfs-1.3.8pre6.tar.gz +172d1a28551996443531c371532b2a22 glusterfs-1.3.8.tar.gz