mirror of https://github.com/OpenIPC/firmware.git
81 lines
2.4 KiB
Diff
81 lines
2.4 KiB
Diff
diff -drupN a/fs/super.c b/fs/super.c
|
|
--- a/fs/super.c 2018-08-06 17:23:04.000000000 +0300
|
|
+++ b/fs/super.c 2022-06-12 05:28:14.000000000 +0300
|
|
@@ -761,7 +761,8 @@ rescan:
|
|
}
|
|
|
|
/**
|
|
- * do_remount_sb - asks filesystem to change mount options.
|
|
+ * do_remount_sb2 - asks filesystem to change mount options.
|
|
+ * @mnt: mount we are looking at
|
|
* @sb: superblock in question
|
|
* @flags: numeric part of options
|
|
* @data: the rest of options
|
|
@@ -769,7 +770,7 @@ rescan:
|
|
*
|
|
* Alters the mount options of a mounted file system.
|
|
*/
|
|
-int do_remount_sb(struct super_block *sb, int flags, void *data, int force)
|
|
+int do_remount_sb2(struct vfsmount *mnt, struct super_block *sb, int flags, void *data, int force)
|
|
{
|
|
int retval;
|
|
int remount_ro;
|
|
@@ -811,7 +812,16 @@ int do_remount_sb(struct super_block *sb
|
|
}
|
|
}
|
|
|
|
- if (sb->s_op->remount_fs) {
|
|
+ if (mnt && sb->s_op->remount_fs2) {
|
|
+ retval = sb->s_op->remount_fs2(mnt, sb, &flags, data);
|
|
+ if (retval) {
|
|
+ if (!force)
|
|
+ goto cancel_readonly;
|
|
+ /* If forced remount, go ahead despite any errors */
|
|
+ WARN(1, "forced remount of a %s fs returned %i\n",
|
|
+ sb->s_type->name, retval);
|
|
+ }
|
|
+ } else if (sb->s_op->remount_fs) {
|
|
retval = sb->s_op->remount_fs(sb, &flags, data);
|
|
if (retval) {
|
|
if (!force)
|
|
@@ -843,12 +853,17 @@ cancel_readonly:
|
|
return retval;
|
|
}
|
|
|
|
+int do_remount_sb(struct super_block *sb, int flags, void *data, int force)
|
|
+{
|
|
+ return do_remount_sb2(NULL, sb, flags, data, force);
|
|
+}
|
|
+
|
|
static void do_emergency_remount(struct work_struct *work)
|
|
{
|
|
struct super_block *sb, *p = NULL;
|
|
|
|
spin_lock(&sb_lock);
|
|
- list_for_each_entry(sb, &super_blocks, s_list) {
|
|
+ list_for_each_entry_reverse(sb, &super_blocks, s_list) {
|
|
if (hlist_unhashed(&sb->s_instances))
|
|
continue;
|
|
sb->s_count++;
|
|
@@ -1168,7 +1183,7 @@ struct dentry *mount_single(struct file_
|
|
EXPORT_SYMBOL(mount_single);
|
|
|
|
struct dentry *
|
|
-mount_fs(struct file_system_type *type, int flags, const char *name, void *data)
|
|
+mount_fs(struct file_system_type *type, int flags, const char *name, struct vfsmount *mnt, void *data)
|
|
{
|
|
struct dentry *root;
|
|
struct super_block *sb;
|
|
@@ -1185,7 +1200,10 @@ mount_fs(struct file_system_type *type,
|
|
goto out_free_secdata;
|
|
}
|
|
|
|
- root = type->mount(type, flags, name, data);
|
|
+ if (type->mount2)
|
|
+ root = type->mount2(mnt, type, flags, name, data);
|
|
+ else
|
|
+ root = type->mount(type, flags, name, data);
|
|
if (IS_ERR(root)) {
|
|
error = PTR_ERR(root);
|
|
goto out_free_secdata;
|