From patchwork Thu May 6 10:34:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Surbhi Palande X-Patchwork-Id: 51823 X-Patchwork-Delegate: stefan.bader@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 73784B7D4A for ; Thu, 6 May 2010 20:35:11 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O9yQ6-0007PU-Cd; Thu, 06 May 2010 11:35:06 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O9yQ3-0007Oc-86 for kernel-team@lists.ubuntu.com; Thu, 06 May 2010 11:35:03 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1O9yQ3-0008Tb-5Y for ; Thu, 06 May 2010 11:35:03 +0100 Received: from a88-112-254-38.elisa-laajakaista.fi ([88.112.254.38] helo=canonical.com) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1O9yQ2-000213-Tg for kernel-team@lists.ubuntu.com; Thu, 06 May 2010 11:35:03 +0100 From: Surbhi Palande To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2] Revert "UBUNTU: SAUCE: sync before umount to reduce time taken by ext4 umount" Date: Thu, 6 May 2010 13:34:59 +0300 Message-Id: <8a222043a09f940b84008f1e96ebb4fdd7e3e908.1273139148.git.surbhi.palande@canonical.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: In-Reply-To: References: X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com BugLink: http://launchpad.net/bugs/543617 This reverts commit 5e1941884c700b7b97bcad52c2d8212ac56a7ebc for a patch taken from upstream kernel bugzilla, that fixes the issue for which this commit was a temporary fix. Signed-off-by: Surbhi Palande --- fs/namespace.c | 7 ------- fs/sync.c | 2 +- include/linux/fs.h | 1 - 3 files changed, 1 insertions(+), 9 deletions(-) diff --git a/fs/namespace.c b/fs/namespace.c index a648d7f..a2cadcf 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -33,7 +33,6 @@ #include #include "pnode.h" #include "internal.h" -#include #define HASH_SHIFT ilog2(PAGE_SIZE / sizeof(struct list_head)) #define HASH_SIZE (1UL << HASH_SHIFT) @@ -1135,12 +1134,6 @@ SYSCALL_DEFINE2(umount, char __user *, name, int, flags) if (!capable(CAP_SYS_ADMIN)) goto dput_and_out; - /* Temporary solution to fix long umount periods till - * we find the real fix - */ - sync_filesystems(0); - sync_filesystems(1); - retval = do_umount(path.mnt, flags); dput_and_out: /* we mustn't call path_put() as that would clear mnt_expiry_mark */ diff --git a/fs/sync.c b/fs/sync.c index 09e3734..d104591 100644 --- a/fs/sync.c +++ b/fs/sync.c @@ -89,7 +89,7 @@ EXPORT_SYMBOL_GPL(sync_filesystem); * flags again, which will cause process A to resync everything. Fix that with * a local mutex. */ -void sync_filesystems(int wait) +static void sync_filesystems(int wait) { struct super_block *sb; static DEFINE_MUTEX(mutex); diff --git a/include/linux/fs.h b/include/linux/fs.h index 1a51c61..692a3ee 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1973,7 +1973,6 @@ static inline int thaw_bdev(struct block_device *bdev, struct super_block *sb) return 0; } #endif -extern void sync_filesystems(int wait); extern int sync_filesystem(struct super_block *); extern const struct file_operations def_blk_fops; extern const struct file_operations def_chr_fops;