Merge tag 'for_v5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 21 Sep 2019 20:53:34 +0000 (13:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 21 Sep 2019 20:53:34 +0000 (13:53 -0700)
Pull ext2, quota, udf fixes and cleanups from Jan Kara:

 - two small quota fixes (in grace time handling and possible missed
   accounting of preallocated blocks beyond EOF).

 - some ext2 cleanups

 - udf fixes for better compatibility with Windows 10 generated media
   (named streams, write-protection using domain-identifier, placement
   of volume recognition sequence)

 - some udf cleanups

* tag 'for_v5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  quota: fix wrong condition in is_quota_modification()
  fs-udf: Delete an unnecessary check before brelse()
  ext2: Delete an unnecessary check before brelse()
  udf: Drop forward function declarations
  udf: Verify domain identifier fields
  udf: augment UDF permissions on new inodes
  udf: Use dynamic debug infrastructure
  udf: reduce leakage of blocks related to named streams
  udf: prevent allocation beyond UDF partition
  quota: fix condition for resetting time limit in do_set_dqblk()
  ext2: code cleanup for ext2_free_blocks()
  ext2: fix block range in ext2_data_block_valid()
  udf: support 2048-byte spacing of VRS descriptors on 4K media
  udf: refactor VRS descriptor identification

1  2 
fs/ext2/super.c

diff --combined fs/ext2/super.c
@@@ -162,8 -162,7 +162,7 @@@ static void ext2_put_super (struct supe
        }
        db_count = sbi->s_gdb_count;
        for (i = 0; i < db_count; i++)
-               if (sbi->s_group_desc[i])
-                       brelse (sbi->s_group_desc[i]);
+               brelse(sbi->s_group_desc[i]);
        kfree(sbi->s_group_desc);
        kfree(sbi->s_debts);
        percpu_counter_destroy(&sbi->s_freeblocks_counter);
@@@ -1002,8 -1001,6 +1001,8 @@@ static int ext2_fill_super(struct super
  
        sb->s_maxbytes = ext2_max_size(sb->s_blocksize_bits);
        sb->s_max_links = EXT2_LINK_MAX;
 +      sb->s_time_min = S32_MIN;
 +      sb->s_time_max = S32_MAX;
  
        if (le32_to_cpu(es->s_rev_level) == EXT2_GOOD_OLD_REV) {
                sbi->s_inode_size = EXT2_GOOD_OLD_INODE_SIZE;