linux.git/fs/locks.c, branch v2.6.37

BKL: remove extraneous #include

2010-11-17T16:59:32+00:00

The big kernel lock has been removed from all these files at some point,
leaving only the #include.

Remove this too as a cleanup.

Signed-off-by: Arnd Bergmann 
Signed-off-by: Linus Torvalds

locks: remove dead lease error-handling code

2010-11-10T19:31:29+00:00

A minor oversight from f7347ce4ee7c65415f84be915c018473e7076f31,
"fasync: re-organize fasync entry insertion to allow it under a
spinlock": this cleanup-on-error was only needed to handle -ENOMEM.  Now
that we're preallocating it's unneeded.

Signed-off-by: J. Bruce Fields

locks: fix leak on merging leases

2010-11-10T19:31:23+00:00

We must also free the passed-in lease in the case it wasn't used because
an existing lease was upgrade/downgraded or already existed.

Note the nfsd caller doesn't care because it's fl_change callback
returns an error in those cases.

Signed-off-by: J. Bruce Fields

locks: remove fl_copy_lock lock_manager operation

2010-10-31T13:35:15+00:00

This one was only used for a nasty hack in nfsd, which has recently
been removed.

Signed-off-by: Christoph Hellwig 
Signed-off-by: Linus Torvalds

locks: let the caller free file_lock on ->setlease failure

2010-10-31T13:35:15+00:00

The caller allocated it, the caller should free it.

The only issue so far is that we could change the flp pointer even on an
error return if the fl_change callback failed.  But we can simply move
the flp assignment after the fl_change invocation, as the callers don't
care about the flp return value if the setlease call failed.

Signed-off-by: Christoph Hellwig 
Signed-off-by: Linus Torvalds

locks: fix setlease methods to free passed-in lock

2010-10-31T01:08:15+00:00

We modified setlease to require the caller to allocate the new lease in
the case of creating a new lease, but forgot to fix up the filesystem
methods.

Cc: Steven Whitehouse 
Cc: Steve French 
Cc: Trond Myklebust 
Signed-off-by: J. Bruce Fields 
Acked-by: Arnd Bergmann 
Signed-off-by: Linus Torvalds

locks: fix leaks on setlease errors

2010-10-31T01:08:15+00:00

We're depending on setlease to free the passed-in lease on failure.

Signed-off-by: J. Bruce Fields 
Acked-by: Arnd Bergmann 
Signed-off-by: Linus Torvalds

locks: prevent ENOMEM on lease unlock

2010-10-31T01:08:14+00:00

Removing a lock shouldn't require any allocations; a failure due to
ENOMEM leaves the caller with a choice between retrying or giving up and
leaking an unused lease.

Next we should split the other lease calls into add and delete cases.
I wanted to start with just the bugfix.

Signed-off-by: J. Bruce Fields 
Acked-by: Arnd Bergmann 
Signed-off-by: Linus Torvalds

Merge branch 'flock' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-28T01:13:34+00:00

* 'flock' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:
  locks: turn lock_flocks into a spinlock
  fasync: re-organize fasync entry insertion to allow it under a spinlock
  locks/nfsd: allocate file lock outside of spinlock
  lockd: fix nlmsvc_notify_blocked locking
  lockd: push lock_flocks down

locks: turn lock_flocks into a spinlock

2010-10-27T20:07:36+00:00

Nothing depends on lock_flocks using the BKL
any more, so we can do the switch over to
a private spinlock.

Signed-off-by: Arnd Bergmann