redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

NFSD: Fault injection operations take a per-client forget function

Browse source 
The eventual goal is to forget state based on ip address, so it makes
sense to call this function in a for-each-client loop until the correct
amount of state is forgotten.  I also use this patch as an opportunity
to rename the forget function from "func()" to "forget()".

Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Bryan Schumaker 2012-11-29 11:40:43 -05:00 committed by J. Bruce Fields
parent 269de30f10
commit 8ce54e0d82
3 changed files with 16 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
fs/nfsd/fault_inject.c
View file

@ -13,29 +13,29 @@
struct nfsd_fault_inject_op { struct nfsd_fault_inject_op {
char *file; char *file;
void (*func)(u64); u64 (*forget)(struct nfs4_client *, u64);
}; };
static struct nfsd_fault_inject_op inject_ops[] = { static struct nfsd_fault_inject_op inject_ops[] = {
{ {
.file = "forget_clients", .file = "forget_clients",
.func = nfsd_forget_clients, .forget = nfsd_forget_client,
}, },
{ {
.file = "forget_locks", .file = "forget_locks",
.func = nfsd_forget_locks, .forget = nfsd_forget_client_locks,
}, },
{ {
.file = "forget_openowners", .file = "forget_openowners",
.func = nfsd_forget_openowners, .forget = nfsd_forget_client_openowners,
}, },
{ {
.file = "forget_delegations", .file = "forget_delegations",
.func = nfsd_forget_delegations, .forget = nfsd_forget_client_delegations,
}, },
{ {
.file = "recall_delegations", .file = "recall_delegations",
.func = nfsd_recall_delegations, .forget = nfsd_recall_client_delegations,
}, },
}; };
@ -44,6 +44,7 @@ static struct dentry *debug_dir;
static int nfsd_inject_set(void *op_ptr, u64 val) static int nfsd_inject_set(void *op_ptr, u64 val)
{ {
u64 count = 0;
struct nfsd_fault_inject_op *op = op_ptr; struct nfsd_fault_inject_op *op = op_ptr;
if (val == 0) if (val == 0)
@ -52,8 +53,9 @@ static int nfsd_inject_set(void *op_ptr, u64 val)
printk(KERN_INFO "NFSD Fault Injection: %s (n = %llu)", op->file, val); printk(KERN_INFO "NFSD Fault Injection: %s (n = %llu)", op->file, val);
nfs4_lock_state(); nfs4_lock_state();
op->func(val); count = nfsd_for_n_state(val, op->forget);
nfs4_unlock_state(); nfs4_unlock_state();
printk(KERN_INFO "NFSD: %s: found %llu", op->file, count);
return 0; return 0;
} }

30
fs/nfsd/nfs4state.c
View file

@ -4721,36 +4721,6 @@ u64 nfsd_for_n_state(u64 max, u64 (*func)(struct nfs4_client *, u64))
return count; return count;
} }
void nfsd_forget_clients(u64 num)
{
u64 count = nfsd_for_n_state(num, nfsd_forget_client);
printk(KERN_INFO "NFSD: Forgot %llu clients", count);
}
void nfsd_forget_locks(u64 num)
{
u64 count = nfsd_for_n_state(num, nfsd_forget_client_locks);
printk(KERN_INFO "NFSD: Forgot %llu locks", count);
}
void nfsd_forget_openowners(u64 num)
{
u64 count = nfsd_for_n_state(num, nfsd_forget_client_openowners);
printk(KERN_INFO "NFSD: Forgot %llu open owners", count);
}
void nfsd_forget_delegations(u64 num)
{
u64 count = nfsd_for_n_state(num, nfsd_forget_client_delegations);
printk(KERN_INFO "NFSD: Forgot %llu delegations", count);
}
void nfsd_recall_delegations(u64 num)
{
u64 count = nfsd_for_n_state(num, nfsd_recall_client_delegations);
printk(KERN_INFO "NFSD: Recalled %llu delegations", count);
}
#endif /* CONFIG_NFSD_FAULT_INJECTION */ #endif /* CONFIG_NFSD_FAULT_INJECTION */
/* initialization to perform at module load time: */ /* initialization to perform at module load time: */

12
fs/nfsd/state.h
View file

@ -501,11 +501,13 @@ extern void nfsd4_record_grace_done(struct nfsd_net *nn, time_t boot_time);
#ifdef CONFIG_NFSD_FAULT_INJECTION #ifdef CONFIG_NFSD_FAULT_INJECTION
int nfsd_fault_inject_init(void); int nfsd_fault_inject_init(void);
void nfsd_fault_inject_cleanup(void); void nfsd_fault_inject_cleanup(void);
void nfsd_forget_clients(u64); u64 nfsd_for_n_state(u64, u64 (*)(struct nfs4_client *, u64));
void nfsd_forget_locks(u64);
void nfsd_forget_openowners(u64); u64 nfsd_forget_client(struct nfs4_client *, u64);
void nfsd_forget_delegations(u64); u64 nfsd_forget_client_locks(struct nfs4_client*, u64);
void nfsd_recall_delegations(u64); u64 nfsd_forget_client_openowners(struct nfs4_client *, u64);
u64 nfsd_forget_client_delegations(struct nfs4_client *, u64);
u64 nfsd_recall_client_delegations(struct nfs4_client *, u64);
#else /* CONFIG_NFSD_FAULT_INJECTION */ #else /* CONFIG_NFSD_FAULT_INJECTION */
static inline int nfsd_fault_inject_init(void) { return 0; } static inline int nfsd_fault_inject_init(void) { return 0; }
static inline void nfsd_fault_inject_cleanup(void) {} static inline void nfsd_fault_inject_cleanup(void) {}