Subject: [folded-merged] ufs-sb-mutex-merge-mutex_destroy-fix-v2.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:48 -0700
The patch titled
Subject: ufs-sb-mutex-merge-mutex_destroy-fix-v2
has been removed from the -mm tree. Its filename was
ufs-sb-mutex-merge-mutex_destroy-fix-v2.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-v2
v2: failed_noreadwrite is only used with CONFIG_UFS_FS_WRITE
-> add ifndef
Signed-off-by: Fabian Frederick <fabf@xxxxxxxxx>
Reported-by: Wu Fengguang <fengguang.wu@xxxxxxxxx>
Cc: Evgeniy Dushistov <dushistov@xxxxxxx>
Tested-by: "Chen, Jet" <jet.chen@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ufs/super.c | 2 ++
1 file changed, 2 insertions(+)
diff -puN fs/ufs/super.c~ufs-sb-mutex-merge-mutex_destroy-fix-v2 fs/ufs/super.c
--- a/fs/ufs/super.c~ufs-sb-mutex-merge-mutex_destroy-fix-v2
+++ a/fs/ufs/super.c
@@ -1257,7 +1257,9 @@ magic_found:
failed:
mutex_destroy(&sbi->mutex);
+#ifndef CONFIG_UFS_FS_WRITE
failed_noreadwrite:
+#endif
if (ubh)
ubh_brelse_uspi (uspi);
kfree (uspi);
_
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-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
