super.c (b004a5eb0babec7ef91558f73315ef49e5a1f285) super.c (06df0f999247a3153c3ec284c7ada36ef785eb97)
1/*
2 * super.c - NILFS module and super block management.
3 *
4 * Copyright (C) 2005-2008 Nippon Telegraph and Telephone Corporation.
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; either version 2 of the License, or

--- 1005 unchanged lines hidden (view full) ---

1014 return err;
1015}
1016
1017static int nilfs_remount(struct super_block *sb, int *flags, char *data)
1018{
1019 struct nilfs_sb_info *sbi = NILFS_SB(sb);
1020 struct the_nilfs *nilfs = sbi->s_nilfs;
1021 unsigned long old_sb_flags;
1/*
2 * super.c - NILFS module and super block management.
3 *
4 * Copyright (C) 2005-2008 Nippon Telegraph and Telephone Corporation.
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; either version 2 of the License, or

--- 1005 unchanged lines hidden (view full) ---

1014 return err;
1015}
1016
1017static int nilfs_remount(struct super_block *sb, int *flags, char *data)
1018{
1019 struct nilfs_sb_info *sbi = NILFS_SB(sb);
1020 struct the_nilfs *nilfs = sbi->s_nilfs;
1021 unsigned long old_sb_flags;
1022 struct nilfs_mount_options old_opts;
1022 unsigned long old_mount_opt;
1023 int err;
1024
1025 old_sb_flags = sb->s_flags;
1023 int err;
1024
1025 old_sb_flags = sb->s_flags;
1026 old_opts.mount_opt = sbi->s_mount_opt;
1026 old_mount_opt = sbi->s_mount_opt;
1027
1028 if (!parse_options(data, sb, 1)) {
1029 err = -EINVAL;
1030 goto restore_opts;
1031 }
1032 sb->s_flags = (sb->s_flags & ~MS_POSIXACL);
1033
1034 err = -EINVAL;

--- 52 unchanged lines hidden (view full) ---

1087 nilfs_setup_super(sbi, true);
1088 up_write(&nilfs->ns_sem);
1089 }
1090 out:
1091 return 0;
1092
1093 restore_opts:
1094 sb->s_flags = old_sb_flags;
1027
1028 if (!parse_options(data, sb, 1)) {
1029 err = -EINVAL;
1030 goto restore_opts;
1031 }
1032 sb->s_flags = (sb->s_flags & ~MS_POSIXACL);
1033
1034 err = -EINVAL;

--- 52 unchanged lines hidden (view full) ---

1087 nilfs_setup_super(sbi, true);
1088 up_write(&nilfs->ns_sem);
1089 }
1090 out:
1091 return 0;
1092
1093 restore_opts:
1094 sb->s_flags = old_sb_flags;
1095 sbi->s_mount_opt = old_opts.mount_opt;
1095 sbi->s_mount_opt = old_mount_opt;
1096 return err;
1097}
1098
1099struct nilfs_super_data {
1100 struct block_device *bdev;
1101 struct nilfs_sb_info *sbi;
1102 __u64 cno;
1103 int flags;

--- 262 unchanged lines hidden --- 		1096 return err;
1097}
1098
1099struct nilfs_super_data {
1100 struct block_device *bdev;
1101 struct nilfs_sb_info *sbi;
1102 __u64 cno;
1103 int flags;

--- 262 unchanged lines hidden ---