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

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

Pull quota and isofs updates from Jan Kara:
 "A few small cleanups in quota and isofs"

* tag 'fs_for_v6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  isofs: Annotate struct SL_component with __counted_by()
  quota: remove unnecessary error code translation in dquot_quota_enable
  quota: remove redundant return at end of void function
  quota: remove unneeded return value of register_quota_format
  quota: avoid missing put_quota_format when DQUOT_SUSPENDED is passed
parents b3f391fd 116249b1

fs/isofs/rock.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ struct RR_PN_s { 
struct SL_component {

	__u8 flags;

	__u8 len;

	__u8 text[];

	__u8 text[] __counted_by(len);

} __attribute__ ((packed));



struct RR_SL_s {

fs/ocfs2/super.c

+2 −4
Original line number Diff line number Diff line
@@ -1571,15 +1571,13 @@ static int __init ocfs2_init(void) 


	ocfs2_set_locking_protocol();



	status = register_quota_format(&ocfs2_quota_format);

	if (status < 0)

		goto out3;

	register_quota_format(&ocfs2_quota_format);



	status = register_filesystem(&ocfs2_fs_type);

	if (!status)

		return 0;



	unregister_quota_format(&ocfs2_quota_format);

out3:

	debugfs_remove(ocfs2_debugfs_root);

	ocfs2_free_mem_caches();

out2:

fs/quota/dquot.c

+5 −9
Original line number Diff line number Diff line
@@ -163,13 +163,12 @@ static struct quota_module_name module_names[] = INIT_QUOTA_MODULE_NAMES; 
/* SLAB cache for dquot structures */

static struct kmem_cache *dquot_cachep;



int register_quota_format(struct quota_format_type *fmt)

void register_quota_format(struct quota_format_type *fmt)

{

	spin_lock(&dq_list_lock);

	fmt->qf_next = quota_formats;

	quota_formats = fmt;

	spin_unlock(&dq_list_lock);

	return 0;

}

EXPORT_SYMBOL(register_quota_format);
@@ -1831,7 +1830,6 @@ void dquot_claim_space_nodirty(struct inode *inode, qsize_t number) 
	spin_unlock(&inode->i_lock);

	mark_all_dquot_dirty(dquots);

	srcu_read_unlock(&dquot_srcu, index);

	return;

}

EXPORT_SYMBOL(dquot_claim_space_nodirty);
@@ -1873,7 +1871,6 @@ void dquot_reclaim_space_nodirty(struct inode *inode, qsize_t number) 
	spin_unlock(&inode->i_lock);

	mark_all_dquot_dirty(dquots);

	srcu_read_unlock(&dquot_srcu, index);

	return;

}

EXPORT_SYMBOL(dquot_reclaim_space_nodirty);
@@ -2406,7 +2403,7 @@ static int vfs_setup_quota_inode(struct inode *inode, int type) 
int dquot_load_quota_sb(struct super_block *sb, int type, int format_id,

	unsigned int flags)

{

	struct quota_format_type *fmt = find_quota_format(format_id);

	struct quota_format_type *fmt;

	struct quota_info *dqopt = sb_dqopt(sb);

	int error;
@@ -2416,6 +2413,7 @@ int dquot_load_quota_sb(struct super_block *sb, int type, int format_id, 
	if (WARN_ON_ONCE(flags & DQUOT_SUSPENDED))

		return -EINVAL;



	fmt = find_quota_format(format_id);

	if (!fmt)

		return -ESRCH;

	if (!sb->dq_op || !sb->s_qcop ||
@@ -2596,7 +2594,8 @@ static int dquot_quota_enable(struct super_block *sb, unsigned int flags) 
			goto out_err;

		}

		if (sb_has_quota_limits_enabled(sb, type)) {

			ret = -EBUSY;

			/* compatible with XFS */

			ret = -EEXIST;

			goto out_err;

		}

		spin_lock(&dq_state_lock);
@@ -2610,9 +2609,6 @@ static int dquot_quota_enable(struct super_block *sb, unsigned int flags) 
		if (flags & qtype_enforce_flag(type))

			dquot_disable(sb, type, DQUOT_LIMITS_ENABLED);

	}

	/* Error code translation for better compatibility with XFS */

	if (ret == -EBUSY)

		ret = -EEXIST;

	return ret;

}

fs/quota/quota_v1.c

+2 −1
Original line number Diff line number Diff line
@@ -235,7 +235,8 @@ static struct quota_format_type v1_quota_format = { 


static int __init init_v1_quota_format(void)

{

        return register_quota_format(&v1_quota_format);

	register_quota_format(&v1_quota_format);

	return 0;

}



static void __exit exit_v1_quota_format(void)

fs/quota/quota_v2.c

+3 −6
Original line number Diff line number Diff line
@@ -440,12 +440,9 @@ static struct quota_format_type v2r1_quota_format = { 


static int __init init_v2_quota_format(void)

{

	int ret;



	ret = register_quota_format(&v2r0_quota_format);

	if (ret)

		return ret;

	return register_quota_format(&v2r1_quota_format);

	register_quota_format(&v2r0_quota_format);

	register_quota_format(&v2r1_quota_format);

	return 0;

}



static void __exit exit_v2_quota_format(void)