rpms/glusterfs
5
0
Fork 0
Code Issues Pull Requests Releases Activity

autobuild v3.12.2-43

Browse Source 
Resolves: bz#1676904
Signed-off-by: Milind Changire <mchangir@redhat.com>
This commit is contained in:
Milind Changire 2019-02-13 23:18:08 -05:00
parent 210265dcec
commit 588dd1f288
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
0531-fuse-remove-the-duplicate-FUSE_FOP-calls.patch Normal file
View File

@ -0,0 +1,33 @@
From 223aa5e0b89c0d876002036cde660bf5d34c3909 Mon Sep 17 00:00:00 2001
From: Amar Tumballi <amarts@redhat.com>
Date: Wed, 13 Feb 2019 20:39:09 +0530
Subject: [PATCH 531/531] fuse: remove the duplicate FUSE_FOP calls
This got introduced as part of resolving conflicts in
https://code.engineering.redhat.com/gerrit/#/c/162550/3
BUG: 1676904
Change-Id: If83c5c4c3ebabb91b997681c261199c53524a6a9
Signed-off-by: Amar Tumballi <amarts@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/162920
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
---
xlators/mount/fuse/src/fuse-bridge.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c
index deaf533..175e1b8 100644
--- a/xlators/mount/fuse/src/fuse-bridge.c
+++ b/xlators/mount/fuse/src/fuse-bridge.c
@@ -2974,8 +2974,6 @@ fuse_lseek (xlator_t *this, fuse_in_header_t *finh, void *msg,
void
fuse_flush_resume (fuse_state_t *state)
{
- FUSE_FOP (state, fuse_err_cbk, GF_FOP_FLUSH,
- flush, state->fd, state->xdata);
FUSE_FOP (state, fuse_flush_cbk, GF_FOP_FLUSH,
flush, state->fd, state->xdata);
}
--
1.8.3.1

6
glusterfs.spec
View File

@ -192,7 +192,7 @@ Release: 0.1%{?prereltag:.%{prereltag}}%{?dist}
%else
Name: glusterfs
Version: 3.12.2
Release: 42%{?dist}
Release: 43%{?dist}
%endif
License: GPLv2 or LGPLv3+
Group: System Environment/Base
@ -795,6 +795,7 @@ Patch0527: 0527-fuse-diagnostic-FLUSH-interrupt.patch
Patch0528: 0528-locks-handle-clear-locks-xattr-in-fgetxattr-too.patch
Patch0529: 0529-fuse-SETLKW-interrupt.patch
Patch0530: 0530-spec-fix-lua-script-execution-during-install.patch
Patch0531: 0531-fuse-remove-the-duplicate-FUSE_FOP-calls.patch
%description
GlusterFS is a distributed file-system capable of scaling to several
@ -2659,6 +2660,9 @@ fi
%endif
%changelog
* Thu Feb 14 2019 Milind Changire <mchangir@redhat.com> - 3.12.2-43
- fixes bugs bz#1676904
* Tue Feb 12 2019 Milind Changire <mchangir@redhat.com> - 3.12.2-42
- fixes bugs bz#1410145