FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Ubuntu > Ubuntu Kernel Team

 
 
LinkBack Thread Tools
 
Old 05-06-2010, 10:34 AM
Surbhi Palande
 
Default Revert "UBUNTU: SAUCE: sync before umount to reduce time taken by ext4 umount"

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 <surbhi.palande@canonical.com>
---
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 <asm/unistd.h>
#include "pnode.h"
#include "internal.h"
-#include <linux/fs.h>

#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;
--
1.7.0.4


--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team
 

Thread Tools




All times are GMT. The time now is 09:17 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org