Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 894b8c00 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for_v4.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs 

Pull udf, quota, ext2 fixes from Jan Kara:
 "UDF:
   - fix an oops due to corrupted disk image
   - two small cleanups

  quota:
   - a fixfor lru handling
   - cleanup

  ext2:
   - a warning about a deprecated mount option"

* tag 'for_v4.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  udf: Drop unused arguments of udf_delete_aext()
  udf: Provide function for calculating dir entry length
  udf: Detect incorrect directory size
  ext2: add warning when specifying nocheck option
  quota: Cleanup list iteration in dqcache_shrink_scan()
  quota: reclaim least recently used dquots
parents 1cfea546 6c1e4d06

fs/ext2/ext2.h

+0 −2
Original line number Diff line number Diff line
@@ -748,7 +748,6 @@ extern void ext2_free_blocks (struct inode *, unsigned long, 
			      unsigned long);

extern unsigned long ext2_count_free_blocks (struct super_block *);

extern unsigned long ext2_count_dirs (struct super_block *);

extern void ext2_check_blocks_bitmap (struct super_block *);

extern struct ext2_group_desc * ext2_get_group_desc(struct super_block * sb,

						    unsigned int block_group,

						    struct buffer_head ** bh);
@@ -771,7 +770,6 @@ extern void ext2_set_link(struct inode *, struct ext2_dir_entry_2 *, struct page 
extern struct inode * ext2_new_inode (struct inode *, umode_t, const struct qstr *);

extern void ext2_free_inode (struct inode *);

extern unsigned long ext2_count_free_inodes (struct super_block *);

extern void ext2_check_inodes_bitmap (struct super_block *);

extern unsigned long ext2_count_free (struct buffer_head *, unsigned);



/* inode.c */

fs/ext2/super.c

+3 −3
Original line number Diff line number Diff line
@@ -557,6 +557,9 @@ static int parse_options(char *options, struct super_block *sb, 
			set_opt (opts->s_mount_opt, NO_UID32);

			break;

		case Opt_nocheck:

			ext2_msg(sb, KERN_WARNING,

				"Option nocheck/check=none is deprecated and"

				" will be removed in June 2020.");

			clear_opt (opts->s_mount_opt, CHECK);

			break;

		case Opt_debug:
@@ -1335,9 +1338,6 @@ static int ext2_remount (struct super_block * sb, int * flags, char * data) 
	new_opts.s_resgid = sbi->s_resgid;

	spin_unlock(&sbi->s_lock);



	/*

	 * Allow the "check" option to be passed as a remount option.

	 */

	if (!parse_options(data, sb, &new_opts))

		return -EINVAL;

fs/quota/dquot.c

+2 −5
Original line number Diff line number Diff line
@@ -711,21 +711,18 @@ EXPORT_SYMBOL(dquot_quota_sync); 
static unsigned long

dqcache_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)

{

	struct list_head *head;

	struct dquot *dquot;

	unsigned long freed = 0;



	spin_lock(&dq_list_lock);

	head = free_dquots.prev;

	while (head != &free_dquots && sc->nr_to_scan) {

		dquot = list_entry(head, struct dquot, dq_free);

	while (!list_empty(&free_dquots) && sc->nr_to_scan) {

		dquot = list_first_entry(&free_dquots, struct dquot, dq_free);

		remove_dquot_hash(dquot);

		remove_free_dquot(dquot);

		remove_inuse(dquot);

		do_destroy_dquot(dquot);

		sc->nr_to_scan--;

		freed++;

		head = free_dquots.prev;

	}

	spin_unlock(&dq_list_lock);

	return freed;

fs/udf/balloc.c

+2 −3
Original line number Diff line number Diff line
@@ -533,8 +533,7 @@ static int udf_table_prealloc_blocks(struct super_block *sb, 
			udf_write_aext(table, &epos, &eloc,

					(etype << 30) | elen, 1);

		} else

			udf_delete_aext(table, epos, eloc,

					(etype << 30) | elen);

			udf_delete_aext(table, epos);

	} else {

		alloc_count = 0;

	}
@@ -630,7 +629,7 @@ static udf_pblk_t udf_table_new_block(struct super_block *sb, 
	if (goal_elen)

		udf_write_aext(table, &goal_epos, &goal_eloc, goal_elen, 1);

	else

		udf_delete_aext(table, goal_epos, goal_eloc, goal_elen);

		udf_delete_aext(table, goal_epos);

	brelse(goal_epos.bh);



	udf_add_free_space(sb, partition, -1);

fs/udf/directory.c

+4 −4
Original line number Diff line number Diff line
@@ -141,10 +141,7 @@ struct fileIdentDesc *udf_fileident_read(struct inode *dir, loff_t *nf_pos, 
			       fibh->ebh->b_data,

			       sizeof(struct fileIdentDesc) + fibh->soffset);



			fi_len = (sizeof(struct fileIdentDesc) +

				  cfi->lengthFileIdent +

				  le16_to_cpu(cfi->lengthOfImpUse) + 3) & ~3;



			fi_len = udf_dir_entry_len(cfi);

			*nf_pos += fi_len - (fibh->eoffset - fibh->soffset);

			fibh->eoffset = fibh->soffset + fi_len;

		} else {
@@ -152,6 +149,9 @@ struct fileIdentDesc *udf_fileident_read(struct inode *dir, loff_t *nf_pos, 
			       sizeof(struct fileIdentDesc));

		}

	}

	/* Got last entry outside of dir size - fs is corrupted! */

	if (*nf_pos > dir->i_size)

		return NULL;

	return fi;

}