On Sat, 7 Jun 2014 07:31:33 -0700 Christoph Hellwig <hch@xxxxxxxxxxxxx> wrote: > On Sat, Jun 07, 2014 at 10:28:26AM -0400, Jeff Layton wrote: > > Well, I think using the fp->fi_lock instead of the i_lock here is > > reasonable. We at least avoid taking the state_lock (which is likely to > > be much more contended) within the i_lock. > > Yes, avoiding i_lock usage inside nfsd is something I'd prefer. But > with the current lock manager ops that are called with i_lock held > we'll have some leakage into the nfsd lock hierachy anyway > unfortunately. > Yeah. Switching the file locking infrastructure over to the i_lock seemed like such a good idea at the time... > > The thing that makes this > > patch nasty is all of the shenanigans to queue the delegation to the > > global list from within rpc_prepare or rpc_release. > > > > Personally, I think it'd be cleaner to add some sort of cb_prepare > > operation to the generic callback framework you're building to > > handle that, but let me know what you thing. > > I guess I'll have to do it that way then. It's not like so far > unreleased code should be a hard blocker for a bug fix anyway. > > Care to prefer a version that uses fi_lock, but otherwise works like > the first version? > Nope, that'd be fine. It might take a few days to respin as I'll be at the bakeathon next week. -- Jeff Layton <jlayton@xxxxxxxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html