aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-16 18:46:28 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-16 18:46:28 -0800
commit1d6636502b23a964f4e5aac5237d1bbb76a9f912 (patch)
treea904be940c83b385be9cdf33fc62041b5c56f7f5 /include/linux
parentd33fdee4d090076462cfe25473f7139c3204b16e (diff)
parent04e4bd1c67f941d81bff78a3b6b94194f081b7df (diff)
downloadmrst-s0i3-test-1d6636502b23a964f4e5aac5237d1bbb76a9f912.tar.gz
mrst-s0i3-test-1d6636502b23a964f4e5aac5237d1bbb76a9f912.tar.xz
mrst-s0i3-test-1d6636502b23a964f4e5aac5237d1bbb76a9f912.zip
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: nfs: Ignore kmemleak false positive in nfs_readdir_make_qstr SUNRPC: Simplify rpc_alloc_iostats by removing pointless local variable nfs: trivial: remove unused nfs_wait_event macro NFS: readdir shouldn't read beyond the reply returned by the server NFS: Fix a couple of regressions in readdir. Revert "NFSv4: Fall back to ordinary lookup if nfs4_atomic_open() returns EISDIR" Regression: fix mounting NFS when NFSv3 support is not compiled NLM: Fix a regression in lockd
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/lockd/lockd.h1
-rw-r--r--include/linux/nfs_fs.h6
2 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index a34dea46b62..2dee05e5119 100644
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -43,6 +43,7 @@ struct nlm_host {
struct sockaddr_storage h_addr; /* peer address */
size_t h_addrlen;
struct sockaddr_storage h_srcaddr; /* our address (optional) */
+ size_t h_srcaddrlen;
struct rpc_clnt *h_rpcclnt; /* RPC client to talk to peer */
char *h_name; /* remote hostname */
u32 h_version; /* interface version */
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index bba26684acd..c66fdb7d699 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -593,12 +593,6 @@ nfs_fileid_to_ino_t(u64 fileid)
return ino;
}
-#define nfs_wait_event(clnt, wq, condition) \
-({ \
- int __retval = wait_event_killable(wq, condition); \
- __retval; \
-})
-
#define NFS_JUKEBOX_RETRY_TIME (5 * HZ)
#endif /* __KERNEL__ */