linux-toradex.git/fs/lockd, branch v2.6.29.2

NLM: Fix GRANT callback address comparison when IPv6 is enabled

2009-03-11T00:33:20+00:00

The NFS mount command may pass an AF_INET server address to lockd.  If
lockd happens to be using a PF_INET6 listener, the nlm_cmp_addr() in
nlmclnt_grant() will fail to match requests from that host because they
will all have a mapped IPv4 AF_INET6 address.

Adopt the same solution used in nfs_sockaddr_match_ipaddr() for NFSv4
callbacks: if either address is AF_INET, map it to an AF_INET6 address
before doing the comparison.

Signed-off-by: Chuck Lever 
Signed-off-by: Trond Myklebust

lockd: fix regression in lockd's handling of blocked locks

2009-02-09T18:19:46+00:00

If a client requests a blocking lock, is denied, then requests it again,
then here in nlmsvc_lock() we will call vfs_lock_file() without FL_SLEEP
set, because we've already queued a block and don't need the locks code
to do it again.

But that means vfs_lock_file() will return -EAGAIN instead of
FILE_LOCK_DENIED.  So we still need to translate that -EAGAIN return
into a nlm_lck_blocked error in this case, and put ourselves back on
lockd's block list.

The bug was introduced by bde74e4bc64415b1 "locks: add special return
value for asynchronous locks".

Thanks to Frank van Maarseveen for the report; his original test
case was essentially

	for i in `seq 30`; do flock /nfsmount/foo sleep 10 & done

Tested-by: Frank van Maarseveen 
Reported-by: Frank van Maarseveen 
Cc: Miklos Szeredi 
Signed-off-by: J. Bruce Fields

NLM: Clean up flow of control in make_socks() function

2009-01-07T20:40:44+00:00

Clean up: Use Bruce's preferred control flow style in make_socks().

Signed-off-by: Chuck Lever 
Signed-off-by: J. Bruce Fields

NLM: Refactor make_socks() function

2009-01-07T20:40:44+00:00

Clean up: extract common logic in NLM's make_socks() function
into a helper.

Signed-off-by: Chuck Lever 
Signed-off-by: J. Bruce Fields

lockd: Enable NLM use of AF_INET6

2009-01-06T16:53:56+00:00

If the kernel is configured to support IPv6 and the RPC server can register
services via rpcbindv4, we are all set to enable IPv6 support for lockd.

Signed-off-by: Chuck Lever 
Cc: Aime Le Rouzic 
Signed-off-by: J. Bruce Fields

NSM: Move nsm_create()

2009-01-06T16:53:56+00:00

Clean up: one last thing... relocate nsm_create() to eliminate the forward
declaration and group it near the only function that actually uses it.

Signed-off-by: Chuck Lever 
Signed-off-by: J. Bruce Fields

NSM: Move nsm_use_hostnames to mon.c

2009-01-06T16:53:55+00:00

Clean up.

Treat the nsm_use_hostnames global variable like nsm_local_state.
Note that the default value of nsm_use_hostnames is still zero.

Signed-off-by: Chuck Lever 
Signed-off-by: J. Bruce Fields

NSM: Move nsm_addr() to fs/lockd/mon.c

2009-01-06T16:53:55+00:00

Clean up: nsm_addr_in() is no longer used, and nsm_addr() is used only in
fs/lockd/mon.c, so move it there.

Signed-off-by: Chuck Lever 
Signed-off-by: J. Bruce Fields

NSM: Remove include/linux/lockd/sm_inter.h

2009-01-06T16:53:55+00:00

Clean up: The include/linux/lockd/sm_inter.h header is nearly empty
now.  Remove it.

Signed-off-by: Chuck Lever 
Signed-off-by: J. Bruce Fields

NSM: Replace IP address as our nlm_reboot lookup key

2009-01-06T16:53:55+00:00

NLM provides file locking services for NFS files.  Part of this service
includes a second protocol, known as NSM, which is a reboot
notification service.  NLM uses this service to determine when to
reclaim locks or enter a grace period after a client or server reboots.

The NLM service (implemented by lockd in the Linux kernel) contacts
the local NSM service (implemented by rpc.statd in Linux user space)
via NSM protocol upcalls to register a callback when a particular
remote peer reboots.

To match the callback to the correct remote peer, the NLM service
constructs a cookie that it passes in the request.  The NSM service
passes that cookie back to the NLM service when it is notified that
the given remote peer has indeed rebooted.

Currently on Linux, the cookie is the raw 32-bit IPv4 address of the
remote peer.  To support IPv6 addresses, which are larger, we could
use all 16 bytes of the cookie to represent a full IPv6 address,
although we still can't represent an IPv6 address with a scope ID in
just 16 bytes.

Instead, to avoid the need for future changes to support additional
address types, we'll use a manufactured value for the cookie, and use
that to find the corresponding nsm_handle struct in the kernel during
the NLMPROC_SM_NOTIFY callback.

This should provide complete support in the kernel's NSM
implementation for IPv6 hosts, while remaining backwards compatible
with older rpc.statd implementations.

Note we also deal with another case where nsm_use_hostnames can change
while there are outstanding notifications, possibly resulting in the
loss of reboot notifications.  After this patch, the priv cookie is
always used to lookup rebooted hosts in the kernel.

Signed-off-by: Chuck Lever 
Signed-off-by: J. Bruce Fields