linux.git/fs/nfs/callback.c, branch v2.6.26

nfs: replace remaining FUNCTION occurrences

2008-05-16T16:43:29+00:00

__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison 
Cc: Trond Myklebust 
Cc: "J. Bruce Fields" 
Signed-off-by: Andrew Morton 
Signed-off-by: Trond Myklebust

NFS: don't let nfs_callback_svc exit on unexpected svc_recv errors (try #2)

2008-04-23T20:13:42+00:00

When svc_recv returns an unexpected error, nfs_callback_svc will print a
warning and exit. This problematic for several reasons. In particular,
it will cause the reference counts for the thread to be wrong, and no
new thread will be started until all nfs4 mounts are unmounted.

Rather than exiting on error from svc_recv, have the thread do a 1s
sleep and then retry the loop. This is unlikely to cause any harm, and
if the error turns out to be something temporary then it may be able to
recover.

Signed-off-by: Jeff Layton 
Signed-off-by: J. Bruce Fields

nfsd: fix comment

2008-04-23T20:13:42+00:00

Obvious comment nit.

Signed-off-by: J. Bruce Fields

NFS: convert nfs4 callback thread to kthread API

2008-04-23T20:13:40+00:00

There's a general push to convert kernel threads to use the (much
cleaner) kthread API. This patch converts the NFSv4 callback kernel
thread to the kthread API. In addition to being generally cleaner this
also removes the dependency on signals when shutting down the thread.

Note that this patch depends on the recent patches to svc_recv() to
make it check kthread_should_stop() periodically. Those patches are
in Bruce's tree at the moment and are slated for 2.6.26 along with
the lockd conversion, so this conversion is probably also appropriate
for 2.6.26.

Signed-off-by: Jeff Layton 
Acked-by: Trond Myklebust 
Signed-off-by: J. Bruce Fields

Wrap buffers used for rpc debug printks into RPC_IFDEBUG

2008-02-21T23:42:29+00:00

Sorry for the noise, but here's the v3 of this compilation fix :)

There are some places, which declare the char buf[...] on the stack
to push it later into dprintk(). Since the dprintk sometimes (if the
CONFIG_SYSCTL=n) becomes an empty do { } while (0) stub, these buffers
cause gcc to produce appropriate warnings.

Wrap these buffers with RPC_IFDEBUG macro, as Trond proposed, to
compile them out when not needed.

Signed-off-by: Pavel Emelyanov 
Acked-by: J. Bruce Fields 
Signed-off-by: Trond Myklebust

NFS: flush signals before taking down callback thread

2008-02-20T18:32:43+00:00

Now that the reference counting on the callback thread is working as
expected, it uncovers another problem.  Peter Staubach noticed while
testing that patch on an older kernel that he would occasionally see
this printk in rpc_register fire:

    "RPC: failed to contact portmap (errno -512).

The NFSv4 callback thread is signaled by nfs_callback_down(), but never
flushes that signal. All of the shutdown processing is done with that
signal pending. This makes it fail the call to unregister the port with
the portmapper.

In actuality, this rpc_register call isn't necessary at all since the
port isn't actually registered with the portmapper anymore. Regardless,
there doesn't seem to be any reason to leave the signal pending while
the thread is being shut down and flushing it should generally silence
that printk.

Signed-off-by: Jeff Layton 
Signed-off-by: Trond Myklebust

NFS: fix reference counting for NFSv4 callback thread

2008-02-14T04:24:04+00:00

The reference counting for the NFSv4 callback thread stays artificially
high. When this thread comes down, it doesn't properly tear down the
svc_serv, causing a memory leak. In my testing on an older kernel on
x86_64, memory would leak out of the 8k kmalloc slab. So, we're leaking
at least a page of memory every time the thread comes down.

svc_create() creates the svc_serv with a sv_nrthreads count of 1, and
then svc_create_thread() increments that count. Whenever the callback
thread is started it has a sv_nrthreads count of 2. When coming down, it
calls svc_exit_thread() which decrements that count and if it hits 0, it
tears everything down. That never happens here since the count is always
at 2 when the thread exits.

The problem is that nfs_callback_up() should be calling svc_destroy() on
the svc_serv on both success and failure. This is how lockd_up_proto()
handles the reference counting, and doing that here fixes the leak.

Signed-off-by: Jeff Layton 
Signed-off-by: Trond Myklebust

svc: Change services to use new svc_create_xprt service

2008-02-01T21:42:09+00:00

Modify the various kernel RPC svcs to use the svc_create_xprt service.

Signed-off-by: Tom Tucker 
Acked-by: Neil Brown 
Reviewed-by: Chuck Lever 
Reviewed-by: Greg Banks 
Signed-off-by: J. Bruce Fields

NFS: Change nfs_find_client() to take "struct sockaddr *"

2008-01-30T07:05:55+00:00

Adjust arguments and callers of nfs_find_client() to pass a
"struct sockaddr *" instead of "struct sockaddr_in *" to support non-IPv4
addresses.

Signed-off-by: Chuck Lever 
Cc: Aurelien Charbon 

Trond: Also fix up protocol version number argument in nfs_find_client() to
use the correct u32 type.

Signed-off-by: Trond Myklebust

NFS: Move dprintks from callback.c to callback_proc.c

2008-01-30T07:05:52+00:00

Clean up: The client side peer address is available in callback_proc.c,
so move a dprintk out of fs/nfs/callback.c and into
fs/nfs/callback_proc.c.

This is more consistent with other debugging messages, and the proc
routines have more information about each request to display.

Signed-off-by: Chuck Lever 
Cc: Aurelien Charbon 
Signed-off-by: Trond Myklebust