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

Commit 34116645 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs 

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  udf: Cleanup metadata flags handling
  udf: Skip mirror metadata FE loading when metadata FE is ok
  ext3: Allow quota file use root reservation
  udf: Remove web reference from UDF MAINTAINERS entry
  quota: Drop path reference on error exit from quotactl
  udf: Neaten udf_debug uses
  udf: Neaten logging output, use vsprintf extension %pV
  udf: Convert printks to pr_<level>
  udf: Rename udf_warning to udf_warn
  udf: Rename udf_error to udf_err
  udf: Promote some debugging messages to udf_error
  ext3: Remove the obsolete broken EXT3_IOC32_WAIT_FOR_READONLY.
  udf: Add readpages support for udf.
  ext3/balloc.c: local functions should be static
  ext2: fix the outdated comment in ext2_nfs_get_inode()
  ext3: remove deprecated oldalloc
  fs/ext3/balloc.c: delete useless initialization
  fs/ext2/balloc.c: delete useless initialization
  ext3: fix message in ext3_remount for rw-remount case
  ext3: Remove i_mutex from ext3_sync_file()

Fix up trivial (printf format cleanup) conflicts in fs/udf/udfdecl.h
parents de0a5345 ed47a7d0

Documentation/filesystems/ext3.txt

+0 −8
Original line number Diff line number Diff line
@@ -73,14 +73,6 @@ nobarrier (*) This also requires an IO stack which can support 
			also be used to enable or disable barriers, for

			consistency with other ext3 mount options.



orlov		(*)	This enables the new Orlov block allocator. It is

			enabled by default.



oldalloc		This disables the Orlov block allocator and enables

			the old block allocator.  Orlov should have better

			performance - we'd like to get some feedback if it's

			the contrary for you.



user_xattr		Enables Extended User Attributes.  Additionally, you

			need to have extended attribute support enabled in the

			kernel configuration (CONFIG_EXT3_FS_XATTR).  See the

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -6683,7 +6683,6 @@ F: drivers/net/ethernet/8390/ne-h8300.c 


UDF FILESYSTEM

M:	Jan Kara <jack@suse.cz>

W:	http://linux-udf.sourceforge.net

S:	Maintained

F:	Documentation/filesystems/udf.txt

F:	fs/udf/

fs/ext2/balloc.c

+1 −1
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ static inline int rsv_is_empty(struct ext2_reserve_window *rsv) 
void ext2_init_block_alloc_info(struct inode *inode)

{

	struct ext2_inode_info *ei = EXT2_I(inode);

	struct ext2_block_alloc_info *block_i = ei->i_block_alloc_info;

	struct ext2_block_alloc_info *block_i;

	struct super_block *sb = inode->i_sb;



	block_i = kmalloc(sizeof(*block_i), GFP_NOFS);

fs/ext2/super.c

+4 −4
Original line number Diff line number Diff line
@@ -327,10 +327,10 @@ static struct inode *ext2_nfs_get_inode(struct super_block *sb, 
	if (ino > le32_to_cpu(EXT2_SB(sb)->s_es->s_inodes_count))

		return ERR_PTR(-ESTALE);



	/* iget isn't really right if the inode is currently unallocated!!

	 * ext2_read_inode currently does appropriate checks, but

	 * it might be "neater" to call ext2_get_inode first and check

	 * if the inode is valid.....

	/*

	 * ext2_iget isn't quite right if the inode is currently unallocated!

	 * However ext2_iget currently does appropriate checks to handle stale

	 * inodes so everything is OK.

	 */

	inode = ext2_iget(sb, ino);

	if (IS_ERR(inode))

fs/ext3/balloc.c

+9 −8
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ static inline int rsv_is_empty(struct ext3_reserve_window *rsv) 
void ext3_init_block_alloc_info(struct inode *inode)

{

	struct ext3_inode_info *ei = EXT3_I(inode);

	struct ext3_block_alloc_info *block_i = ei->i_block_alloc_info;

	struct ext3_block_alloc_info *block_i;

	struct super_block *sb = inode->i_sb;



	block_i = kmalloc(sizeof(*block_i), GFP_NOFS);
@@ -1440,14 +1440,14 @@ out: 
 *

 * Check if filesystem has at least 1 free block available for allocation.

 */

static int ext3_has_free_blocks(struct ext3_sb_info *sbi)

static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)

{

	ext3_fsblk_t free_blocks, root_blocks;



	free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);

	root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);

	if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&

		sbi->s_resuid != current_fsuid() &&

		!use_reservation && sbi->s_resuid != current_fsuid() &&

		(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {

		return 0;

	}
@@ -1468,7 +1468,7 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi) 
 */

int ext3_should_retry_alloc(struct super_block *sb, int *retries)

{

	if (!ext3_has_free_blocks(EXT3_SB(sb)) || (*retries)++ > 3)

	if (!ext3_has_free_blocks(EXT3_SB(sb), 0) || (*retries)++ > 3)

		return 0;



	jbd_debug(1, "%s: retrying operation after ENOSPC\n", sb->s_id);
@@ -1546,7 +1546,7 @@ ext3_fsblk_t ext3_new_blocks(handle_t *handle, struct inode *inode, 
	if (block_i && ((windowsz = block_i->rsv_window_node.rsv_goal_size) > 0))

		my_rsv = &block_i->rsv_window_node;



	if (!ext3_has_free_blocks(sbi)) {

	if (!ext3_has_free_blocks(sbi, IS_NOQUOTA(inode))) {

		*errp = -ENOSPC;

		goto out;

	}
@@ -1924,7 +1924,8 @@ unsigned long ext3_bg_num_gdb(struct super_block *sb, int group) 
 * reaches any used block. Then issue a TRIM command on this extent and free

 * the extent in the block bitmap. This is done until whole group is scanned.

 */

ext3_grpblk_t ext3_trim_all_free(struct super_block *sb, unsigned int group,

static ext3_grpblk_t ext3_trim_all_free(struct super_block *sb,

					unsigned int group,

					ext3_grpblk_t start, ext3_grpblk_t max,

					ext3_grpblk_t minblocks)

{