From: Sage Weil <sage@redhat.com>
Date: Fri, 10 Apr 2015 23:55:18 +0000 (-0700)
Subject: os/newstore: use FS::zero()
X-Git-Tag: v9.1.0~242^2~74
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=28bc4ee76eb31683565fe951cd7a78c4047e9339;p=ceph.git

os/newstore: use FS::zero()

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/os/newstore/NewStore.cc b/src/os/newstore/NewStore.cc
index 8515eb5d0111..3b6b8e6bdb62 100644
--- a/src/os/newstore/NewStore.cc
+++ b/src/os/newstore/NewStore.cc
@@ -2305,19 +2305,12 @@ int NewStore::_do_wal_transaction(wal_transaction_t& wt)
 	int fd = _open_fid(p->fid, O_RDWR);
 	if (fd < 0)
 	  return fd;
-	int r = ::lseek64(fd, p->offset, SEEK_SET);
+	int r = fs->zero(fd, p->offset, p->length);
 	if (r < 0) {
-	  r = -errno;
-	  derr << __func__ << " lseek64 on " << fd << " got: "
+	  derr << __func__ << " zero on " << fd << " got: "
 	       << cpp_strerror(r) << dendl;
 	  return r;
 	}
-#warning use hole punch ioctl to zero when available
-	bufferlist bl;
-	bufferptr bp(p->length);
-	bp.zero();
-	bl.append(bp);
-	bl.write_fd(fd);
 	sync_fds.push_back(fd);
       }
       break;