Commit 0196be12 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for_v5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs 

Pull UDF, quota, reiserfs, ext2 fixes and cleanups from Jan Kara:
 "A few assorted fixes and cleanups for udf, quota, reiserfs, and ext2"

* tag 'for_v5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  fs/reiserfs: remove unused macros
  fs/quota: remove unused macro
  udf: Clarify meaning of f_files in udf_statfs
  udf: Allow writing to 'Rewritable' partitions
  udf: Disallow R/W mode for disk with Metadata partition
  udf: Fix meaning of ENTITYID_FLAGS_* macros to be really bitwise-or flags
  udf: Fix free space reporting for metadata and virtual partitions
  udf: Update header files to UDF 2.60
  udf: Move OSTA Identifier Suffix macros from ecma_167.h to osta_udf.h
  udf: Fix spelling in EXT_NEXT_EXTENT_ALLOCDESCS
  ext2: Adjust indentation in ext2_fill_super
  quota: avoid time_t in v1_disk_dqblk definition
  reiserfs: Fix spurious unlock in reiserfs_fill_super() error handling
  reiserfs: Fix memory leak of journal device string
  ext2: set proper errno in error case of ext2_fill_super()
parents 91f1a956 154a4dcf

fs/ext2/super.c

+4 −3
Original line number Diff line number Diff line
@@ -1138,6 +1138,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) 
				ext2_count_dirs(sb), GFP_KERNEL);

	}

	if (err) {

		ret = err;

		ext2_msg(sb, KERN_ERR, "error: insufficient memory");

		goto failed_mount3;

	}

fs/quota/quota_v2.c

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ MODULE_AUTHOR("Jan Kara"); 
MODULE_DESCRIPTION("Quota format v2 support");

MODULE_LICENSE("GPL");



#define __QUOTA_V2_PARANOIA



static void v2r0_mem2diskdqb(void *dp, struct dquot *dquot);

static void v2r0_disk2memdqb(struct dquot *dquot, void *dp);

static int v2r0_is_id(void *dp, struct dquot *dquot);

fs/quota/quotaio_v1.h

+4 −2
Original line number Diff line number Diff line
@@ -25,8 +25,10 @@ struct v1_disk_dqblk { 
	__u32 dqb_ihardlimit;	/* absolute limit on allocated inodes */

	__u32 dqb_isoftlimit;	/* preferred inode limit */

	__u32 dqb_curinodes;	/* current # allocated inodes */

	time_t dqb_btime;	/* time limit for excessive disk use */

	time_t dqb_itime;	/* time limit for excessive inode use */



	/* below fields differ in length on 32-bit vs 64-bit architectures */

	unsigned long dqb_btime; /* time limit for excessive disk use */

	unsigned long dqb_itime; /* time limit for excessive inode use */

};



#define v1_dqoff(UID)      ((loff_t)((UID) * sizeof (struct v1_disk_dqblk)))

fs/reiserfs/journal.c

+0 −2
Original line number Diff line number Diff line
@@ -56,8 +56,6 @@ 
/* gets a struct reiserfs_journal_list * from a list head */

#define JOURNAL_LIST_ENTRY(h) (list_entry((h), struct reiserfs_journal_list, \

                               j_list))

#define JOURNAL_WORK_ENTRY(h) (list_entry((h), struct reiserfs_journal_list, \

                               j_working_list))



/* must be correct to keep the desc and commit structs at 4k */

#define JOURNAL_TRANS_HALF 1018

fs/reiserfs/procfs.c

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ static int show_version(struct seq_file *m, void *unused) 
#define MAP( i ) D4C( objectid_map( sb, rs )[ i ] )



#define DJF( x ) le32_to_cpu( rs -> x )

#define DJV( x ) le32_to_cpu( s_v1 -> x )

#define DJP( x ) le32_to_cpu( jp -> x )

#define JF( x ) ( r -> s_journal -> x )

CRA Git | Maintained and supported by SUSTech CRA and CCSE