On Thu, Jul 07, 2011 at 11:10:31AM +0800, Daniel Veillard wrote:
> On Wed, Jul 06, 2011 at 05:23:48PM -0600, Eric Blake wrote:
> > No caller was using the flags argument, and this function is internal
> > only, so we might as well skip it.
> >
> > * src/util/util.h (safezero): Update signature.
> > * src/util/util.c (safezero): Update function.
> > * src/locking/lock_driver_sanlock.c
> > (virLockManagerSanlockSetupLockspace)
> > (virLockManagerSanlockCreateLease): Update all callers.
> > * src/storage/storage_backend.c (createRawFile): Likewise.
> > ---
> > src/locking/lock_driver_sanlock.c | 4 ++--
> > src/storage/storage_backend.c | 4 ++--
> > src/util/util.c | 6 +++---
> > src/util/util.h | 2 +-
> > 4 files changed, 8 insertions(+), 8 deletions(-)
> >
> > diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c
> > index 567221c..cd2bbb5 100644
> > --- a/src/locking/lock_driver_sanlock.c
> > +++ b/src/locking/lock_driver_sanlock.c
> > @@ -196,7 +196,7 @@ static int virLockManagerSanlockSetupLockspace(void)
> > /*
> > * Pre allocate enough data for 1 block of leases at preferred alignment
> > */
> > - if (safezero(fd, 0, 0, rv) < 0) {
> > + if (safezero(fd, 0, rv) < 0) {
> > virReportSystemError(errno,
> > _("Unable to allocate lockspace %s"),
> > path);
> > @@ -567,7 +567,7 @@ static int virLockManagerSanlockCreateLease(struct sanlk_resource *res)
> > /*
> > * Pre allocate enough data for 1 block of leases at preferred alignment
> > */
> > - if (safezero(fd, 0, 0, rv) < 0) {
> > + if (safezero(fd, 0, rv) < 0) {
> > virReportSystemError(errno,
> > _("Unable to allocate lease %s"),
> > res->disks[0].path);
> > diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
> > index 708d7b2..671b88e 100644
> > --- a/src/storage/storage_backend.c
> > +++ b/src/storage/storage_backend.c
> > @@ -331,7 +331,7 @@ createRawFile(int fd, virStorageVolDefPtr vol,
> >
> > if (bytes > remain)
> > bytes = remain;
> > - if (safezero(fd, 0, vol->allocation - remain, bytes) < 0) {
> > + if (safezero(fd, vol->allocation - remain, bytes) < 0) {
> > ret = -errno;
> > virReportSystemError(errno, _("cannot fill file '%s'"),
> > vol->target.path);
> > @@ -340,7 +340,7 @@ createRawFile(int fd, virStorageVolDefPtr vol,
> > remain -= bytes;
> > }
> > } else { /* No progress bars to be shown */
> > - if (safezero(fd, 0, 0, remain) < 0) {
> > + if (safezero(fd, 0, remain) < 0) {
> > ret = -errno;
> > virReportSystemError(errno, _("cannot fill file '%s'"),
> > vol->target.path);
> > diff --git a/src/util/util.c b/src/util/util.c
> > index 5542557..3d0ceea 100644
> > --- a/src/util/util.c
> > +++ b/src/util/util.c
> > @@ -133,7 +133,7 @@ safewrite(int fd, const void *buf, size_t count)
> > }
> >
> > #ifdef HAVE_POSIX_FALLOCATE
> > -int safezero(int fd, int flags ATTRIBUTE_UNUSED, off_t offset, off_t len)
> > +int safezero(int fd, off_t offset, off_t len)
> > {
> > int ret = posix_fallocate(fd, offset, len);
> > if (ret == 0)
> > @@ -144,7 +144,7 @@ int safezero(int fd, int flags ATTRIBUTE_UNUSED, off_t offset, off_t len)
> > #else
> >
> > # ifdef HAVE_MMAP
> > -int safezero(int fd, int flags ATTRIBUTE_UNUSED, off_t offset, off_t len)
> > +int safezero(int fd, off_t offset, off_t len)
> > {
> > int r;
> > char *buf;
> > @@ -168,7 +168,7 @@ int safezero(int fd, int flags ATTRIBUTE_UNUSED, off_t offset, off_t len)
> >
> > # else /* HAVE_MMAP */
> >
> > -int safezero(int fd, int flags ATTRIBUTE_UNUSED, off_t offset, off_t len)
> > +int safezero(int fd, off_t offset, off_t len)
> > {
> > int r;
> > char *buf;
> > diff --git a/src/util/util.h b/src/util/util.h
> > index 7a1eb11..6f07f8c 100644
> > --- a/src/util/util.h
> > +++ b/src/util/util.h
> > @@ -39,7 +39,7 @@
> > ssize_t saferead(int fd, void *buf, size_t count) ATTRIBUTE_RETURN_CHECK;
> > ssize_t safewrite(int fd, const void *buf, size_t count)
> > ATTRIBUTE_RETURN_CHECK;
> > -int safezero(int fd, int flags, off_t offset, off_t len)
> > +int safezero(int fd, off_t offset, off_t len)
> > ATTRIBUTE_RETURN_CHECK;
> >
> > int virSetBlocking(int fd, bool blocking) ATTRIBUTE_RETURN_CHECK;
>
> ACK from me but Dan should probably check that it doesn't affect some
> coming patches before pushing this,
ACK
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list