This thread never actually did anything useful, so comment it out by
#ifdef'ing it in CONFIG_BROKEN. My preference would be to remove it
altogether, but it's not my call.
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
---
fs/cifs/cifsfs.c | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 13ea532..5a9ed5f 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -65,9 +65,8 @@ unsigned int extended_security = CIFSSEC_DEF;
unsigned int sign_CIFS_PDUs = 1;
extern struct task_struct *oplockThread; /* remove sparse warning */
struct task_struct *oplockThread = NULL;
-/* extern struct task_struct * dnotifyThread; remove sparse warning */
-#ifdef CONFIG_CIFS_EXPERIMENTAL
-static struct task_struct *dnotifyThread = NULL;
+#ifdef CONFIG_BROKEN
+static struct task_struct *dnotifyThread;
#endif
static const struct super_operations cifs_super_ops;
unsigned int CIFSMaxBufSize = CIFS_MAX_MSGSIZE;
@@ -1039,7 +1038,7 @@ static int cifs_oplock_thread(void *dummyarg)
return 0;
}
-#ifdef CONFIG_CIFS_EXPERIMENTAL
+#ifdef CONFIG_BROKEN
static int cifs_dnotify_thread(void *dummyarg)
{
struct list_head *tmp;
@@ -1143,7 +1142,7 @@ init_cifs(void)
goto out_unregister_dfs_key_type;
}
-#ifdef CONFIG_CIFS_EXPERIMENTAL
+#ifdef CONFIG_BROKEN
dnotifyThread = kthread_run(cifs_dnotify_thread, NULL, "cifsdnotifyd");
if (IS_ERR(dnotifyThread)) {
rc = PTR_ERR(dnotifyThread);
@@ -1154,7 +1153,7 @@ init_cifs(void)
return 0;
-#ifdef CONFIG_CIFS_EXPERIMENTAL
+#ifdef CONFIG_BROKEN
out_stop_oplock_thread:
#endif
kthread_stop(oplockThread);
@@ -1195,7 +1194,7 @@ exit_cifs(void)
cifs_destroy_inodecache();
cifs_destroy_mids();
cifs_destroy_request_bufs();
-#ifdef CONFIG_CIFS_EXPERIMENTAL
+#ifdef CONFIG_BROKEN
kthread_stop(dnotifyThread);
#endif
kthread_stop(oplockThread);
--
1.5.5.6
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
