Subject: [folded-merged] ufs-sb-mutex-merge-mutex_destroy-fix-v2-fix.patch removed from -mm tree
To: akpm@xxxxxxxxxxxxxxxxxxxx,dushistov@xxxxxxx,fabf@xxxxxxxxx,fengguang.wu@xxxxxxxxx,jet.chen@xxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Tue, 08 Apr 2014 16:00:50 -0700
The patch titled
Subject: ufs-sb-mutex-merge-mutex_destroy-fix-v2-fix
has been removed from the -mm tree. Its filename was
ufs-sb-mutex-merge-mutex_destroy-fix-v2-fix.patch
This patch was dropped because it was folded into ufs-sb-mutex-merge-mutex_destroy.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: ufs-sb-mutex-merge-mutex_destroy-fix-v2-fix
avoid ifdefs, return -EROFS not -EINVAL.
Cc: "Chen, Jet" <jet.chen@xxxxxxxxx>
Cc: Evgeniy Dushistov <dushistov@xxxxxxx>
Cc: Fabian Frederick <fabf@xxxxxxxxx>
Cc: Wu Fengguang <fengguang.wu@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ufs/super.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff -puN fs/ufs/super.c~ufs-sb-mutex-merge-mutex_destroy-fix-v2-fix fs/ufs/super.c
--- a/fs/ufs/super.c~ufs-sb-mutex-merge-mutex_destroy-fix-v2-fix
+++ a/fs/ufs/super.c
@@ -785,6 +785,14 @@ static int ufs_fill_super(struct super_b
flags = 0;
UFSD("ENTER\n");
+
+#ifndef CONFIG_UFS_FS_WRITE
+ if (!(sb->s_flags & MS_RDONLY)) {
+ printk("ufs was compiled with read-only support, "
+ "can't be mounted as read-write\n");
+ return -EROFS;
+ }
+#endif
sbi = kzalloc(sizeof(struct ufs_sb_info), GFP_KERNEL);
if (!sbi)
@@ -794,13 +802,6 @@ static int ufs_fill_super(struct super_b
UFSD("flag %u\n", (int)(sb->s_flags & MS_RDONLY));
-#ifndef CONFIG_UFS_FS_WRITE
- if (!(sb->s_flags & MS_RDONLY)) {
- printk("ufs was compiled with read-only support, "
- "can't be mounted as read-write\n");
- goto failed_noreadwrite;
- }
-#endif
mutex_init(&sbi->mutex);
spin_lock_init(&sbi->work_lock);
INIT_DELAYED_WORK(&sbi->sync_work, delayed_sync_fs);
@@ -1256,10 +1257,6 @@ 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 akpm@xxxxxxxxxxxxxxxxxxxx are
origin.patch
ufs-sb-mutex-merge-mutex_destroy.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
