Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] Revert bd_mount_mutex back to a semaphore

Browse source 
Revert bd_mount_mutex back to a semaphore so that xfs_freeze -f /mnt/newtest;
xfs_freeze -u /mnt/newtest works safely and doesn't produce lockdep warnings.

(XFS unlocks the semaphore from a different task, by design.  The mutex
code warns about this)

Signed-off-by: Dave Chinner <dgc@sgi.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
David Chinner 2007-01-10 23:15:41 -08:00 committed by Linus Torvalds
parent 88bf7b391d
commit f73ca1b76c
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/block_dev.c
View file

@ -411,7 +411,7 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
{ {
memset(bdev, 0, sizeof(*bdev)); memset(bdev, 0, sizeof(*bdev));
mutex_init(&bdev->bd_mutex); mutex_init(&bdev->bd_mutex);
mutex_init(&bdev->bd_mount_mutex); sema_init(&bdev->bd_mount_sem, 1);
INIT_LIST_HEAD(&bdev->bd_inodes); INIT_LIST_HEAD(&bdev->bd_inodes);
INIT_LIST_HEAD(&bdev->bd_list); INIT_LIST_HEAD(&bdev->bd_list);
#ifdef CONFIG_SYSFS #ifdef CONFIG_SYSFS

6
fs/buffer.c
View file

@ -180,7 +180,7 @@ int fsync_bdev(struct block_device *bdev)
* freeze_bdev -- lock a filesystem and force it into a consistent state * freeze_bdev -- lock a filesystem and force it into a consistent state
* @bdev: blockdevice to lock * @bdev: blockdevice to lock
* *
* This takes the block device bd_mount_mutex to make sure no new mounts * This takes the block device bd_mount_sem to make sure no new mounts
* happen on bdev until thaw_bdev() is called. * happen on bdev until thaw_bdev() is called.
* If a superblock is found on this device, we take the s_umount semaphore * If a superblock is found on this device, we take the s_umount semaphore
* on it to make sure nobody unmounts until the snapshot creation is done. * on it to make sure nobody unmounts until the snapshot creation is done.
@ -189,7 +189,7 @@ struct super_block *freeze_bdev(struct block_device *bdev)
{ {
struct super_block *sb; struct super_block *sb;
mutex_lock(&bdev->bd_mount_mutex); down(&bdev->bd_mount_sem);
sb = get_super(bdev); sb = get_super(bdev);
if (sb && !(sb->s_flags & MS_RDONLY)) { if (sb && !(sb->s_flags & MS_RDONLY)) {
sb->s_frozen = SB_FREEZE_WRITE; sb->s_frozen = SB_FREEZE_WRITE;
@ -231,7 +231,7 @@ void thaw_bdev(struct block_device *bdev, struct super_block *sb)
drop_super(sb); drop_super(sb);
} }
mutex_unlock(&bdev->bd_mount_mutex); up(&bdev->bd_mount_sem);
} }
EXPORT_SYMBOL(thaw_bdev); EXPORT_SYMBOL(thaw_bdev);

4
fs/gfs2/ops_fstype.c
View file

@ -867,9 +867,9 @@ static int gfs2_get_sb_meta(struct file_system_type *fs_type, int flags,
error = -EBUSY; error = -EBUSY;
goto error; goto error;
} }
mutex_lock(&sb->s_bdev->bd_mount_mutex); down(&sb->s_bdev->bd_mount_sem);
new = sget(fs_type, test_bdev_super, set_bdev_super, sb->s_bdev); new = sget(fs_type, test_bdev_super, set_bdev_super, sb->s_bdev);
mutex_unlock(&sb->s_bdev->bd_mount_mutex); up(&sb->s_bdev->bd_mount_sem);
if (IS_ERR(new)) { if (IS_ERR(new)) {
error = PTR_ERR(new); error = PTR_ERR(new);
goto error; goto error;

4
fs/super.c
View file

@ -753,9 +753,9 @@ int get_sb_bdev(struct file_system_type *fs_type,
* will protect the lockfs code from trying to start a snapshot * will protect the lockfs code from trying to start a snapshot
* while we are mounting * while we are mounting
*/ */
mutex_lock(&bdev->bd_mount_mutex); down(&bdev->bd_mount_sem);
s = sget(fs_type, test_bdev_super, set_bdev_super, bdev); s = sget(fs_type, test_bdev_super, set_bdev_super, bdev);
mutex_unlock(&bdev->bd_mount_mutex); up(&bdev->bd_mount_sem);
if (IS_ERR(s)) if (IS_ERR(s))
goto error_s; goto error_s;

2
include/linux/fs.h
View file

@ -459,7 +459,7 @@ struct block_device {
struct inode * bd_inode; /* will die */ struct inode * bd_inode; /* will die */
int bd_openers; int bd_openers;
struct mutex bd_mutex; /* open/close mutex */ struct mutex bd_mutex; /* open/close mutex */
struct mutex bd_mount_mutex; /* mount mutex */ struct semaphore bd_mount_sem;
struct list_head bd_inodes; struct list_head bd_inodes;
void * bd_holder; void * bd_holder;
int bd_holders; int bd_holders;