From: Marco Stornelli <marco.stornelli@gmail.com>
To: bharrosh@panasas.com, bhalevy@tonian.com, jack@suse.cz,
Andrew Morton <akpm@linux-foundation.org>,
adilger.kernel@dilger.ca, tytso@mit.edu,
hirofumi@mail.parknet.co.jp, mikulas@artax.karlin.mff.cuni.cz,
Al Viro <viro@ZenIV.linux.org.uk>,
hch@infradead.org, dushistov@mail.ru, osd-dev@open-osd.org,
Linux Kernel <linux-kernel@vger.kernel.org>,
linux-ext4@vger.kernel.org,
Linux FS Devel <linux-fsdevel@vger.kernel.org>
Subject: [PATCH 3/8] ext3: remove lock/unlock super
Date: Thu, 16 Aug 2012 12:00:26 +0200 [thread overview]
Message-ID: <502CC4BA.3040702@gmail.com> (raw)
From: Marco Stornelli <marco.stornelli@gmail.com>
Replaced lock and unlock super with a new fs mutex s_lock.
Signed-off-by: Marco Stornelli <marco.stornelli@gmail.com>
---
diff -Nurp linux-3.6-rc1-orig/fs/ext3/ext3.h linux-3.6-rc1/fs/ext3/ext3.h
--- linux-3.6-rc1-orig/fs/ext3/ext3.h 2012-08-16 09:37:31.000000000 +0200
+++ linux-3.6-rc1/fs/ext3/ext3.h 2012-08-16 09:46:39.000000000 +0200
@@ -672,6 +672,7 @@ struct ext3_sb_info {
char *s_qf_names[MAXQUOTAS]; /* Names of quota files with journalled quota */
int s_jquota_fmt; /* Format of quota to use */
#endif
+ struct mutex s_lock;
};
static inline spinlock_t *
diff -Nurp linux-3.6-rc1-orig/fs/ext3/super.c linux-3.6-rc1/fs/ext3/super.c
--- linux-3.6-rc1-orig/fs/ext3/super.c 2012-08-16 09:37:31.000000000 +0200
+++ linux-3.6-rc1/fs/ext3/super.c 2012-08-16 09:49:11.000000000 +0200
@@ -1939,6 +1939,7 @@ static int ext3_fill_super (struct super
sbi->s_gdb_count = db_count;
get_random_bytes(&sbi->s_next_generation, sizeof(u32));
spin_lock_init(&sbi->s_next_gen_lock);
+ mutex_init(&sbi->s_lock);
/* per fileystem reservation list head & lock */
spin_lock_init(&sbi->s_rsv_window_lock);
@@ -2582,11 +2583,11 @@ out:
static int ext3_unfreeze(struct super_block *sb)
{
if (!(sb->s_flags & MS_RDONLY)) {
- lock_super(sb);
+ mutex_lock(&EXT3_SB(sb)->s_lock);
/* Reser the needs_recovery flag before the fs is unlocked. */
EXT3_SET_INCOMPAT_FEATURE(sb, EXT3_FEATURE_INCOMPAT_RECOVER);
ext3_commit_super(sb, EXT3_SB(sb)->s_es, 1);
- unlock_super(sb);
+ mutex_unlock(&EXT3_SB(sb)->s_lock);
journal_unlock_updates(EXT3_SB(sb)->s_journal);
}
return 0;
@@ -2606,7 +2607,7 @@ static int ext3_remount (struct super_bl
#endif
/* Store the original options */
- lock_super(sb);
+ mutex_lock(&EXT3_SB(sb)->s_lock);
old_sb_flags = sb->s_flags;
old_opts.s_mount_opt = sbi->s_mount_opt;
old_opts.s_resuid = sbi->s_resuid;
@@ -2712,7 +2713,7 @@ static int ext3_remount (struct super_bl
old_opts.s_qf_names[i] != sbi->s_qf_names[i])
kfree(old_opts.s_qf_names[i]);
#endif
- unlock_super(sb);
+ mutex_unlock(&EXT3_SB(sb)->s_lock);
if (enable_quota)
dquot_resume(sb, -1);
@@ -2732,7 +2733,7 @@ restore_opts:
sbi->s_qf_names[i] = old_opts.s_qf_names[i];
}
#endif
- unlock_super(sb);
+ mutex_unlock(&EXT3_SB(sb)->s_lock);
return err;
}
next reply other threads:[~2012-08-16 10:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-16 10:00 Marco Stornelli [this message]
2012-08-16 16:39 ` [PATCH 3/8] ext3: remove lock/unlock super Jan Kara
2012-08-16 19:19 ` Theodore Ts'o
2012-08-17 6:47 ` Marco Stornelli
2012-08-17 23:08 ` Theodore Ts'o
2012-08-18 7:06 ` Marco Stornelli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=502CC4BA.3040702@gmail.com \
--to=marco.stornelli@gmail.com \
--cc=adilger.kernel@dilger.ca \
--cc=akpm@linux-foundation.org \
--cc=bhalevy@tonian.com \
--cc=bharrosh@panasas.com \
--cc=dushistov@mail.ru \
--cc=hch@infradead.org \
--cc=hirofumi@mail.parknet.co.jp \
--cc=jack@suse.cz \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mikulas@artax.karlin.mff.cuni.cz \
--cc=osd-dev@open-osd.org \
--cc=tytso@mit.edu \
--cc=viro@ZenIV.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).