a few cleanup patches

[Jeremy Allison]

On Thu, Oct 24, 2013 at 08:44:33PM +0200, Volker Lendecke wrote:
> On Thu, Oct 24, 2013 at 09:59:19AM -0700, Jeremy Allison wrote:
> > There's a behavior change in this hunk I think might need
> > addressing.
> > 
> > Setting "oplock_request = NO_OPLOCK" here loses any
> > INTERNAL_OPEN_ONLY flag that was set in oplock_request.
> > 
> > This matters due to the following code in grant_fsp_oplock_type()
> > which is called immediately after:
> > 
> >         if (oplock_request & INTERNAL_OPEN_ONLY) {
> >                 /* No oplocks on internal open. */
> >                 fsp->oplock_type = NO_OPLOCK;
> >                 DEBUG(10,("grant_fsp_oplock_type: oplock type 0x%x on file %s\n",
> >                         fsp->oplock_type, fsp_str_dbg(fsp)));
> >                 return;
> >         }
> > 
> > I'm trying (long term) to get rid of INTERNAL_OPEN_ONLY
> > but at the moment it's still used, so I think the
> > following fix is needed.
> > 
> > Please review and apply if you agree.
> 
> Lets revert the patchset that was accidentially pushed and
> then lets rethink the whole thing.

No, I don't think we need to do that. I think this is the
only issue that was missed, the rest of the code looks
good - and as I say I really want to get rid of that
horrible INTERNAL_OPEN_ONLY long term as it leads to
mistakes :-(. As you know I'm a little busy with something
else at the moment :-) else I'd be making it a higher priority.

Just review and push if you agree !

Jeremy.