diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-09-04 10:08:54 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-09-04 12:26:32 -0400 |
commit | f6de7a39c181dfb8a2c534661a53c73afb3081cd (patch) | |
tree | 69a0d52d55f0a32e83bba6a0cd20df154a38f06a /fs/nfs/super.c | |
parent | ef1820f9be27b6ad158f433ab38002ab8131db4d (diff) |
NFSv4: Document the recover_lost_locks kernel parameter
Rename the new 'recover_locks' kernel parameter to 'recover_lost_locks'
and change the default to 'false'. Document why in
Documentation/kernel-parameters.txt
Move the 'recover_lost_locks' kernel parameter to fs/nfs/super.c to
make it easy to backport to kernels prior to 3.6.x, which don't have
a separate NFSv4 module.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/super.c')
-rw-r--r-- | fs/nfs/super.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index f2071d221c77..6ad9053d8906 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c | |||
@@ -2758,6 +2758,7 @@ bool nfs4_disable_idmapping = true; | |||
2758 | unsigned short max_session_slots = NFS4_DEF_SLOT_TABLE_SIZE; | 2758 | unsigned short max_session_slots = NFS4_DEF_SLOT_TABLE_SIZE; |
2759 | unsigned short send_implementation_id = 1; | 2759 | unsigned short send_implementation_id = 1; |
2760 | char nfs4_client_id_uniquifier[NFS4_CLIENT_ID_UNIQ_LEN] = ""; | 2760 | char nfs4_client_id_uniquifier[NFS4_CLIENT_ID_UNIQ_LEN] = ""; |
2761 | bool recover_lost_locks = false; | ||
2761 | 2762 | ||
2762 | EXPORT_SYMBOL_GPL(nfs_callback_set_tcpport); | 2763 | EXPORT_SYMBOL_GPL(nfs_callback_set_tcpport); |
2763 | EXPORT_SYMBOL_GPL(nfs_callback_tcpport); | 2764 | EXPORT_SYMBOL_GPL(nfs_callback_tcpport); |
@@ -2766,6 +2767,7 @@ EXPORT_SYMBOL_GPL(nfs4_disable_idmapping); | |||
2766 | EXPORT_SYMBOL_GPL(max_session_slots); | 2767 | EXPORT_SYMBOL_GPL(max_session_slots); |
2767 | EXPORT_SYMBOL_GPL(send_implementation_id); | 2768 | EXPORT_SYMBOL_GPL(send_implementation_id); |
2768 | EXPORT_SYMBOL_GPL(nfs4_client_id_uniquifier); | 2769 | EXPORT_SYMBOL_GPL(nfs4_client_id_uniquifier); |
2770 | EXPORT_SYMBOL_GPL(recover_lost_locks); | ||
2769 | 2771 | ||
2770 | #define NFS_CALLBACK_MAXPORTNR (65535U) | 2772 | #define NFS_CALLBACK_MAXPORTNR (65535U) |
2771 | 2773 | ||
@@ -2803,4 +2805,10 @@ MODULE_PARM_DESC(send_implementation_id, | |||
2803 | "Send implementation ID with NFSv4.1 exchange_id"); | 2805 | "Send implementation ID with NFSv4.1 exchange_id"); |
2804 | MODULE_PARM_DESC(nfs4_unique_id, "nfs_client_id4 uniquifier string"); | 2806 | MODULE_PARM_DESC(nfs4_unique_id, "nfs_client_id4 uniquifier string"); |
2805 | 2807 | ||
2808 | module_param(recover_lost_locks, bool, 0644); | ||
2809 | MODULE_PARM_DESC(recover_lost_locks, | ||
2810 | "If the server reports that a lock might be lost, " | ||
2811 | "try to recover it risking data corruption."); | ||
2812 | |||
2813 | |||
2806 | #endif /* CONFIG_NFS_V4 */ | 2814 | #endif /* CONFIG_NFS_V4 */ |