aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2006-01-09 18:59:25 -0500
committerIngo Molnar <mingo@hera.kernel.org>2006-01-09 18:59:25 -0500
commit7892f2f48d165a34b0b8130c8a195dfd807b8cb6 (patch)
tree592b29350c168aa5758700820ab22fb56e72a567 /include/linux
parent1b1dcc1b57a49136f118a0f16367256ff9994a69 (diff)
[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')
-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 {
821 unsigned long s_magic; 821 unsigned long s_magic;
822 struct dentry *s_root; 822 struct dentry *s_root;
823 struct rw_semaphore s_umount; 823 struct rw_semaphore s_umount;
824 struct semaphore s_lock; 824 struct mutex s_lock;
825 int s_count; 825 int s_count;
826 int s_syncing; 826 int s_syncing;
827 int s_need_sync_fs; 827 int s_need_sync_fs;
@@ -893,13 +893,13 @@ static inline int has_fs_excl(void)
893static inline void lock_super(struct super_block * sb) 893static inline void lock_super(struct super_block * sb)
894{ 894{
895 get_fs_excl(); 895 get_fs_excl();
896 down(&sb->s_lock); 896 mutex_lock(&sb->s_lock);
897} 897}
898 898
899static inline void unlock_super(struct super_block * sb) 899static inline void unlock_super(struct super_block * sb)
900{ 900{
901 put_fs_excl(); 901 put_fs_excl();
902 up(&sb->s_lock); 902 mutex_unlock(&sb->s_lock);
903} 903}
904 904
905/* 905/*