diff options
author | Christoph Hellwig <hch@lst.de> | 2014-05-06 19:37:13 +0200 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2014-05-06 17:54:53 -0400 |
commit | 9c69de4c94fcb11db919160d5fa0b48f13d1757a (patch) | |
tree | 84ab9298f94f718d5cef937ca3987ab3a8cb1379 /include/linux/lockd | |
parent | 4dd86e150f63a6c360783f163a979ec563e6d570 (diff) | |
download | linux-9c69de4c94fcb11db919160d5fa0b48f13d1757a.tar.gz linux-9c69de4c94fcb11db919160d5fa0b48f13d1757a.tar.bz2 linux-9c69de4c94fcb11db919160d5fa0b48f13d1757a.zip |
nfsd: remove <linux/nfsd/nfsfh.h>
The only real user of this header is fs/nfsd/nfsfh.h, so merge the
two. Various lockѕ source files used it to indirectly get other
sunrpc or nfs headers, so fix those up.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'include/linux/lockd')
-rw-r--r-- | include/linux/lockd/lockd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h index dcaad79f54ed..219d79627c05 100644 --- a/include/linux/lockd/lockd.h +++ b/include/linux/lockd/lockd.h @@ -17,13 +17,13 @@ #include <linux/fs.h> #include <linux/kref.h> #include <linux/utsname.h> -#include <linux/nfsd/nfsfh.h> #include <linux/lockd/bind.h> #include <linux/lockd/xdr.h> #ifdef CONFIG_LOCKD_V4 #include <linux/lockd/xdr4.h> #endif #include <linux/lockd/debug.h> +#include <linux/sunrpc/svc.h> /* * Version string |