Subject: [folded-merged] ufs-sb-mutex-merge-mutex_destroy-fix.patch removed from -mm tree
To: fabf@xxxxxxxxx,dushistov@xxxxxxx,fengguang.wu@xxxxxxxxx,jet.chen@xxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Tue, 08 Apr 2014 16:00:45 -0700
The patch titled
Subject: ufs: sb mutex merge + mutex_destroy: fix
has been removed from the -mm tree. Its filename was
ufs-sb-mutex-merge-mutex_destroy-fix.patch
This patch was dropped because it was folded into ufs-sb-mutex-merge-mutex_destroy.patch
------------------------------------------------------
From: Fabian Frederick <fabf@xxxxxxxxx>
Subject: ufs: sb mutex merge + mutex_destroy: fix
mutex_destroy was also called when trying to mount volume in read/write
without write support enabled.
Signed-off-by: Fabian Frederick <fabf@xxxxxxxxx>
Reported-by: Wu Fengguang <fengguang.wu@xxxxxxxxx>
Cc: Evgeniy Dushistov <dushistov@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ufs/super.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff -puN fs/ufs/super.c~ufs-sb-mutex-merge-mutex_destroy-fix fs/ufs/super.c
--- a/fs/ufs/super.c~ufs-sb-mutex-merge-mutex_destroy-fix
+++ a/fs/ufs/super.c
@@ -798,7 +798,7 @@ static int ufs_fill_super(struct super_b
if (!(sb->s_flags & MS_RDONLY)) {
printk("ufs was compiled with read-only support, "
"can't be mounted as read-write\n");
- goto failed;
+ goto failed_noreadwrite;
}
#endif
mutex_init(&sbi->mutex);
@@ -1255,10 +1255,12 @@ magic_found:
return 0;
failed:
+ mutex_destroy(&sbi->mutex);
+
+failed_noreadwrite:
if (ubh)
ubh_brelse_uspi (uspi);
kfree (uspi);
- mutex_destroy(&sbi->mutex);
kfree(sbi);
sb->s_fs_info = NULL;
UFSD("EXIT (FAILED)\n");
_
Patches currently in -mm which might be from fabf@xxxxxxxxx are
origin.patch
ufs-sb-mutex-merge-mutex_destroy.patch
ufs-sb-mutex-merge-mutex_destroy-fix-v2.patch
ufs-sb-mutex-merge-mutex_destroy-fix-v2-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
