diff --git a/[refs] b/[refs]
index a7813793bb3b..2c03d0c7e592 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1782a3b0a15d9ac497a8f47931c4536bfe8d18e
+refs/heads/master: 3dcee8064bd36c547b45514dfd33df4c12695428
diff --git a/trunk/drivers/md/dm.c b/trunk/drivers/md/dm.c
index ea180af6d227..0e4c8d3ca9fb 100644
--- a/trunk/drivers/md/dm.c
+++ b/trunk/drivers/md/dm.c
@@ -1009,18 +1009,16 @@ static int __lock_fs(struct mapped_device *md)
 	return 0;
 }
 
-static int __unlock_fs(struct mapped_device *md)
+static void __unlock_fs(struct mapped_device *md)
 {
 	if (!test_and_clear_bit(DMF_FS_LOCKED, &md->flags))
-		return 0;
+		return;
 
 	thaw_bdev(md->frozen_bdev, md->frozen_sb);
 	bdput(md->frozen_bdev);
 
 	md->frozen_sb = NULL;
 	md->frozen_bdev = NULL;
-
-	return 0;
 }
 
 /*