NFSD: Fold fault_inject.h into state.h
authorBryan Schumaker <bjschuma@netapp.com>
Tue, 27 Nov 2012 14:35:10 +0000 (09:35 -0500)
committerJ. Bruce Fields <bfields@redhat.com>
Wed, 28 Nov 2012 18:01:02 +0000 (13:01 -0500)
commitf3c7521fe53a7892d8c8c4715f7c0f4add7b2e19
treed4b8094ac55dd2c4c59ef317e10fe772c8387ca7
parent5284b44e438580a50e8cc5189297a73a48a45ecb
NFSD: Fold fault_inject.h into state.h

There were only a small number of functions in this file and since they
all affect stored state I think it makes sense to put them in state.h
instead.  I also dropped most static inline declarations since there are
no callers when fault injection is not enabled.

Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
fs/nfsd/fault_inject.c
fs/nfsd/fault_inject.h [deleted file]
fs/nfsd/nfs4state.c
fs/nfsd/nfsctl.c
fs/nfsd/state.h