vfs: Remove i_dquot field from inode
All filesystems using VFS quotas are now converted to use their private i_dquot fields. Remove the i_dquot field from generic inode structure. Acked-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jan Kara <jack@suse.cz>wifi-calibration
parent
507e1fa697
commit
75cbe701a4
|
@ -143,9 +143,6 @@ int inode_init_always(struct super_block *sb, struct inode *inode)
|
||||||
inode->i_blocks = 0;
|
inode->i_blocks = 0;
|
||||||
inode->i_bytes = 0;
|
inode->i_bytes = 0;
|
||||||
inode->i_generation = 0;
|
inode->i_generation = 0;
|
||||||
#ifdef CONFIG_QUOTA
|
|
||||||
memset(&inode->i_dquot, 0, sizeof(inode->i_dquot));
|
|
||||||
#endif
|
|
||||||
inode->i_pipe = NULL;
|
inode->i_pipe = NULL;
|
||||||
inode->i_bdev = NULL;
|
inode->i_bdev = NULL;
|
||||||
inode->i_cdev = NULL;
|
inode->i_cdev = NULL;
|
||||||
|
|
|
@ -895,9 +895,6 @@ EXPORT_SYMBOL(dqget);
|
||||||
|
|
||||||
static inline struct dquot **i_dquot(struct inode *inode)
|
static inline struct dquot **i_dquot(struct inode *inode)
|
||||||
{
|
{
|
||||||
/* Temporary workaround until all filesystems are converted. */
|
|
||||||
if (!inode->i_sb->s_op->get_dquots)
|
|
||||||
return inode->i_dquot;
|
|
||||||
return inode->i_sb->s_op->get_dquots(inode);
|
return inode->i_sb->s_op->get_dquots(inode);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -218,12 +218,6 @@ static struct super_block *alloc_super(struct file_system_type *type, int flags)
|
||||||
atomic_set(&s->s_active, 1);
|
atomic_set(&s->s_active, 1);
|
||||||
mutex_init(&s->s_vfs_rename_mutex);
|
mutex_init(&s->s_vfs_rename_mutex);
|
||||||
lockdep_set_class(&s->s_vfs_rename_mutex, &type->s_vfs_rename_key);
|
lockdep_set_class(&s->s_vfs_rename_mutex, &type->s_vfs_rename_key);
|
||||||
/*
|
|
||||||
* For now MAXQUOTAS check in do_quotactl() will limit quota type
|
|
||||||
* appropriately. When each fs sets allowed_types, we can remove the
|
|
||||||
* line below
|
|
||||||
*/
|
|
||||||
s->s_quota_types = QTYPE_MASK_USR | QTYPE_MASK_GRP | QTYPE_MASK_PRJ;
|
|
||||||
mutex_init(&s->s_dquot.dqio_mutex);
|
mutex_init(&s->s_dquot.dqio_mutex);
|
||||||
mutex_init(&s->s_dquot.dqonoff_mutex);
|
mutex_init(&s->s_dquot.dqonoff_mutex);
|
||||||
s->s_maxbytes = MAX_NON_LFS;
|
s->s_maxbytes = MAX_NON_LFS;
|
||||||
|
|
|
@ -606,9 +606,6 @@ struct inode {
|
||||||
const struct file_operations *i_fop; /* former ->i_op->default_file_ops */
|
const struct file_operations *i_fop; /* former ->i_op->default_file_ops */
|
||||||
struct file_lock *i_flock;
|
struct file_lock *i_flock;
|
||||||
struct address_space i_data;
|
struct address_space i_data;
|
||||||
#ifdef CONFIG_QUOTA
|
|
||||||
struct dquot *i_dquot[MAXQUOTAS];
|
|
||||||
#endif
|
|
||||||
struct list_head i_devices;
|
struct list_head i_devices;
|
||||||
union {
|
union {
|
||||||
struct pipe_inode_info *i_pipe;
|
struct pipe_inode_info *i_pipe;
|
||||||
|
|
Loading…
Reference in New Issue