From patchwork Tue Oct 19 15:55:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tejun Heo X-Patchwork-Id: 266001 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9JFuv9Y019186 for ; Tue, 19 Oct 2010 15:56:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754528Ab0JSP4E (ORCPT ); Tue, 19 Oct 2010 11:56:04 -0400 Received: from hera.kernel.org ([140.211.167.34]:56243 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753667Ab0JSP4C (ORCPT ); Tue, 19 Oct 2010 11:56:02 -0400 Received: from htj.dyndns.org (localhost [127.0.0.1]) by hera.kernel.org (8.14.4/8.14.3) with ESMTP id o9JFtsoV028525; Tue, 19 Oct 2010 15:55:55 GMT X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.95.2 at hera.kernel.org Received: from [127.0.0.2] (htj.dyndns.org [127.0.0.2]) by htj.dyndns.org (Postfix) with ESMTPSA id 8334E1CC04B2; Tue, 19 Oct 2010 17:55:54 +0200 (CEST) Message-ID: <4CBDBF8A.8010106@kernel.org> Date: Tue, 19 Oct 2010 17:55:54 +0200 From: Tejun Heo User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); en-US; rv:1.9.2.9) Gecko/20100915 Lightning/1.0b2 Thunderbird/3.1.4 MIME-Version: 1.0 To: Steve French , linux-cifs@vger.kernel.org, lkml Subject: [PATCH v2.6.36-rc7] cifs: cancel_delayed_work() + flush_scheduled_work() -> cancel_delayed_work_sync() X-Enigmail-Version: 1.1.1 X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on hera.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 19 Oct 2010 15:56:58 +0000 (UTC) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.3 (hera.kernel.org [127.0.0.1]); Tue, 19 Oct 2010 15:56:01 +0000 (UTC) Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org Index: work/fs/cifs/cifs_dfs_ref.c =================================================================== --- work.orig/fs/cifs/cifs_dfs_ref.c +++ work/fs/cifs/cifs_dfs_ref.c @@ -44,8 +44,7 @@ static void cifs_dfs_expire_automounts(s void cifs_dfs_release_automount_timer(void) { BUG_ON(!list_empty(&cifs_dfs_automount_list)); - cancel_delayed_work(&cifs_dfs_automount_task); - flush_scheduled_work(); + cancel_delayed_work_sync(&cifs_dfs_automount_task); } /**