From patchwork Thu Jan 22 16:34:38 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 3609 Received: from lists.samba.org (mail.samba.org [66.70.73.150]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n0MGUapb028743 for ; Thu, 22 Jan 2009 08:30:36 -0800 Received: from dp.samba.org (localhost [127.0.0.1]) by lists.samba.org (Postfix) with ESMTP id 7A02C163BCD for ; Thu, 22 Jan 2009 16:35:06 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on dp.samba.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.8 tests=AWL, BAYES_00, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.1.7 X-Original-To: linux-cifs-client@lists.samba.org Delivered-To: linux-cifs-client@lists.samba.org Received: from mx2.redhat.com (mx2.redhat.com [66.187.237.31]) by lists.samba.org (Postfix) with ESMTP id 0D76C163AA1 for ; Thu, 22 Jan 2009 16:34:29 +0000 (GMT) Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n0MGYdt9029332; Thu, 22 Jan 2009 11:34:39 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n0MGYdK0006534; Thu, 22 Jan 2009 11:34:39 -0500 Received: from dantu.rdu.redhat.com (dantu.rdu.redhat.com [10.11.228.66]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n0MGYdlQ011106; Thu, 22 Jan 2009 11:34:39 -0500 Received: from dantu.rdu.redhat.com ([127.0.0.1]) by dantu.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n0MGYcEn009738; Thu, 22 Jan 2009 11:34:38 -0500 Received: (from jlayton@localhost) by dantu.rdu.redhat.com (8.13.8/8.13.8/Submit) id n0MGYcFd009737; Thu, 22 Jan 2009 11:34:38 -0500 From: Jeff Layton To: smfrench@gmail.com Date: Thu, 22 Jan 2009 11:34:38 -0500 Message-Id: <1232642078-9717-1-git-send-email-jlayton@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Cc: linux-fsdevel@vger.kernel.org, linux-cifs-client@lists.samba.org, linux-kernel@vger.kernel.org Subject: [linux-cifs-client] [PATCH] cifs: wrap cifs_dnotify_thread in CONFIG_BROKEN X-BeenThere: linux-cifs-client@lists.samba.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: The Linux CIFS VFS client List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-cifs-client-bounces+patchwork-cifs-client=patchwork.kernel.org@lists.samba.org Errors-To: linux-cifs-client-bounces+patchwork-cifs-client=patchwork.kernel.org@lists.samba.org 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 --- 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);