From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B7E52138359 for ; Fri, 20 Nov 2020 13:26:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B42ADE069C; Fri, 20 Nov 2020 13:26:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7ECBFE0825 for ; Fri, 20 Nov 2020 13:26:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DC47733BE39 for ; Fri, 20 Nov 2020 13:26:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3672344F for ; Fri, 20 Nov 2020 13:26:11 +0000 (UTC) From: "Aaron Bauman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Bauman" Message-ID: <1605878712.6a9cad88fc3a817a91e4dd4446175b5cad1bf77f.bman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/glusterfs/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/glusterfs/files/glusterfs-6.7-fix-seek.patch X-VCS-Directories: sys-cluster/glusterfs/files/ X-VCS-Committer: bman X-VCS-Committer-Name: Aaron Bauman X-VCS-Revision: 6a9cad88fc3a817a91e4dd4446175b5cad1bf77f X-VCS-Branch: master Date: Fri, 20 Nov 2020 13:26:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9ed2a63d-41d2-4ce8-a311-84de3f7c3ebc X-Archives-Hash: ff40a9aca6f4f8d81feed220c50ac803 commit: 6a9cad88fc3a817a91e4dd4446175b5cad1bf77f Author: Michael Mair-Keimberger gmail com> AuthorDate: Wed Nov 18 18:38:44 2020 +0000 Commit: Aaron Bauman gentoo org> CommitDate: Fri Nov 20 13:25:12 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a9cad88 sys-cluster/glusterfs: remove unused patch Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/18317 Signed-off-by: Aaron Bauman gentoo.org> .../glusterfs/files/glusterfs-6.7-fix-seek.patch | 45 ---------------------- 1 file changed, 45 deletions(-) diff --git a/sys-cluster/glusterfs/files/glusterfs-6.7-fix-seek.patch b/sys-cluster/glusterfs/files/glusterfs-6.7-fix-seek.patch deleted file mode 100644 index 07d1ecef037..00000000000 --- a/sys-cluster/glusterfs/files/glusterfs-6.7-fix-seek.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/xlators/performance/open-behind/src/open-behind.c b/xlators/performance/open-behind/src/open-behind.c -index 70a144abb5..95e00dbd79 100644 ---- a/xlators/performance/open-behind/src/open-behind.c -+++ b/xlators/performance/open-behind/src/open-behind.c -@@ -708,6 +708,32 @@ ob_fstat(call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *xdata) - return 0; - } - -+int -+ob_seek(call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset, -+ gf_seek_what_t what, dict_t *xdata) -+{ -+ call_stub_t *stub = NULL; -+ fd_t *wind_fd = NULL; -+ -+ wind_fd = ob_get_wind_fd(this, fd, NULL); -+ -+ stub = fop_seek_stub(frame, default_seek_resume, wind_fd, offset, what, -+ xdata); -+ -+ fd_unref(wind_fd); -+ -+ if (!stub) -+ goto err; -+ -+ open_and_resume(this, wind_fd, stub); -+ -+ return 0; -+err: -+ STACK_UNWIND_STRICT(fstat, frame, -1, ENOMEM, 0, 0); -+ -+ return 0; -+} -+ - int - ob_flush(call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *xdata) - { -@@ -1256,6 +1282,7 @@ struct xlator_fops fops = { - .flush = ob_flush, - .fsync = ob_fsync, - .fstat = ob_fstat, -+ .seek = ob_seek, - .ftruncate = ob_ftruncate, - .fsetxattr = ob_fsetxattr, - .setxattr = ob_setxattr,