From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 Oct 2010 16:55:25 +0000 (-0700)
Subject: Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4390110fef9e5c64e10c6ca19d586932242c9a8a;p=linux.git
Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.37' of git://linux-nfs.org/~bfields/linux: (99 commits)
svcrpc: svc_tcp_sendto XPT_DEAD check is redundant
svcrpc: no need for XPT_DEAD check in svc_xprt_enqueue
svcrpc: assume svc_delete_xprt() called only once
svcrpc: never clear XPT_BUSY on dead xprt
nfsd4: fix connection allocation in sequence()
nfsd4: only require krb5 principal for NFSv4.0 callbacks
nfsd4: move minorversion to client
nfsd4: delay session removal till free_client
nfsd4: separate callback change and callback probe
nfsd4: callback program number is per-session
nfsd4: track backchannel connections
nfsd4: confirm only on succesful create_session
nfsd4: make backchannel sequence number per-session
nfsd4: use client pointer to backchannel session
nfsd4: move callback setup into session init code
nfsd4: don't cache seq_misordered replies
SUNRPC: Properly initialize sock_xprt.srcaddr in all cases
SUNRPC: Use conventional switch statement when reclassifying sockets
sunrpc/xprtrdma: clean up workqueue usage
sunrpc: Turn list_for_each-s into the ..._entry-s
...
Fix up trivial conflicts (two different deprecation notices added in
separate branches) in Documentation/feature-removal-schedule.txt
---
4390110fef9e5c64e10c6ca19d586932242c9a8a
diff --cc Documentation/feature-removal-schedule.txt
index e833c8c81e691,076a2c02adaf6..d2af87ba96e11
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -526,12 -564,13 +526,22 @@@ Who: FUJITA Tomonori <fujita.tomonori@l
----------------------------
+What: iwlwifi disable_hw_scan module parameters
+When: 2.6.40
+Why: Hareware scan is the prefer method for iwlwifi devices for
+ scanning operation. Remove software scan support for all the
+ iwlwifi devices.
+
+Who: Wey-Yi Guy <wey-yi.w.guy@intel.com>
+
+----------------------------
++
+ What: access to nfsd auth cache through sys_nfsservctl or '.' files
+ in the 'nfsd' filesystem.
+ When: 2.6.40
+ Why: This is a legacy interface which have been replaced by a more
+ dynamic cache. Continuing to maintain this interface is an
+ unnecessary burden.
+ Who: NeilBrown <neilb@suse.de>
+
+ ----------------------------
-
diff --cc net/sunrpc/cache.c
index 7dce81a926c5e,ba61d0fa4b803..e433e7580e27b
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@@ -1435,11 -1540,12 +1534,13 @@@ static const struct file_operations cac
.read = read_flush_procfs,
.write = write_flush_procfs,
.release = release_flush_procfs,
+ .llseek = no_llseek,
};
- static void remove_cache_proc_entries(struct cache_detail *cd)
+ static void remove_cache_proc_entries(struct cache_detail *cd, struct net *net)
{
+ struct sunrpc_net *sn;
+
if (cd->u.procfs.proc_ent == NULL)
return;
if (cd->u.procfs.flush_ent)