From 00146c8b2dae24a869791535cff2b20d46ca2a8c Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@infradead.org>
Date: Mon, 27 Apr 2009 09:46:44 -0400
Subject: [PATCH] --- yaml --- r: 147839 b: refs/heads/master c:
 94cb993f2ee99f3a9318e7b4dbb383497c4bedea h: refs/heads/master i:   147837:
 0bfa67b8f0b19b7079b89a7c301c817ee7004ffe   147835:
 2fedb9b26bc37c4bd430aa6b66cddf84b021c3d5   147831:
 90e79c053dac442277183790bba76433a4e7f866   147823:
 9302f61bdc530ee43e23224ff60887be18bd63b3   147807:
 08cb5d131e9f6ddd4aedf221166f63e1e6fe8666   147775:
 c1ce99c2dfec664e93e87eb5e3b1e773f07e8e28   147711:
 fb128f46dc04be4f1555bf0614ce5f1f07d3a7c1 v: v3

---
 [refs]                 |  2 +-
 trunk/fs/ocfs2/super.c | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 754fdeb97722..4f8b0d5d3cd4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7d245de25d1f0bb75a0d04194b647762b30d3db
+refs/heads/master: 94cb993f2ee99f3a9318e7b4dbb383497c4bedea
diff --git a/trunk/fs/ocfs2/super.c b/trunk/fs/ocfs2/super.c
index 5c6163f55039..3eb076ce4c07 100644
--- a/trunk/fs/ocfs2/super.c
+++ b/trunk/fs/ocfs2/super.c
@@ -126,7 +126,6 @@ static int ocfs2_get_sector(struct super_block *sb,
 			    struct buffer_head **bh,
 			    int block,
 			    int sect_size);
-static void ocfs2_write_super(struct super_block *sb);
 static struct inode *ocfs2_alloc_inode(struct super_block *sb);
 static void ocfs2_destroy_inode(struct inode *inode);
 static int ocfs2_susp_quotas(struct ocfs2_super *osb, int unsuspend);
@@ -141,7 +140,6 @@ static const struct super_operations ocfs2_sops = {
 	.clear_inode	= ocfs2_clear_inode,
 	.delete_inode	= ocfs2_delete_inode,
 	.sync_fs	= ocfs2_sync_fs,
-	.write_super	= ocfs2_write_super,
 	.put_super	= ocfs2_put_super,
 	.remount_fs	= ocfs2_remount,
 	.show_options   = ocfs2_show_options,
@@ -365,24 +363,12 @@ static struct file_operations ocfs2_osb_debug_fops = {
 	.llseek =	generic_file_llseek,
 };
 
-/*
- * write_super and sync_fs ripped right out of ext3.
- */
-static void ocfs2_write_super(struct super_block *sb)
-{
-	if (mutex_trylock(&sb->s_lock) != 0)
-		BUG();
-	sb->s_dirt = 0;
-}
-
 static int ocfs2_sync_fs(struct super_block *sb, int wait)
 {
 	int status;
 	tid_t target;
 	struct ocfs2_super *osb = OCFS2_SB(sb);
 
-	sb->s_dirt = 0;
-
 	if (ocfs2_is_hard_readonly(osb))
 		return -EROFS;