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

Commit f3c7521f authored by Bryan Schumaker's avatar Bryan Schumaker Committed by J. Bruce Fields
Browse files

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: default avatarBryan Schumaker <bjschuma@netapp.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 5284b44e

fs/nfsd/fault_inject.c

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <linux/module.h>



#include "state.h"

#include "fault_inject.h"



struct nfsd_fault_inject_op {

	char *file;

fs/nfsd/fault_inject.h

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2011 Bryan Schumaker <bjschuma@netapp.com>

 *

 * Function definitions for fault injection

 */



#ifndef LINUX_NFSD_FAULT_INJECT_H

#define LINUX_NFSD_FAULT_INJECT_H



#ifdef CONFIG_NFSD_FAULT_INJECTION

int nfsd_fault_inject_init(void);

void nfsd_fault_inject_cleanup(void);

void nfsd_forget_clients(u64);

void nfsd_forget_locks(u64);

void nfsd_forget_openowners(u64);

void nfsd_forget_delegations(u64);

void nfsd_recall_delegations(u64);

#else /* CONFIG_NFSD_FAULT_INJECTION */

static inline int nfsd_fault_inject_init(void) { return 0; }

static inline void nfsd_fault_inject_cleanup(void) {}

static inline void nfsd_forget_clients(u64 num) {}

static inline void nfsd_forget_locks(u64 num) {}

static inline void nfsd_forget_openowners(u64 num) {}

static inline void nfsd_forget_delegations(u64 num) {}

static inline void nfsd_recall_delegations(u64 num) {}

#endif /* CONFIG_NFSD_FAULT_INJECTION */



#endif /* LINUX_NFSD_FAULT_INJECT_H */

fs/nfsd/nfs4state.c

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ 
#include "xdr4.h"

#include "vfs.h"

#include "current_stateid.h"

#include "fault_inject.h"



#include "netns.h"

fs/nfsd/nfsctl.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include "idmap.h"

#include "nfsd.h"

#include "cache.h"

#include "fault_inject.h"

#include "state.h"

#include "netns.h"



/*

fs/nfsd/state.h

+15 −0
Original line number Diff line number Diff line
@@ -496,4 +496,19 @@ extern void nfsd4_client_record_create(struct nfs4_client *clp); 
extern void nfsd4_client_record_remove(struct nfs4_client *clp);

extern int nfsd4_client_record_check(struct nfs4_client *clp);

extern void nfsd4_record_grace_done(struct nfsd_net *nn, time_t boot_time);



/* nfs fault injection functions */

#ifdef CONFIG_NFSD_FAULT_INJECTION

int nfsd_fault_inject_init(void);

void nfsd_fault_inject_cleanup(void);

void nfsd_forget_clients(u64);

void nfsd_forget_locks(u64);

void nfsd_forget_openowners(u64);

void nfsd_forget_delegations(u64);

void nfsd_recall_delegations(u64);

#else /* CONFIG_NFSD_FAULT_INJECTION */

static inline int nfsd_fault_inject_init(void) { return 0; }

static inline void nfsd_fault_inject_cleanup(void) {}

#endif /* CONFIG_NFSD_FAULT_INJECTION */



#endif   /* NFSD4_STATE_H */