summaryrefslogtreecommitdiff
path: root/filesystems
diff options
context:
space:
mode:
Diffstat (limited to 'filesystems')
-rw-r--r--filesystems/glusterfs/Makefile4
-rw-r--r--filesystems/glusterfs/distinfo4
-rw-r--r--filesystems/glusterfs/patches/patch-bb17
3 files changed, 18 insertions, 7 deletions
diff --git a/filesystems/glusterfs/Makefile b/filesystems/glusterfs/Makefile
index 23df7ef6c1e..afd24a237f4 100644
--- a/filesystems/glusterfs/Makefile
+++ b/filesystems/glusterfs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2011/09/27 12:45:02 manu Exp $
+# $NetBSD: Makefile,v 1.18 2011/10/02 01:11:47 manu Exp $
#
DISTNAME= glusterfs-3.2.3
-#PKGREVISION= 2
+PKGREVISION= 1
CATEGORIES= filesystems
MASTER_SITES= http://download.gluster.com/pub/gluster/glusterfs/3.2/3.2.3/
diff --git a/filesystems/glusterfs/distinfo b/filesystems/glusterfs/distinfo
index 8eb306aa9aa..fc0e20342b9 100644
--- a/filesystems/glusterfs/distinfo
+++ b/filesystems/glusterfs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2011/09/27 12:45:02 manu Exp $
+$NetBSD: distinfo,v 1.13 2011/10/02 01:11:47 manu Exp $
SHA1 (glusterfs-3.2.3.tar.gz) = 7a36e496d9ac3fbf11123bb42884445334d07f06
RMD160 (glusterfs-3.2.3.tar.gz) = 89d6a5f9c1362e1fe4d88e69465311069552d319
@@ -14,7 +14,7 @@ SHA1 (patch-ar) = 27d0288083d06623a328e851a776095aa1f1d2df
SHA1 (patch-as) = a2c637bf52151e85969927f281e432693ac539ba
SHA1 (patch-ax) = 054942de06c3df60ffc0c190dd2702f77edd9ec6
SHA1 (patch-ba) = dba2b6826b42c398fc590b91d1f58b88c7bcc7f2
-SHA1 (patch-bb) = 68d37d3b08a43fd98fac0e5492df1edc58cb5832
+SHA1 (patch-bb) = fa3ee0b07f34bd2943f6c9f33e8db9ab24c09007
SHA1 (patch-be) = 72fd161c97ac384b93411e120c4f4b798e45d975
SHA1 (patch-bf) = 0f182ccd632b5e622237bd95c9978c113f8ce531
SHA1 (patch-bh) = d88d4e8b863f36b2c27c4f5eff2fdc235ef76fd8
diff --git a/filesystems/glusterfs/patches/patch-bb b/filesystems/glusterfs/patches/patch-bb
index 9fe08fd5c1f..a2f837a4577 100644
--- a/filesystems/glusterfs/patches/patch-bb
+++ b/filesystems/glusterfs/patches/patch-bb
@@ -1,10 +1,10 @@
-$NetBSD: patch-bb,v 1.8 2011/09/18 01:36:06 manu Exp $
+$NetBSD: patch-bb,v 1.9 2011/10/02 01:11:47 manu Exp $
O_DIRECTORY is defined as 0, therefore ((flags & O_DIRECTORY) == O_DIRECTORY)
is always true even if the flag is not set.
---- xlators/performance/quick-read/src/quick-read.c.orig 2011-09-17 15:45:29.000000000 +0200
-+++ xlators/performance/quick-read/src/quick-read.c 2011-09-17 15:45:29.000000000 +0200
+--- xlators/performance/quick-read/src/quick-read.c.orig 2011-08-23 14:31:41.000000000 +0200
++++ xlators/performance/quick-read/src/quick-read.c 2011-10-02 02:55:29.000000000 +0200
@@ -82,8 +82,9 @@
qr_loc_fill (loc_t *loc, inode_t *inode, char *path)
{
@@ -47,3 +47,14 @@ is always true even if the flag is not set.
return ret;
}
+@@ -729,9 +730,9 @@
+ }
+ }
+ UNLOCK (&table->lock);
+
+- if (content_cached && ((flags & O_DIRECTORY) == O_DIRECTORY)) {
++ if (content_cached && (flags & O_DIRECTORY)) {
+ op_ret = -1;
+ op_errno = ENOTDIR;
+ gf_log (this->name, GF_LOG_WARNING,
+ "open with O_DIRECTORY flag received on non-directory");