From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 25 Feb 2020 19:07:29 +0000 (-0800)
Subject: Merge PR #33480 into master
X-Git-Tag: v15.1.1~261
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=95746ffa9b21014f63077a460867a9c5791532c4;p=ceph.git

Merge PR #33480 into master

* refs/pull/33480/head:
	test: add new ceph_lseek test
	client: fix error handling in lseek SEEK_HOLE/SEEK_DATA cases

Reviewed-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
---

95746ffa9b21014f63077a460867a9c5791532c4
diff --cc .githubmap
index af0cd903f88,af0cd903f88..91f292b7ded
--- a/.githubmap
+++ b/.githubmap
@@@ -116,3 -116,3 +116,4 @@@ p-se Patrick Seidensal <pseidensal@suse
  ronen-fr Ronen Friedman <rfriedma@redhat.com>
  yaarith Yaarit Hatuka <yaarithatuka@gmail.com>
  jmolmo Juan Miguel Olmo <jolmomar@redhat.com>
++lxbsz Xiubo Li <xiubli@redhat.com>