public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 2.6.19 5/5] fs: freeze_bdev with semaphore not mutex
@ 2006-11-07 18:34 Alasdair G Kergon
  2006-11-07 20:18 ` [dm-devel] " Mike Snitzer
  2006-11-07 20:28 ` Andrew Morton
  0 siblings, 2 replies; 69+ messages in thread
From: Alasdair G Kergon @ 2006-11-07 18:34 UTC (permalink / raw)
  To: Andrew Morton
  Cc: linux-kernel, dm-devel, Ingo Molnar, Eric Sandeen, Srinivasa DS

From: Srinivasa Ds <srinivasa@in.ibm.com>

On debugging I found out that,"dmsetup suspend <device name>" calls
"freeze_bdev()",which locks "bd_mount_mutex" to make sure that no new mounts
happen on bdev until thaw_bdev() is called.  This "thaw_bdev()" is getting
called when we resume the device through "dmsetup resume <device-name>".
Hence we have 2 processes,one of which locks "bd_mount_mutex"(dmsetup
suspend) and another(dmsetup resume) unlocks it.                                               

Signed-off-by: Srinivasa DS <srinivasa@in.ibm.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Eric Sandeen <sandeen@sandeen.net>
Cc: dm-devel@redhat.com

Index: linux-2.6.19-rc4/fs/block_dev.c
===================================================================
--- linux-2.6.19-rc4.orig/fs/block_dev.c	2006-11-07 17:06:20.000000000 +0000
+++ linux-2.6.19-rc4/fs/block_dev.c	2006-11-07 17:26:04.000000000 +0000
@@ -263,7 +263,7 @@ static void init_once(void * foo, kmem_c
 	{
 		memset(bdev, 0, sizeof(*bdev));
 		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_list);
 #ifdef CONFIG_SYSFS
Index: linux-2.6.19-rc4/fs/buffer.c
===================================================================
--- linux-2.6.19-rc4.orig/fs/buffer.c	2006-11-07 17:06:20.000000000 +0000
+++ linux-2.6.19-rc4/fs/buffer.c	2006-11-07 17:26:04.000000000 +0000
@@ -188,7 +188,9 @@ struct super_block *freeze_bdev(struct b
 {
 	struct super_block *sb;
 
-	mutex_lock(&bdev->bd_mount_mutex);
+	if (down_trylock(&bdev->bd_mount_sem))
+		return -EBUSY;
+
 	sb = get_super(bdev);
 	if (sb && !(sb->s_flags & MS_RDONLY)) {
 		sb->s_frozen = SB_FREEZE_WRITE;
@@ -230,7 +232,7 @@ void thaw_bdev(struct block_device *bdev
 		drop_super(sb);
 	}
 
-	mutex_unlock(&bdev->bd_mount_mutex);
+	up(&bdev->bd_mount_sem);
 }
 EXPORT_SYMBOL(thaw_bdev);
 
Index: linux-2.6.19-rc4/fs/super.c
===================================================================
--- linux-2.6.19-rc4.orig/fs/super.c	2006-11-07 17:06:20.000000000 +0000
+++ linux-2.6.19-rc4/fs/super.c	2006-11-07 17:26:04.000000000 +0000
@@ -735,9 +735,9 @@ int get_sb_bdev(struct file_system_type 
 	 * will protect the lockfs code from trying to start a snapshot
 	 * 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);
-	mutex_unlock(&bdev->bd_mount_mutex);
+	up(&bdev->bd_mount_sem);
 	if (IS_ERR(s))
 		goto error_s;
 
Index: linux-2.6.19-rc4/include/linux/fs.h
===================================================================
--- linux-2.6.19-rc4.orig/include/linux/fs.h	2006-11-07 17:06:20.000000000 +0000
+++ linux-2.6.19-rc4/include/linux/fs.h	2006-11-07 17:26:04.000000000 +0000
@@ -456,7 +456,7 @@ struct block_device {
 	struct inode *		bd_inode;	/* will die */
 	int			bd_openers;
 	struct mutex		bd_mutex;	/* open/close mutex */
-	struct mutex		bd_mount_mutex;	/* mount mutex */
+	struct semaphore        bd_mount_sem;
 	struct list_head	bd_inodes;
 	void *			bd_holder;
 	int			bd_holders;

^ permalink raw reply	[flat|nested] 69+ messages in thread

end of thread, other threads:[~2007-01-12 20:47 UTC | newest]

Thread overview: 69+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-11-07 18:34 [PATCH 2.6.19 5/5] fs: freeze_bdev with semaphore not mutex Alasdair G Kergon
2006-11-07 20:18 ` [dm-devel] " Mike Snitzer
2006-11-07 20:22   ` Eric Sandeen
2006-11-07 23:34   ` Alasdair G Kergon
2006-11-07 20:28 ` Andrew Morton
2006-11-07 22:45   ` Eric Sandeen
2006-11-07 23:00     ` Andrew Morton
2006-11-08  9:54       ` Arjan van de Ven
2007-01-12  6:23       ` Srinivasa Ds
2007-01-12 10:16       ` Srinivasa Ds
2006-11-07 23:05     ` Rafael J. Wysocki
2006-11-07 23:18       ` Eric Sandeen
2006-11-07 23:42         ` Rafael J. Wysocki
2006-11-08  0:01           ` Alasdair G Kergon
2006-11-08  8:27             ` David Chinner
2006-11-08 14:25               ` Alasdair G Kergon
2006-11-08 14:43                 ` Rafael J. Wysocki
2006-11-08 15:25                   ` Alasdair G Kergon
2006-11-08 23:06                     ` Rafael J. Wysocki
2006-11-07 23:49       ` Alasdair G Kergon
2006-11-08  0:00         ` Rafael J. Wysocki
2006-11-08  3:33           ` David Chinner
2006-11-08  2:30         ` Alasdair G Kergon
2006-11-08 12:10           ` Rafael J. Wysocki
2006-11-08 18:09             ` Pavel Machek
2006-11-09 15:52               ` Rafael J. Wysocki
2006-11-09 16:00                 ` Pavel Machek
2006-11-09 19:59                   ` Rafael J. Wysocki
2006-11-09 21:17                     ` Pavel Machek
2006-11-09 21:18                       ` Rafael J. Wysocki
2006-11-09 21:41                         ` Pavel Machek
2006-11-09 22:21                           ` Rafael J. Wysocki
2006-11-09 23:11                             ` Pavel Machek
2006-11-09 23:24                               ` Alasdair G Kergon
2006-11-09 23:32                                 ` Pavel Machek
2006-11-10 12:03                                   ` Rafael J. Wysocki
2006-11-12 18:43                                     ` Pavel Machek
2006-11-12 21:53                                       ` Rafael J. Wysocki
2006-11-12 23:30                                       ` David Chinner
2006-11-13 16:11                                         ` Rafael J. Wysocki
2006-11-15 18:50                                         ` Pavel Machek
2006-11-15 19:56                                           ` Rafael J. Wysocki
2006-11-15 20:00                                             ` Rafael J. Wysocki
2006-11-15 20:23                                               ` Pavel Machek
2006-11-15 21:58                                                 ` Rafael J. Wysocki
2006-11-15 22:49                                                   ` Pavel Machek
2006-11-16 23:20                                                   ` David Chinner
2006-11-16 23:38                                                     ` Pavel Machek
2006-11-13  7:35                                       ` Stefan Seyfried
2006-11-10  0:57                             ` David Chinner
2006-11-10 10:39                               ` Pavel Machek
2006-11-12 22:30                                 ` David Chinner
2006-11-12 22:43                                   ` Rafael J. Wysocki
2006-11-13  5:43                                     ` David Chinner
2006-11-13 16:22                                       ` Rafael J. Wysocki
2006-11-14  0:10                                         ` David Chinner
2006-11-16 23:23                                     ` David Chinner
2006-11-16 23:40                                       ` Pavel Machek
2006-11-17  1:40                                         ` David Chinner
2006-11-17 15:13                                           ` Pavel Machek
2006-11-10  0:54                       ` David Chinner
2006-11-10 10:24                       ` Alan Cox
2006-11-10 10:36                         ` Pavel Machek
2006-11-10  0:33                   ` David Chinner
2006-11-10 10:38                     ` Pavel Machek
2006-11-08 20:48             ` Nigel Cunningham
2006-11-08 21:08               ` Rafael J. Wysocki
2006-11-07 23:23   ` Alasdair G Kergon
2006-11-07 23:39   ` Ingo Molnar

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox