Commit 1366f5d3 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 quota updates from Jan Kara:
 "Quota improvements and some minor cleanups.

  The main portion in the pull request are changes which move i_dquot
  array from struct inode into fs-private part of an inode which saves
  memory for filesystems which don't use VFS quotas"

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  udf: One function call less in udf_fill_super() after error detection
  udf: Deletion of unnecessary checks before the function call "iput"
  jbd: Deletion of an unnecessary check before the function call "iput"
  vfs: Remove i_dquot field from inode
  jfs: Convert to private i_dquot field
  reiserfs: Convert to private i_dquot field
  ocfs2: Convert to private i_dquot field
  ext4: Convert to private i_dquot field
  ext3: Convert to private i_dquot field
  ext2: Convert to private i_dquot field
  quota: Use function to provide i_dquot pointers
  xfs: Set allowed quota types
  gfs2: Set allowed quota types
  quota: Allow each filesystem to specify which quota types it supports
  quota: Remove const from function declarations
  quota: Add log level to printk
parents 4b0a268e fdf2657b

fs/ext2/ext2.h

+3 −0
Original line number Diff line number Diff line
@@ -689,6 +689,9 @@ struct ext2_inode_info { 
	struct mutex truncate_mutex;

	struct inode	vfs_inode;

	struct list_head i_orphan;	/* unlinked but open inodes */

#ifdef CONFIG_QUOTA

	struct dquot *i_dquot[MAXQUOTAS];

#endif

};



/*

fs/ext2/super.c

+10 −0
Original line number Diff line number Diff line
@@ -166,6 +166,10 @@ static struct inode *ext2_alloc_inode(struct super_block *sb) 
		return NULL;

	ei->i_block_alloc_info = NULL;

	ei->vfs_inode.i_version = 1;

#ifdef CONFIG_QUOTA

	memset(&ei->i_dquot, 0, sizeof(ei->i_dquot));

#endif



	return &ei->vfs_inode;

}
@@ -303,6 +307,10 @@ static int ext2_show_options(struct seq_file *seq, struct dentry *root) 
#ifdef CONFIG_QUOTA

static ssize_t ext2_quota_read(struct super_block *sb, int type, char *data, size_t len, loff_t off);

static ssize_t ext2_quota_write(struct super_block *sb, int type, const char *data, size_t len, loff_t off);

static struct dquot **ext2_get_dquots(struct inode *inode)

{

	return EXT2_I(inode)->i_dquot;

}

#endif



static const struct super_operations ext2_sops = {
@@ -320,6 +328,7 @@ static const struct super_operations ext2_sops = { 
#ifdef CONFIG_QUOTA

	.quota_read	= ext2_quota_read,

	.quota_write	= ext2_quota_write,

	.get_dquots	= ext2_get_dquots,

#endif

};
@@ -1090,6 +1099,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) 
#ifdef CONFIG_QUOTA

	sb->dq_op = &dquot_operations;

	sb->s_qcop = &dquot_quotactl_ops;

	sb->s_quota_types = QTYPE_MASK_USR | QTYPE_MASK_GRP;

#endif



	root = ext2_iget(sb, EXT2_ROOT_INO);

fs/ext3/ext3.h

+4 −0
Original line number Diff line number Diff line
@@ -615,6 +615,10 @@ struct ext3_inode_info { 
	atomic_t i_sync_tid;

	atomic_t i_datasync_tid;



#ifdef CONFIG_QUOTA

	struct dquot *i_dquot[MAXQUOTAS];

#endif



	struct inode vfs_inode;

};

fs/ext3/super.c

+10 −0
Original line number Diff line number Diff line
@@ -485,6 +485,10 @@ static struct inode *ext3_alloc_inode(struct super_block *sb) 
	ei->vfs_inode.i_version = 1;

	atomic_set(&ei->i_datasync_tid, 0);

	atomic_set(&ei->i_sync_tid, 0);

#ifdef CONFIG_QUOTA

	memset(&ei->i_dquot, 0, sizeof(ei->i_dquot));

#endif



	return &ei->vfs_inode;

}
@@ -764,6 +768,10 @@ static ssize_t ext3_quota_read(struct super_block *sb, int type, char *data, 
			       size_t len, loff_t off);

static ssize_t ext3_quota_write(struct super_block *sb, int type,

				const char *data, size_t len, loff_t off);

static struct dquot **ext3_get_dquots(struct inode *inode)

{

	return EXT3_I(inode)->i_dquot;

}



static const struct dquot_operations ext3_quota_operations = {

	.write_dquot	= ext3_write_dquot,
@@ -803,6 +811,7 @@ static const struct super_operations ext3_sops = { 
#ifdef CONFIG_QUOTA

	.quota_read	= ext3_quota_read,

	.quota_write	= ext3_quota_write,

	.get_dquots	= ext3_get_dquots,

#endif

	.bdev_try_to_free_page = bdev_try_to_free_page,

};
@@ -2001,6 +2010,7 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent) 
#ifdef CONFIG_QUOTA

	sb->s_qcop = &ext3_qctl_operations;

	sb->dq_op = &ext3_quota_operations;

	sb->s_quota_types = QTYPE_MASK_USR | QTYPE_MASK_GRP;

#endif

	memcpy(sb->s_uuid, es->s_uuid, sizeof(es->s_uuid));

	INIT_LIST_HEAD(&sbi->s_orphan); /* unlinked but open files */

fs/ext4/ext4.h

+4 −0
Original line number Diff line number Diff line
@@ -941,6 +941,10 @@ struct ext4_inode_info { 
	tid_t i_sync_tid;

	tid_t i_datasync_tid;



#ifdef CONFIG_QUOTA

	struct dquot *i_dquot[MAXQUOTAS];

#endif



	/* Precomputed uuid+inum+igen checksum for seeding inode checksums */

	__u32 i_csum_seed;

};