aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/fs.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2006-01-09 15:59:25 -0800
committerIngo Molnar <mingo@hera.kernel.org>2006-01-09 15:59:25 -0800
commit7892f2f48d165a34b0b8130c8a195dfd807b8cb6 (patch)
tree592b29350c168aa5758700820ab22fb56e72a567 /include/linux/fs.h
parent[PATCH] mutex subsystem, semaphore to mutex: VFS, ->i_sem (diff)
downloadlinux-dev-7892f2f48d165a34b0b8130c8a195dfd807b8cb6.tar.xz
linux-dev-7892f2f48d165a34b0b8130c8a195dfd807b8cb6.zip
[PATCH] mutex subsystem, semaphore to mutex: VFS, sb->s_lock
This patch converts the superblock-lock semaphore to a mutex, affecting lock_super()/unlock_super(). Tested on ext3 and XFS. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/fs.h')
-rw-r--r--include/linux/fs.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 01654b218e42..92ae3e2067b0 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -821,7 +821,7 @@ struct super_block {
unsigned long s_magic;
struct dentry *s_root;
struct rw_semaphore s_umount;
- struct semaphore s_lock;
+ struct mutex s_lock;
int s_count;
int s_syncing;
int s_need_sync_fs;
@@ -893,13 +893,13 @@ static inline int has_fs_excl(void)
static inline void lock_super(struct super_block * sb)
{
get_fs_excl();
- down(&sb->s_lock);
+ mutex_lock(&sb->s_lock);
}
static inline void unlock_super(struct super_block * sb)
{
put_fs_excl();
- up(&sb->s_lock);
+ mutex_unlock(&sb->s_lock);
}
/*