vfp_gpfs: ensure END_PROFILE is always called

Ralph Böhme slow at samba.org
Sun May 3 08:41:59 MDT 2015


On Fri, May 01, 2015 at 11:49:23AM +0200, Stefan (metze) Metzmacher wrote:
> Hi Ralph,
> 
> >  	SMB_VFS_HANDLE_GET_DATA(handle, config,
> >  				struct gpfs_config_data,
> >  				return -1);
> >  
> > -	if (linux_set_lease_sighandler(fsp->fh->fd) == -1)
> > -		return -1;
> > +	START_PROFILE(syscall_linux_setlease);
> > +
> > +	if (linux_set_lease_sighandler(fsp->fh->fd) == -1) {
> > +		ret = -1;
> > +		goto failure;
> > +	}
> >  
> >  	if (config->leases) {
> >  		/*
> > @@ -219,6 +221,7 @@ static int vfs_gpfs_setlease(vfs_handle_struct *handle, files_struct *fsp,
> >  
> >  	END_PROFILE(syscall_linux_setlease);
> >  
> > +failure:
> >  	return ret;
> >  }
> 
> Don't we need +failure before the END_PROFILE(syscall_linux_setlease); line?

Definitely!

Gee, how embarrassing! I'll attach a fix to the bugreport. Sorry for the mistake.

-slow


More information about the samba-technical mailing list