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

Commit 05c5cb31 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-2.6.34' of git://linux-nfs.org/~bfields/linux: (22 commits)
  nfsd4: fix minor memory leak
  svcrpc: treat uid's as unsigned
  nfsd: ensure sockets are closed on error
  Revert "sunrpc: move the close processing after do recvfrom method"
  Revert "sunrpc: fix peername failed on closed listener"
  sunrpc: remove unnecessary svc_xprt_put
  NFSD: NFSv4 callback client should use RPC_TASK_SOFTCONN
  xfs_export_operations.commit_metadata
  commit_metadata export operation replacing nfsd_sync_dir
  lockd: don't clear sm_monitored on nsm_reboot_lookup
  lockd: release reference to nsm_handle in nlm_host_rebooted
  nfsd: Use vfs_fsync_range() in nfsd_commit
  NFSD: Create PF_INET6 listener in write_ports
  SUNRPC: NFS kernel APIs shouldn't return ENOENT for "transport not found"
  SUNRPC: Bury "#ifdef IPV6" in svc_create_xprt()
  NFSD: Support AF_INET6 in svc_addsock() function
  SUNRPC: Use rpc_pton() in ip_map_parse()
  nfsd: 4.1 has an rfc number
  nfsd41: Create the recovery entry for the NFSv4.1 client
  nfsd: use vfs_fsync for non-directories
  ...
parents 4582a30c 4ea41e2d

Documentation/filesystems/nfs/nfs41-server.txt

+2 −3
Original line number Diff line number Diff line
@@ -17,8 +17,7 @@ kernels must turn 4.1 on or off *before* turning support for version 4 
on or off; rpc.nfsd does this correctly.)



The NFSv4 minorversion 1 (NFSv4.1) implementation in nfsd is based

on the latest NFSv4.1 Internet Draft:

http://tools.ietf.org/html/draft-ietf-nfsv4-minorversion1-29

on RFC 5661.



From the many new features in NFSv4.1 the current implementation

focuses on the mandatory-to-implement NFSv4.1 Sessions, providing
@@ -44,7 +43,7 @@ interoperability problems with future clients. Known issues: 
	  trunking, but this is a mandatory feature, and its use is

	  recommended to clients in a number of places.  (E.g. to ensure

	  timely renewal in case an existing connection's retry timeouts

	  have gotten too long; see section 8.3 of the draft.)

	  have gotten too long; see section 8.3 of the RFC.)

	  Therefore, lack of this feature may cause future clients to

	  fail.

	- Incomplete backchannel support: incomplete backchannel gss

fs/lockd/host.c

+1 −1
Original line number Diff line number Diff line
@@ -479,8 +479,8 @@ again: mutex_lock(&nlm_host_mutex); 
			}

		}

	}



	mutex_unlock(&nlm_host_mutex);

	nsm_release(nsm);

}



/*

fs/lockd/mon.c

+3 −9
Original line number Diff line number Diff line
@@ -349,9 +349,9 @@ retry: 
 * nsm_reboot_lookup - match NLMPROC_SM_NOTIFY arguments to an nsm_handle

 * @info: pointer to NLMPROC_SM_NOTIFY arguments

 *

 * Returns a matching nsm_handle if found in the nsm cache; the returned

 * nsm_handle's reference count is bumped and sm_monitored is cleared.

 * Otherwise returns NULL if some error occurred.

 * Returns a matching nsm_handle if found in the nsm cache. The returned

 * nsm_handle's reference count is bumped. Otherwise returns NULL if some

 * error occurred.

 */

struct nsm_handle *nsm_reboot_lookup(const struct nlm_reboot *info)

{
@@ -370,12 +370,6 @@ struct nsm_handle *nsm_reboot_lookup(const struct nlm_reboot *info) 
	atomic_inc(&cached->sm_count);

	spin_unlock(&nsm_lock);



	/*

	 * During subsequent lock activity, force a fresh

	 * notification to be set up for this host.

	 */

	cached->sm_monitored = 0;



	dprintk("lockd: host %s (%s) rebooted, cnt %d\n",

			cached->sm_name, cached->sm_addrbuf,

			atomic_read(&cached->sm_count));

fs/lockd/svc.c

+0 −2
Original line number Diff line number Diff line
@@ -243,11 +243,9 @@ static int make_socks(struct svc_serv *serv) 
	if (err < 0)

		goto out_err;



#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

	err = create_lockd_family(serv, PF_INET6);

	if (err < 0 && err != -EAFNOSUPPORT)

		goto out_err;

#endif	/* CONFIG_IPV6 || CONFIG_IPV6_MODULE */



	warned = 0;

	return 0;

fs/nfs/callback.c

+0 −2
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ nfs4_callback_up(struct svc_serv *serv) 
	dprintk("NFS: Callback listener port = %u (af %u)\n",

			nfs_callback_tcpport, PF_INET);



#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

	ret = svc_create_xprt(serv, "tcp", PF_INET6,

				nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS);

	if (ret > 0) {
@@ -129,7 +128,6 @@ nfs4_callback_up(struct svc_serv *serv) 
		ret = 0;

	else

		goto out_err;

#endif	/* defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) */



	return svc_prepare_thread(serv, &serv->sv_pools[0]);