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

Commit 1d3671df 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 

Pull UDF fixes and quota cleanups from Jan Kara:
 "Several UDF fixes and some minor quota cleanups"

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  udf: Check output buffer length when converting name to CS0
  udf: Prevent buffer overrun with multi-byte characters
  quota: constify qtree_fmt_operations structures
  udf: avoid uninitialized variable use
  udf: Fix lost indirect extent block
  udf: Factor out code for creating indirect extent
  udf: limit the maximum number of indirect extents in a row
  udf: limit the maximum number of TD redirections
  fs: make quota/dquot.c explicitly non-modular
  fs: make quota/netlink.c explicitly non-modular
parents 875fc4f5 bb00c898

fs/ocfs2/quota.h

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ struct ocfs2_quota_chunk { 
extern struct kmem_cache *ocfs2_dquot_cachep;

extern struct kmem_cache *ocfs2_qf_chunk_cachep;



extern struct qtree_fmt_operations ocfs2_global_ops;

extern const struct qtree_fmt_operations ocfs2_global_ops;



struct ocfs2_quota_recovery *ocfs2_begin_quota_recovery(

				struct ocfs2_super *osb, int slot_num);

fs/ocfs2/quota_global.c

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static int ocfs2_global_is_id(void *dp, struct dquot *dquot) 
		      dquot->dq_id);

}



struct qtree_fmt_operations ocfs2_global_ops = {

const struct qtree_fmt_operations ocfs2_global_ops = {

	.mem2disk_dqblk = ocfs2_global_mem2diskdqb,

	.disk2mem_dqblk = ocfs2_global_disk2memdqb,

	.is_id = ocfs2_global_is_id,

fs/quota/dquot.c

+1 −1
Original line number Diff line number Diff line
@@ -2924,4 +2924,4 @@ static int __init dquot_init(void) 


	return 0;

}

module_init(dquot_init);
 
fs_initcall(dquot_init);

fs/quota/netlink.c

+1 −4
Original line number Diff line number Diff line 


#include <linux/cred.h>

#include <linux/init.h>

#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/quotaops.h>

#include <linux/sched.h>
@@ -105,5 +103,4 @@ static int __init quota_init(void) 
		       "VFS: Failed to create quota netlink interface.\n");

	return 0;

};



module_init(quota_init);
 
fs_initcall(quota_init);

fs/quota/quota_v2.c

+2 −2
Original line number Diff line number Diff line
@@ -30,13 +30,13 @@ static void v2r1_mem2diskdqb(void *dp, struct dquot *dquot); 
static void v2r1_disk2memdqb(struct dquot *dquot, void *dp);

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



static struct qtree_fmt_operations v2r0_qtree_ops = {

static const struct qtree_fmt_operations v2r0_qtree_ops = {

	.mem2disk_dqblk = v2r0_mem2diskdqb,

	.disk2mem_dqblk = v2r0_disk2memdqb,

	.is_id = v2r0_is_id,

};



static struct qtree_fmt_operations v2r1_qtree_ops = {

static const struct qtree_fmt_operations v2r1_qtree_ops = {

	.mem2disk_dqblk = v2r1_mem2diskdqb,

	.disk2mem_dqblk = v2r1_disk2memdqb,

	.is_id = v2r1_is_id,