Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0e0c9e7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux 

* 'for-2.6.27' of git://linux-nfs.org/~bfields/linux:
  fs/nfsd/export.c: Adjust error handling code involving auth_domain_put
  MAINTAINERS: mention lockd and sunrpc in nfs entries
  lockd: trivial sparse endian annotations
parents dae81683 53e6d8d1

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -2462,7 +2462,7 @@ L: kernel-janitors@vger.kernel.org 
W:	http://www.kerneljanitors.org/

S:	Maintained



KERNEL NFSD

KERNEL NFSD, SUNRPC, AND LOCKD SERVERS

P:	J. Bruce Fields

M:	bfields@fieldses.org

P:	Neil Brown
@@ -3078,7 +3078,7 @@ M: ja@ssi.bg 
L:	netdev@vger.kernel.org

S:	Maintained



NFS CLIENT

NFS, SUNRPC, AND LOCKD CLIENTS

P:	Trond Myklebust

M:	Trond.Myklebust@netapp.com

L:	linux-nfs@vger.kernel.org

fs/lockd/svc4proc.c

+2 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp, 
{

	struct nlm_host	*host;

	struct nlm_file	*file;

	int rc = rpc_success;

	__be32 rc = rpc_success;



	dprintk("lockd: TEST4        called\n");

	resp->cookie = argp->cookie;
@@ -116,7 +116,7 @@ nlm4svc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp, 
{

	struct nlm_host	*host;

	struct nlm_file	*file;

	int rc = rpc_success;

	__be32 rc = rpc_success;



	dprintk("lockd: LOCK          called\n");

fs/lockd/svcproc.c

+2 −2
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp, 
{

	struct nlm_host	*host;

	struct nlm_file	*file;

	int rc = rpc_success;

	__be32 rc = rpc_success;



	dprintk("lockd: TEST          called\n");

	resp->cookie = argp->cookie;
@@ -146,7 +146,7 @@ nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp, 
{

	struct nlm_host	*host;

	struct nlm_file	*file;

	int rc = rpc_success;

	__be32 rc = rpc_success;



	dprintk("lockd: LOCK          called\n");

fs/nfsd/export.c

+3 −3
Original line number Diff line number Diff line
@@ -1023,7 +1023,7 @@ exp_export(struct nfsctl_export *nxp) 
	/* Look up the dentry */

	err = path_lookup(nxp->ex_path, 0, &nd);

	if (err)

		goto out_unlock;

		goto out_put_clp;

	err = -EINVAL;



	exp = exp_get_by_name(clp, nd.path.mnt, nd.path.dentry, NULL);
@@ -1090,9 +1090,9 @@ exp_export(struct nfsctl_export *nxp) 
		exp_put(exp);

	if (fsid_key && !IS_ERR(fsid_key))

		cache_put(&fsid_key->h, &svc_expkey_cache);

	if (clp)

		auth_domain_put(clp);

	path_put(&nd.path);

out_put_clp:

	auth_domain_put(clp);

out_unlock:

	exp_writeunlock();

out: