Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit c79d967de3741ceb60c5bbbf1b6f97eab9a89838

Authored by Christoph Hellwig
Committed by Jan Kara
1 parent eea7feb072
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

quota: move remount handling into the filesystem 

Currently do_remount_sb calls into the dquot code to tell it about going
from rw to ro and ro to rw.  Move this code into the filesystem to
not depend on the dquot code in the VFS - note ocfs2 already ignores
these calls and handles remount by itself.  This gets rid of overloading
the quotactl calls and allows to unify the VFS and XFS codepaths in
that area later.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>

Showing 8 changed files with 84 additions and 14 deletions Side-by-side Diff

... ... @@ -1241,6 +1241,7 @@
1241 1241 spin_unlock(&sbi->s_lock);
1242 1242 return 0;
1243 1243 }
  1244 +
1244 1245 /*
1245 1246 * OK, we are remounting a valid rw partition rdonly, so set
1246 1247 * the rdonly flag and then mark the partition as valid again.
... ... @@ -1248,6 +1249,14 @@
1248 1249 es->s_state = cpu_to_le16(sbi->s_mount_state);
1249 1250 es->s_mtime = cpu_to_le32(get_seconds());
1250 1251 spin_unlock(&sbi->s_lock);
  1252 +
  1253 + err = vfs_dq_off(sb, 1);
  1254 + if (err < 0 && err != -ENOSYS) {
  1255 + err = -EBUSY;
  1256 + spin_lock(&sbi->s_lock);
  1257 + goto restore_opts;
  1258 + }
  1259 +
1251 1260 ext2_sync_super(sb, es, 1);
1252 1261 } else {
1253 1262 __le32 ret = EXT2_HAS_RO_COMPAT_FEATURE(sb,
1254 1263  
1255 1264  
... ... @@ -1269,8 +1278,12 @@
1269 1278 if (!ext2_setup_super (sb, es, 0))
1270 1279 sb->s_flags &= ~MS_RDONLY;
1271 1280 spin_unlock(&sbi->s_lock);
  1281 +
1272 1282 ext2_write_super(sb);
  1283 +
  1284 + vfs_dq_quota_on_remount(sb);
1273 1285 }
  1286 +
1274 1287 return 0;
1275 1288 restore_opts:
1276 1289 sbi->s_mount_opt = old_opts.s_mount_opt;
... ... @@ -2551,6 +2551,7 @@
2551 2551 ext3_fsblk_t n_blocks_count = 0;
2552 2552 unsigned long old_sb_flags;
2553 2553 struct ext3_mount_options old_opts;
  2554 + int enable_quota = 0;
2554 2555 int err;
2555 2556 #ifdef CONFIG_QUOTA
2556 2557 int i;
... ... @@ -2597,6 +2598,12 @@
2597 2598 }
2598 2599  
2599 2600 if (*flags & MS_RDONLY) {
  2601 + err = vfs_dq_off(sb, 1);
  2602 + if (err < 0 && err != -ENOSYS) {
  2603 + err = -EBUSY;
  2604 + goto restore_opts;
  2605 + }
  2606 +
2600 2607 /*
2601 2608 * First of all, the unconditional stuff we have to do
2602 2609 * to disable replay of the journal when we next remount
... ... @@ -2651,6 +2658,7 @@
2651 2658 goto restore_opts;
2652 2659 if (!ext3_setup_super (sb, es, 0))
2653 2660 sb->s_flags &= ~MS_RDONLY;
  2661 + enable_quota = 1;
2654 2662 }
2655 2663 }
2656 2664 #ifdef CONFIG_QUOTA
... ... @@ -2662,6 +2670,9 @@
2662 2670 #endif
2663 2671 unlock_super(sb);
2664 2672 unlock_kernel();
  2673 +
  2674 + if (enable_quota)
  2675 + vfs_dq_quota_on_remount(sb);
2665 2676 return 0;
2666 2677 restore_opts:
2667 2678 sb->s_flags = old_sb_flags;
... ... @@ -3574,6 +3574,7 @@
3574 3574 ext4_fsblk_t n_blocks_count = 0;
3575 3575 unsigned long old_sb_flags;
3576 3576 struct ext4_mount_options old_opts;
  3577 + int enable_quota = 0;
3577 3578 ext4_group_t g;
3578 3579 unsigned int journal_ioprio = DEFAULT_JOURNAL_IOPRIO;
3579 3580 int err;
... ... @@ -3630,6 +3631,12 @@
3630 3631 }
3631 3632  
3632 3633 if (*flags & MS_RDONLY) {
  3634 + err = vfs_dq_off(sb, 1);
  3635 + if (err < 0 && err != -ENOSYS) {
  3636 + err = -EBUSY;
  3637 + goto restore_opts;
  3638 + }
  3639 +
3633 3640 /*
3634 3641 * First of all, the unconditional stuff we have to do
3635 3642 * to disable replay of the journal when we next remount
... ... @@ -3698,6 +3705,7 @@
3698 3705 goto restore_opts;
3699 3706 if (!ext4_setup_super(sb, es, 0))
3700 3707 sb->s_flags &= ~MS_RDONLY;
  3708 + enable_quota = 1;
3701 3709 }
3702 3710 }
3703 3711 ext4_setup_system_zone(sb);
... ... @@ -3713,6 +3721,8 @@
3713 3721 #endif
3714 3722 unlock_super(sb);
3715 3723 unlock_kernel();
  3724 + if (enable_quota)
  3725 + vfs_dq_quota_on_remount(sb);
3716 3726 return 0;
3717 3727  
3718 3728 restore_opts:
... ... @@ -396,10 +396,20 @@
396 396  
397 397 JFS_SBI(sb)->flag = flag;
398 398 ret = jfs_mount_rw(sb, 1);
  399 +
  400 + /* mark the fs r/w for quota activity */
  401 + sb->s_flags &= ~MS_RDONLY;
  402 +
399 403 unlock_kernel();
  404 + vfs_dq_quota_on_remount(sb);
400 405 return ret;
401 406 }
402 407 if ((!(sb->s_flags & MS_RDONLY)) && (*flags & MS_RDONLY)) {
  408 + rc = vfs_dq_off(sb, 1);
  409 + if (rc < 0 && rc != -ENOSYS) {
  410 + unlock_kernel();
  411 + return -EBUSY;
  412 + }
403 413 rc = jfs_umount_rw(sb);
404 414 JFS_SBI(sb)->flag = flag;
405 415 unlock_kernel();
... ... @@ -1242,6 +1242,13 @@
1242 1242 if (s->s_flags & MS_RDONLY)
1243 1243 /* it is read-only already */
1244 1244 goto out_ok;
  1245 +
  1246 + err = vfs_dq_off(s, 1);
  1247 + if (err < 0 && err != -ENOSYS) {
  1248 + err = -EBUSY;
  1249 + goto out_err;
  1250 + }
  1251 +
1245 1252 /* try to remount file system with read-only permissions */
1246 1253 if (sb_umount_state(rs) == REISERFS_VALID_FS
1247 1254 || REISERFS_SB(s)->s_mount_state != REISERFS_VALID_FS) {
... ... @@ -1295,6 +1302,7 @@
1295 1302 s->s_dirt = 0;
1296 1303  
1297 1304 if (!(*mount_flags & MS_RDONLY)) {
  1305 + vfs_dq_quota_on_remount(s);
1298 1306 finish_unfinished(s);
1299 1307 reiserfs_xattr_init(s, *mount_flags);
1300 1308 }
... ... @@ -524,7 +524,7 @@
524 524 int do_remount_sb(struct super_block *sb, int flags, void *data, int force)
525 525 {
526 526 int retval;
527   - int remount_rw, remount_ro;
  527 + int remount_ro;
528 528  
529 529 if (sb->s_frozen != SB_UNFROZEN)
530 530 return -EBUSY;
... ... @@ -540,7 +540,6 @@
540 540 sync_filesystem(sb);
541 541  
542 542 remount_ro = (flags & MS_RDONLY) && !(sb->s_flags & MS_RDONLY);
543   - remount_rw = !(flags & MS_RDONLY) && (sb->s_flags & MS_RDONLY);
544 543  
545 544 /* If we are remounting RDONLY and current sb is read/write,
546 545 make sure there are no rw files opened */
... ... @@ -549,9 +548,6 @@
549 548 mark_files_ro(sb);
550 549 else if (!fs_may_remount_ro(sb))
551 550 return -EBUSY;
552   - retval = vfs_dq_off(sb, 1);
553   - if (retval < 0 && retval != -ENOSYS)
554   - return -EBUSY;
555 551 }
556 552  
557 553 if (sb->s_op->remount_fs) {
... ... @@ -560,8 +556,7 @@
560 556 return retval;
561 557 }
562 558 sb->s_flags = (sb->s_flags & ~MS_RMT_MASK) | (flags & MS_RMT_MASK);
563   - if (remount_rw)
564   - vfs_dq_quota_on_remount(sb);
  559 +
565 560 /*
566 561 * Some filesystems modify their metadata via some other path than the
567 562 * bdev buffer cache (eg. use a private mapping, or directories in
... ... @@ -54,6 +54,7 @@
54 54 #include <linux/vmalloc.h>
55 55 #include <linux/errno.h>
56 56 #include <linux/mount.h>
  57 +#include <linux/quotaops.h>
57 58 #include <linux/seq_file.h>
58 59 #include <linux/bitmap.h>
59 60 #include <linux/crc-itu-t.h>
... ... @@ -557,6 +558,7 @@
557 558 {
558 559 struct udf_options uopt;
559 560 struct udf_sb_info *sbi = UDF_SB(sb);
  561 + int error = 0;
560 562  
561 563 uopt.flags = sbi->s_flags;
562 564 uopt.uid = sbi->s_uid;
563 565  
564 566  
565 567  
... ... @@ -582,17 +584,26 @@
582 584 *flags |= MS_RDONLY;
583 585 }
584 586  
585   - if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) {
586   - unlock_kernel();
587   - return 0;
588   - }
589   - if (*flags & MS_RDONLY)
  587 + if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
  588 + goto out_unlock;
  589 +
  590 + if (*flags & MS_RDONLY) {
590 591 udf_close_lvid(sb);
591   - else
  592 +
  593 + error = vfs_dq_off(sb, 1);
  594 + if (error < 0 && error != -ENOSYS)
  595 + error = -EBUSY;
  596 + } else {
592 597 udf_open_lvid(sb);
593 598  
  599 + /* mark the fs r/w for quota activity */
  600 + sb->s_flags &= ~MS_RDONLY;
  601 + vfs_dq_quota_on_remount(sb);
  602 + }
  603 +
  604 +out_unlock:
594 605 unlock_kernel();
595   - return 0;
  606 + return error;
596 607 }
597 608  
598 609 /* Check Volume Structure Descriptors (ECMA 167 2/9.1) */
... ... @@ -1248,7 +1248,9 @@
1248 1248 struct ufs_super_block_first * usb1;
1249 1249 struct ufs_super_block_third * usb3;
1250 1250 unsigned new_mount_opt, ufstype;
  1251 + int enable_quota = 0;
1251 1252 unsigned flags;
  1253 + int err;
1252 1254  
1253 1255 lock_kernel();
1254 1256 lock_super(sb);
... ... @@ -1289,6 +1291,13 @@
1289 1291 * fs was mouted as rw, remounting ro
1290 1292 */
1291 1293 if (*mount_flags & MS_RDONLY) {
  1294 + err = vfs_dq_off(sb, 1);
  1295 + if (err < 0 && err != -ENOSYS) {
  1296 + unlock_super(sb);
  1297 + unlock_kernel();
  1298 + return -EBUSY;
  1299 + }
  1300 +
1292 1301 ufs_put_super_internal(sb);
1293 1302 usb1->fs_time = cpu_to_fs32(sb, get_seconds());
1294 1303 if ((flags & UFS_ST_MASK) == UFS_ST_SUN
1295 1304  
... ... @@ -1327,11 +1336,14 @@
1327 1336 return -EPERM;
1328 1337 }
1329 1338 sb->s_flags &= ~MS_RDONLY;
  1339 + enable_quota = 1;
1330 1340 #endif
1331 1341 }
1332 1342 UFS_SB(sb)->s_mount_opt = new_mount_opt;
1333 1343 unlock_super(sb);
1334 1344 unlock_kernel();
  1345 + if (enable_quota)
  1346 + vfs_dq_quota_on_remount(sb);
1335 1347 return 0;
1336 1348 }
1337 1349