korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-28 22:54:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds 2014-12-10 15:43:30 -08:00
commit 1366f5d312
22 changed files with 138 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/ext2/ext2.h
View File

@ -689,6 +689,9 @@ struct ext2_inode_info {
struct mutex truncate_mutex; struct mutex truncate_mutex;
struct inode vfs_inode; struct inode vfs_inode;
struct list_head i_orphan; /* unlinked but open inodes */ struct list_head i_orphan; /* unlinked but open inodes */
#ifdef CONFIG_QUOTA
struct dquot *i_dquot[MAXQUOTAS];
#endif
}; };
/* /*

10
fs/ext2/super.c
View File

@ -166,6 +166,10 @@ static struct inode *ext2_alloc_inode(struct super_block *sb)
return NULL; return NULL;
ei->i_block_alloc_info = NULL; ei->i_block_alloc_info = NULL;
ei->vfs_inode.i_version = 1; ei->vfs_inode.i_version = 1;
#ifdef CONFIG_QUOTA
memset(&ei->i_dquot, 0, sizeof(ei->i_dquot));
#endif
return &ei->vfs_inode; return &ei->vfs_inode;
} }
@ -303,6 +307,10 @@ static int ext2_show_options(struct seq_file *seq, struct dentry *root)
#ifdef CONFIG_QUOTA #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_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 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 #endif
static const struct super_operations ext2_sops = { static const struct super_operations ext2_sops = {
@ -320,6 +328,7 @@ static const struct super_operations ext2_sops = {
#ifdef CONFIG_QUOTA #ifdef CONFIG_QUOTA
.quota_read = ext2_quota_read, .quota_read = ext2_quota_read,
.quota_write = ext2_quota_write, .quota_write = ext2_quota_write,
.get_dquots = ext2_get_dquots,
#endif #endif
}; };
@ -1090,6 +1099,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
#ifdef CONFIG_QUOTA #ifdef CONFIG_QUOTA
sb->dq_op = &dquot_operations; sb->dq_op = &dquot_operations;
sb->s_qcop = &dquot_quotactl_ops; sb->s_qcop = &dquot_quotactl_ops;
sb->s_quota_types = QTYPE_MASK_USR | QTYPE_MASK_GRP;
#endif #endif
root = ext2_iget(sb, EXT2_ROOT_INO); root = ext2_iget(sb, EXT2_ROOT_INO);

4
fs/ext3/ext3.h
View File

@ -615,6 +615,10 @@ struct ext3_inode_info {
atomic_t i_sync_tid; atomic_t i_sync_tid;
atomic_t i_datasync_tid; atomic_t i_datasync_tid;
#ifdef CONFIG_QUOTA
struct dquot *i_dquot[MAXQUOTAS];
#endif
struct inode vfs_inode; struct inode vfs_inode;
}; };

10
fs/ext3/super.c
View File

@ -485,6 +485,10 @@ static struct inode *ext3_alloc_inode(struct super_block *sb)
ei->vfs_inode.i_version = 1; ei->vfs_inode.i_version = 1;
atomic_set(&ei->i_datasync_tid, 0); atomic_set(&ei->i_datasync_tid, 0);
atomic_set(&ei->i_sync_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; 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); size_t len, loff_t off);
static ssize_t ext3_quota_write(struct super_block *sb, int type, static ssize_t ext3_quota_write(struct super_block *sb, int type,
const char *data, size_t len, loff_t off); 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 = { static const struct dquot_operations ext3_quota_operations = {
.write_dquot = ext3_write_dquot, .write_dquot = ext3_write_dquot,
@ -803,6 +811,7 @@ static const struct super_operations ext3_sops = {
#ifdef CONFIG_QUOTA #ifdef CONFIG_QUOTA
.quota_read = ext3_quota_read, .quota_read = ext3_quota_read,
.quota_write = ext3_quota_write, .quota_write = ext3_quota_write,
.get_dquots = ext3_get_dquots,
#endif #endif
.bdev_try_to_free_page = bdev_try_to_free_page, .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 #ifdef CONFIG_QUOTA
sb->s_qcop = &ext3_qctl_operations; sb->s_qcop = &ext3_qctl_operations;
sb->dq_op = &ext3_quota_operations; sb->dq_op = &ext3_quota_operations;
sb->s_quota_types = QTYPE_MASK_USR | QTYPE_MASK_GRP;
#endif #endif
memcpy(sb->s_uuid, es->s_uuid, sizeof(es->s_uuid)); memcpy(sb->s_uuid, es->s_uuid, sizeof(es->s_uuid));
INIT_LIST_HEAD(&sbi->s_orphan); /* unlinked but open files */ INIT_LIST_HEAD(&sbi->s_orphan); /* unlinked but open files */

4
fs/ext4/ext4.h
View File

@ -941,6 +941,10 @@ struct ext4_inode_info {
tid_t i_sync_tid; tid_t i_sync_tid;
tid_t i_datasync_tid; tid_t i_datasync_tid;
#ifdef CONFIG_QUOTA
struct dquot *i_dquot[MAXQUOTAS];
#endif
/* Precomputed uuid+inum+igen checksum for seeding inode checksums */ /* Precomputed uuid+inum+igen checksum for seeding inode checksums */
__u32 i_csum_seed; __u32 i_csum_seed;
}; };

8
fs/ext4/super.c
View File

@ -892,6 +892,7 @@ static struct inode *ext4_alloc_inode(struct super_block *sb)
spin_lock_init(&(ei->i_block_reservation_lock)); spin_lock_init(&(ei->i_block_reservation_lock));
#ifdef CONFIG_QUOTA #ifdef CONFIG_QUOTA
ei->i_reserved_quota = 0; ei->i_reserved_quota = 0;
memset(&ei->i_dquot, 0, sizeof(ei->i_dquot));
#endif #endif
ei->jinode = NULL; ei->jinode = NULL;
INIT_LIST_HEAD(&ei->i_rsv_conversion_list); INIT_LIST_HEAD(&ei->i_rsv_conversion_list);
@ -1068,6 +1069,11 @@ static int ext4_quota_enable(struct super_block *sb, int type, int format_id,
unsigned int flags); unsigned int flags);
static int ext4_enable_quotas(struct super_block *sb); static int ext4_enable_quotas(struct super_block *sb);
static struct dquot **ext4_get_dquots(struct inode *inode)
{
return EXT4_I(inode)->i_dquot;
}
static const struct dquot_operations ext4_quota_operations = { static const struct dquot_operations ext4_quota_operations = {
.get_reserved_space = ext4_get_reserved_space, .get_reserved_space = ext4_get_reserved_space,
.write_dquot = ext4_write_dquot, .write_dquot = ext4_write_dquot,
@ -1117,6 +1123,7 @@ static const struct super_operations ext4_sops = {
#ifdef CONFIG_QUOTA #ifdef CONFIG_QUOTA
.quota_read = ext4_quota_read, .quota_read = ext4_quota_read,
.quota_write = ext4_quota_write, .quota_write = ext4_quota_write,
.get_dquots = ext4_get_dquots,
#endif #endif
.bdev_try_to_free_page = bdev_try_to_free_page, .bdev_try_to_free_page = bdev_try_to_free_page,
}; };
@ -3932,6 +3939,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
sb->s_qcop = &ext4_qctl_sysfile_operations; sb->s_qcop = &ext4_qctl_sysfile_operations;
else else
sb->s_qcop = &ext4_qctl_operations; sb->s_qcop = &ext4_qctl_operations;
sb->s_quota_types = QTYPE_MASK_USR | QTYPE_MASK_GRP;
#endif #endif
memcpy(sb->s_uuid, es->s_uuid, sizeof(es->s_uuid)); memcpy(sb->s_uuid, es->s_uuid, sizeof(es->s_uuid));

1
fs/gfs2/ops_fstype.c
View File

@ -1074,6 +1074,7 @@ static int fill_super(struct super_block *sb, struct gfs2_args *args, int silent
sb->s_export_op = &gfs2_export_ops; sb->s_export_op = &gfs2_export_ops;
sb->s_xattr = gfs2_xattr_handlers; sb->s_xattr = gfs2_xattr_handlers;
sb->s_qcop = &gfs2_quotactl_ops; sb->s_qcop = &gfs2_quotactl_ops;
sb->s_quota_types = QTYPE_MASK_USR | QTYPE_MASK_GRP;
sb_dqopt(sb)->flags |= DQUOT_QUOTA_SYS_FILE; sb_dqopt(sb)->flags |= DQUOT_QUOTA_SYS_FILE;
sb->s_time_gran = 1; sb->s_time_gran = 1;
sb->s_maxbytes = MAX_LFS_FILESIZE; sb->s_maxbytes = MAX_LFS_FILESIZE;

3
fs/inode.c
View File

@ -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;

3
fs/jbd/journal.c
View File

@ -1373,8 +1373,7 @@ int journal_destroy(journal_t *journal)
} }
mutex_unlock(&journal->j_checkpoint_mutex); mutex_unlock(&journal->j_checkpoint_mutex);
if (journal->j_inode) iput(journal->j_inode);
iput(journal->j_inode);
if (journal->j_revoke) if (journal->j_revoke)
journal_destroy_revoke(journal); journal_destroy_revoke(journal);
kfree(journal->j_wbuf); kfree(journal->j_wbuf);

3
fs/jfs/jfs_incore.h
View File

@ -94,6 +94,9 @@ struct jfs_inode_info {
unchar _inline_ea[128]; /* 128: inline extended attr */ unchar _inline_ea[128]; /* 128: inline extended attr */
} link; } link;
} u; } u;
#ifdef CONFIG_QUOTA
struct dquot *i_dquot[MAXQUOTAS];
#endif
u32 dev; /* will die when we get wide dev_t */ u32 dev; /* will die when we get wide dev_t */
struct inode vfs_inode; struct inode vfs_inode;
}; };

9
fs/jfs/super.c
View File

@ -117,6 +117,9 @@ static struct inode *jfs_alloc_inode(struct super_block *sb)
jfs_inode = kmem_cache_alloc(jfs_inode_cachep, GFP_NOFS); jfs_inode = kmem_cache_alloc(jfs_inode_cachep, GFP_NOFS);
if (!jfs_inode) if (!jfs_inode)
return NULL; return NULL;
#ifdef CONFIG_QUOTA
memset(&jfs_inode->i_dquot, 0, sizeof(jfs_inode->i_dquot));
#endif
return &jfs_inode->vfs_inode; return &jfs_inode->vfs_inode;
} }
@ -537,6 +540,7 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent)
#ifdef CONFIG_QUOTA #ifdef CONFIG_QUOTA
sb->dq_op = &dquot_operations; sb->dq_op = &dquot_operations;
sb->s_qcop = &dquot_quotactl_ops; sb->s_qcop = &dquot_quotactl_ops;
sb->s_quota_types = QTYPE_MASK_USR | QTYPE_MASK_GRP;
#endif #endif
/* /*
@ -836,6 +840,10 @@ out:
return len - towrite; return len - towrite;
} }
static struct dquot **jfs_get_dquots(struct inode *inode)
{
return JFS_IP(inode)->i_dquot;
}
#endif #endif
static const struct super_operations jfs_super_operations = { static const struct super_operations jfs_super_operations = {
@ -854,6 +862,7 @@ static const struct super_operations jfs_super_operations = {
#ifdef CONFIG_QUOTA #ifdef CONFIG_QUOTA
.quota_read = jfs_quota_read, .quota_read = jfs_quota_read,
.quota_write = jfs_quota_write, .quota_write = jfs_quota_write,
.get_dquots = jfs_get_dquots,
#endif #endif
}; };

2
fs/ocfs2/inode.h
View File

@ -80,6 +80,8 @@ struct ocfs2_inode_info
*/ */
tid_t i_sync_tid; tid_t i_sync_tid;
tid_t i_datasync_tid; tid_t i_datasync_tid;
struct dquot *i_dquot[MAXQUOTAS];
}; };
/* /*

8
fs/ocfs2/super.c
View File

@ -143,6 +143,11 @@ static int ocfs2_susp_quotas(struct ocfs2_super *osb, int unsuspend);
static int ocfs2_enable_quotas(struct ocfs2_super *osb); static int ocfs2_enable_quotas(struct ocfs2_super *osb);
static void ocfs2_disable_quotas(struct ocfs2_super *osb); static void ocfs2_disable_quotas(struct ocfs2_super *osb);
static struct dquot **ocfs2_get_dquots(struct inode *inode)
{
return OCFS2_I(inode)->i_dquot;
}
static const struct super_operations ocfs2_sops = { static const struct super_operations ocfs2_sops = {
.statfs = ocfs2_statfs, .statfs = ocfs2_statfs,
.alloc_inode = ocfs2_alloc_inode, .alloc_inode = ocfs2_alloc_inode,
@ -155,6 +160,7 @@ static const struct super_operations ocfs2_sops = {
.show_options = ocfs2_show_options, .show_options = ocfs2_show_options,
.quota_read = ocfs2_quota_read, .quota_read = ocfs2_quota_read,
.quota_write = ocfs2_quota_write, .quota_write = ocfs2_quota_write,
.get_dquots = ocfs2_get_dquots,
}; };
enum { enum {
@ -563,6 +569,7 @@ static struct inode *ocfs2_alloc_inode(struct super_block *sb)
oi->i_sync_tid = 0; oi->i_sync_tid = 0;
oi->i_datasync_tid = 0; oi->i_datasync_tid = 0;
memset(&oi->i_dquot, 0, sizeof(oi->i_dquot));
jbd2_journal_init_jbd_inode(&oi->ip_jinode, &oi->vfs_inode); jbd2_journal_init_jbd_inode(&oi->ip_jinode, &oi->vfs_inode);
return &oi->vfs_inode; return &oi->vfs_inode;
@ -2073,6 +2080,7 @@ static int ocfs2_initialize_super(struct super_block *sb,
sb->s_export_op = &ocfs2_export_ops; sb->s_export_op = &ocfs2_export_ops;
sb->s_qcop = &ocfs2_quotactl_ops; sb->s_qcop = &ocfs2_quotactl_ops;
sb->dq_op = &ocfs2_quota_operations; sb->dq_op = &ocfs2_quota_operations;
sb->s_quota_types = QTYPE_MASK_USR | QTYPE_MASK_GRP;
sb->s_xattr = ocfs2_xattr_handlers; sb->s_xattr = ocfs2_xattr_handlers;
sb->s_time_gran = 1; sb->s_time_gran = 1;
sb->s_flags |= MS_NOATIME; sb->s_flags |= MS_NOATIME;

59
fs/quota/dquot.c
View File

@ -893,6 +893,11 @@ out:
} }
EXPORT_SYMBOL(dqget); EXPORT_SYMBOL(dqget);
static inline struct dquot **i_dquot(struct inode *inode)
{
return inode->i_sb->s_op->get_dquots(inode);
}
static int dqinit_needed(struct inode *inode, int type) static int dqinit_needed(struct inode *inode, int type)
{ {
int cnt; int cnt;
@ -900,9 +905,9 @@ static int dqinit_needed(struct inode *inode, int type)
if (IS_NOQUOTA(inode)) if (IS_NOQUOTA(inode))
return 0; return 0;
if (type != -1) if (type != -1)
return !inode->i_dquot[type]; return !i_dquot(inode)[type];
for (cnt = 0; cnt < MAXQUOTAS; cnt++) for (cnt = 0; cnt < MAXQUOTAS; cnt++)
if (!inode->i_dquot[cnt]) if (!i_dquot(inode)[cnt])
return 1; return 1;
return 0; return 0;
} }
@ -965,9 +970,9 @@ static void add_dquot_ref(struct super_block *sb, int type)
static void remove_inode_dquot_ref(struct inode *inode, int type, static void remove_inode_dquot_ref(struct inode *inode, int type,
struct list_head *tofree_head) struct list_head *tofree_head)
{ {
struct dquot *dquot = inode->i_dquot[type]; struct dquot *dquot = i_dquot(inode)[type];
inode->i_dquot[type] = NULL; i_dquot(inode)[type] = NULL;
if (!dquot) if (!dquot)
return; return;
@ -1402,7 +1407,7 @@ static void __dquot_initialize(struct inode *inode, int type)
* we check it without locking here to avoid unnecessary * we check it without locking here to avoid unnecessary
* dqget()/dqput() calls. * dqget()/dqput() calls.
*/ */
if (inode->i_dquot[cnt]) if (i_dquot(inode)[cnt])
continue; continue;
init_needed = 1; init_needed = 1;
@ -1433,8 +1438,8 @@ static void __dquot_initialize(struct inode *inode, int type)
/* We could race with quotaon or dqget() could have failed */ /* We could race with quotaon or dqget() could have failed */
if (!got[cnt]) if (!got[cnt])
continue; continue;
if (!inode->i_dquot[cnt]) { if (!i_dquot(inode)[cnt]) {
inode->i_dquot[cnt] = got[cnt]; i_dquot(inode)[cnt] = got[cnt];
got[cnt] = NULL; got[cnt] = NULL;
/* /*
* Make quota reservation system happy if someone * Make quota reservation system happy if someone
@ -1442,7 +1447,7 @@ static void __dquot_initialize(struct inode *inode, int type)
*/ */
rsv = inode_get_rsv_space(inode); rsv = inode_get_rsv_space(inode);
if (unlikely(rsv)) if (unlikely(rsv))
dquot_resv_space(inode->i_dquot[cnt], rsv); dquot_resv_space(i_dquot(inode)[cnt], rsv);
} }
} }
out_err: out_err:
@ -1472,8 +1477,8 @@ static void __dquot_drop(struct inode *inode)
spin_lock(&dq_data_lock); spin_lock(&dq_data_lock);
for (cnt = 0; cnt < MAXQUOTAS; cnt++) { for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
put[cnt] = inode->i_dquot[cnt]; put[cnt] = i_dquot(inode)[cnt];
inode->i_dquot[cnt] = NULL; i_dquot(inode)[cnt] = NULL;
} }
spin_unlock(&dq_data_lock); spin_unlock(&dq_data_lock);
dqput_all(put); dqput_all(put);
@ -1494,7 +1499,7 @@ void dquot_drop(struct inode *inode)
* add quota pointers back anyway. * add quota pointers back anyway.
*/ */
for (cnt = 0; cnt < MAXQUOTAS; cnt++) { for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
if (inode->i_dquot[cnt]) if (i_dquot(inode)[cnt])
break; break;
} }
@ -1595,7 +1600,7 @@ int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags)
{ {
int cnt, ret = 0, index; int cnt, ret = 0, index;
struct dquot_warn warn[MAXQUOTAS]; struct dquot_warn warn[MAXQUOTAS];
struct dquot **dquots = inode->i_dquot; struct dquot **dquots = i_dquot(inode);
int reserve = flags & DQUOT_SPACE_RESERVE; int reserve = flags & DQUOT_SPACE_RESERVE;
if (!dquot_active(inode)) { if (!dquot_active(inode)) {
@ -1643,11 +1648,11 @@ EXPORT_SYMBOL(__dquot_alloc_space);
/* /*
* This operation can block, but only after everything is updated * This operation can block, but only after everything is updated
*/ */
int dquot_alloc_inode(const struct inode *inode) int dquot_alloc_inode(struct inode *inode)
{ {
int cnt, ret = 0, index; int cnt, ret = 0, index;
struct dquot_warn warn[MAXQUOTAS]; struct dquot_warn warn[MAXQUOTAS];
struct dquot * const *dquots = inode->i_dquot; struct dquot * const *dquots = i_dquot(inode);
if (!dquot_active(inode)) if (!dquot_active(inode))
return 0; return 0;
@ -1696,14 +1701,14 @@ int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
spin_lock(&dq_data_lock); spin_lock(&dq_data_lock);
/* Claim reserved quotas to allocated quotas */ /* Claim reserved quotas to allocated quotas */
for (cnt = 0; cnt < MAXQUOTAS; cnt++) { for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
if (inode->i_dquot[cnt]) if (i_dquot(inode)[cnt])
dquot_claim_reserved_space(inode->i_dquot[cnt], dquot_claim_reserved_space(i_dquot(inode)[cnt],
number); number);
} }
/* Update inode bytes */ /* Update inode bytes */
inode_claim_rsv_space(inode, number); inode_claim_rsv_space(inode, number);
spin_unlock(&dq_data_lock); spin_unlock(&dq_data_lock);
mark_all_dquot_dirty(inode->i_dquot); mark_all_dquot_dirty(i_dquot(inode));
srcu_read_unlock(&dquot_srcu, index); srcu_read_unlock(&dquot_srcu, index);
return 0; return 0;
} }
@ -1725,14 +1730,14 @@ void dquot_reclaim_space_nodirty(struct inode *inode, qsize_t number)
spin_lock(&dq_data_lock); spin_lock(&dq_data_lock);
/* Claim reserved quotas to allocated quotas */ /* Claim reserved quotas to allocated quotas */
for (cnt = 0; cnt < MAXQUOTAS; cnt++) { for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
if (inode->i_dquot[cnt]) if (i_dquot(inode)[cnt])
dquot_reclaim_reserved_space(inode->i_dquot[cnt], dquot_reclaim_reserved_space(i_dquot(inode)[cnt],
number); number);
} }
/* Update inode bytes */ /* Update inode bytes */
inode_reclaim_rsv_space(inode, number); inode_reclaim_rsv_space(inode, number);
spin_unlock(&dq_data_lock); spin_unlock(&dq_data_lock);
mark_all_dquot_dirty(inode->i_dquot); mark_all_dquot_dirty(i_dquot(inode));
srcu_read_unlock(&dquot_srcu, index); srcu_read_unlock(&dquot_srcu, index);
return; return;
} }
@ -1745,7 +1750,7 @@ void __dquot_free_space(struct inode *inode, qsize_t number, int flags)
{ {
unsigned int cnt; unsigned int cnt;
struct dquot_warn warn[MAXQUOTAS]; struct dquot_warn warn[MAXQUOTAS];
struct dquot **dquots = inode->i_dquot; struct dquot **dquots = i_dquot(inode);
int reserve = flags & DQUOT_SPACE_RESERVE, index; int reserve = flags & DQUOT_SPACE_RESERVE, index;
if (!dquot_active(inode)) { if (!dquot_active(inode)) {
@ -1784,11 +1789,11 @@ EXPORT_SYMBOL(__dquot_free_space);
/* /*
* This operation can block, but only after everything is updated * This operation can block, but only after everything is updated
*/ */
void dquot_free_inode(const struct inode *inode) void dquot_free_inode(struct inode *inode)
{ {
unsigned int cnt; unsigned int cnt;
struct dquot_warn warn[MAXQUOTAS]; struct dquot_warn warn[MAXQUOTAS];
struct dquot * const *dquots = inode->i_dquot; struct dquot * const *dquots = i_dquot(inode);
int index; int index;
if (!dquot_active(inode)) if (!dquot_active(inode))
@ -1865,7 +1870,7 @@ int __dquot_transfer(struct inode *inode, struct dquot **transfer_to)
if (!sb_has_quota_active(inode->i_sb, cnt)) if (!sb_has_quota_active(inode->i_sb, cnt))
continue; continue;
is_valid[cnt] = 1; is_valid[cnt] = 1;
transfer_from[cnt] = inode->i_dquot[cnt]; transfer_from[cnt] = i_dquot(inode)[cnt];
ret = check_idq(transfer_to[cnt], 1, &warn_to[cnt]); ret = check_idq(transfer_to[cnt], 1, &warn_to[cnt]);
if (ret) if (ret)
goto over_quota; goto over_quota;
@ -1901,7 +1906,7 @@ int __dquot_transfer(struct inode *inode, struct dquot **transfer_to)
dquot_incr_space(transfer_to[cnt], cur_space); dquot_incr_space(transfer_to[cnt], cur_space);
dquot_resv_space(transfer_to[cnt], rsv_space); dquot_resv_space(transfer_to[cnt], rsv_space);
inode->i_dquot[cnt] = transfer_to[cnt]; i_dquot(inode)[cnt] = transfer_to[cnt];
} }
spin_unlock(&dq_data_lock); spin_unlock(&dq_data_lock);
@ -2743,8 +2748,8 @@ static int __init dquot_init(void)
for (i = 0; i < nr_hash; i++) for (i = 0; i < nr_hash; i++)
INIT_HLIST_HEAD(dquot_hash + i); INIT_HLIST_HEAD(dquot_hash + i);
printk("Dquot-cache hash table entries: %ld (order %ld, %ld bytes)\n", pr_info("VFS: Dquot-cache hash table entries: %ld (order %ld,"
nr_hash, order, (PAGE_SIZE << order)); " %ld bytes)\n", nr_hash, order, (PAGE_SIZE << order));
register_shrinker(&dqcache_shrinker); register_shrinker(&dqcache_shrinker);

13
fs/quota/quota.c
View File

@ -47,8 +47,11 @@ static int check_quotactl_permission(struct super_block *sb, int type, int cmd,
static void quota_sync_one(struct super_block *sb, void *arg) static void quota_sync_one(struct super_block *sb, void *arg)
{ {
if (sb->s_qcop && sb->s_qcop->quota_sync) int type = *(int *)arg;
sb->s_qcop->quota_sync(sb, *(int *)arg);
if (sb->s_qcop && sb->s_qcop->quota_sync &&
(sb->s_quota_types & (1 << type)))
sb->s_qcop->quota_sync(sb, type);
} }
static int quota_sync_all(int type) static int quota_sync_all(int type)
@ -297,8 +300,14 @@ static int do_quotactl(struct super_block *sb, int type, int cmd, qid_t id,
if (type >= (XQM_COMMAND(cmd) ? XQM_MAXQUOTAS : MAXQUOTAS)) if (type >= (XQM_COMMAND(cmd) ? XQM_MAXQUOTAS : MAXQUOTAS))
return -EINVAL; return -EINVAL;
/*
* Quota not supported on this fs? Check this before s_quota_types
* since they needn't be set if quota is not supported at all.
*/
if (!sb->s_qcop) if (!sb->s_qcop)
return -ENOSYS; return -ENOSYS;
if (!(sb->s_quota_types & (1 << type)))
return -EINVAL;
ret = check_quotactl_permission(sb, type, cmd, id); ret = check_quotactl_permission(sb, type, cmd, id);
if (ret < 0) if (ret < 0)

4
fs/reiserfs/reiserfs.h
View File

@ -97,6 +97,10 @@ struct reiserfs_inode_info {
#ifdef CONFIG_REISERFS_FS_XATTR #ifdef CONFIG_REISERFS_FS_XATTR
struct rw_semaphore i_xattr_sem; struct rw_semaphore i_xattr_sem;
#endif #endif
#ifdef CONFIG_QUOTA
struct dquot *i_dquot[MAXQUOTAS];
#endif
struct inode vfs_inode; struct inode vfs_inode;
}; };

11
fs/reiserfs/super.c
View File

@ -594,6 +594,10 @@ static struct inode *reiserfs_alloc_inode(struct super_block *sb)
return NULL; return NULL;
atomic_set(&ei->openers, 0); atomic_set(&ei->openers, 0);
mutex_init(&ei->tailpack); mutex_init(&ei->tailpack);
#ifdef CONFIG_QUOTA
memset(&ei->i_dquot, 0, sizeof(ei->i_dquot));
#endif
return &ei->vfs_inode; return &ei->vfs_inode;
} }
@ -750,6 +754,11 @@ static ssize_t reiserfs_quota_write(struct super_block *, int, const char *,
size_t, loff_t); size_t, loff_t);
static ssize_t reiserfs_quota_read(struct super_block *, int, char *, size_t, static ssize_t reiserfs_quota_read(struct super_block *, int, char *, size_t,
loff_t); loff_t);
static struct dquot **reiserfs_get_dquots(struct inode *inode)
{
return REISERFS_I(inode)->i_dquot;
}
#endif #endif
static const struct super_operations reiserfs_sops = { static const struct super_operations reiserfs_sops = {
@ -768,6 +777,7 @@ static const struct super_operations reiserfs_sops = {
#ifdef CONFIG_QUOTA #ifdef CONFIG_QUOTA
.quota_read = reiserfs_quota_read, .quota_read = reiserfs_quota_read,
.quota_write = reiserfs_quota_write, .quota_write = reiserfs_quota_write,
.get_dquots = reiserfs_get_dquots,
#endif #endif
}; };
@ -1633,6 +1643,7 @@ static int read_super_block(struct super_block *s, int offset)
#ifdef CONFIG_QUOTA #ifdef CONFIG_QUOTA
s->s_qcop = &reiserfs_qctl_operations; s->s_qcop = &reiserfs_qctl_operations;
s->dq_op = &reiserfs_quota_operations; s->dq_op = &reiserfs_quota_operations;
s->s_quota_types = QTYPE_MASK_USR | QTYPE_MASK_GRP;
#endif #endif
/* /*

11
fs/udf/super.c
View File

@ -2082,12 +2082,12 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent)
mutex_init(&sbi->s_alloc_mutex); mutex_init(&sbi->s_alloc_mutex);
if (!udf_parse_options((char *)options, &uopt, false)) if (!udf_parse_options((char *)options, &uopt, false))
goto error_out; goto parse_options_failure;
if (uopt.flags & (1 << UDF_FLAG_UTF8) && if (uopt.flags & (1 << UDF_FLAG_UTF8) &&
uopt.flags & (1 << UDF_FLAG_NLS_MAP)) { uopt.flags & (1 << UDF_FLAG_NLS_MAP)) {
udf_err(sb, "utf8 cannot be combined with iocharset\n"); udf_err(sb, "utf8 cannot be combined with iocharset\n");
goto error_out; goto parse_options_failure;
} }
#ifdef CONFIG_UDF_NLS #ifdef CONFIG_UDF_NLS
if ((uopt.flags & (1 << UDF_FLAG_NLS_MAP)) && !uopt.nls_map) { if ((uopt.flags & (1 << UDF_FLAG_NLS_MAP)) && !uopt.nls_map) {
@ -2237,8 +2237,8 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent)
return 0; return 0;
error_out: error_out:
if (sbi->s_vat_inode) iput(sbi->s_vat_inode);
iput(sbi->s_vat_inode); parse_options_failure:
#ifdef CONFIG_UDF_NLS #ifdef CONFIG_UDF_NLS
if (UDF_QUERY_FLAG(sb, UDF_FLAG_NLS_MAP)) if (UDF_QUERY_FLAG(sb, UDF_FLAG_NLS_MAP))
unload_nls(sbi->s_nls_map); unload_nls(sbi->s_nls_map);
@ -2291,8 +2291,7 @@ static void udf_put_super(struct super_block *sb)
sbi = UDF_SB(sb); sbi = UDF_SB(sb);
if (sbi->s_vat_inode) iput(sbi->s_vat_inode);
iput(sbi->s_vat_inode);
#ifdef CONFIG_UDF_NLS #ifdef CONFIG_UDF_NLS
if (UDF_QUERY_FLAG(sb, UDF_FLAG_NLS_MAP)) if (UDF_QUERY_FLAG(sb, UDF_FLAG_NLS_MAP))
unload_nls(sbi->s_nls_map); unload_nls(sbi->s_nls_map);

1
fs/xfs/xfs_super.c
View File

@ -1425,6 +1425,7 @@ xfs_fs_fill_super(
sb->s_export_op = &xfs_export_operations; sb->s_export_op = &xfs_export_operations;
#ifdef CONFIG_XFS_QUOTA #ifdef CONFIG_XFS_QUOTA
sb->s_qcop = &xfs_quotactl_operations; sb->s_qcop = &xfs_quotactl_operations;
sb->s_quota_types = QTYPE_MASK_USR | QTYPE_MASK_GRP | QTYPE_MASK_PRJ;
#endif #endif
sb->s_op = &xfs_super_operations; sb->s_op = &xfs_super_operations;

5
include/linux/fs.h
View File

@ -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;
@ -1224,6 +1221,7 @@ struct super_block {
struct backing_dev_info *s_bdi; struct backing_dev_info *s_bdi;
struct mtd_info *s_mtd; struct mtd_info *s_mtd;
struct hlist_node s_instances; struct hlist_node s_instances;
unsigned int s_quota_types; /* Bitmask of supported quota types */
struct quota_info s_dquot; /* Diskquota specific options */ struct quota_info s_dquot; /* Diskquota specific options */
struct sb_writers s_writers; struct sb_writers s_writers;
@ -1592,6 +1590,7 @@ struct super_operations {
#ifdef CONFIG_QUOTA #ifdef CONFIG_QUOTA
ssize_t (*quota_read)(struct super_block *, int, char *, size_t, loff_t); ssize_t (*quota_read)(struct super_block *, int, char *, size_t, loff_t);
ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t); ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t);
struct dquot **(*get_dquots)(struct inode *);
#endif #endif
int (*bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t); int (*bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t);
long (*nr_cached_objects)(struct super_block *, int); long (*nr_cached_objects)(struct super_block *, int);

5
include/linux/quota.h
View File

@ -56,6 +56,11 @@ enum quota_type {
PRJQUOTA = 2, /* element used for project quotas */ PRJQUOTA = 2, /* element used for project quotas */
}; };
/* Masks for quota types when used as a bitmask */
#define QTYPE_MASK_USR (1 << USRQUOTA)
#define QTYPE_MASK_GRP (1 << GRPQUOTA)
#define QTYPE_MASK_PRJ (1 << PRJQUOTA)
typedef __kernel_uid32_t qid_t; /* Type in which we store ids in memory */ typedef __kernel_uid32_t qid_t; /* Type in which we store ids in memory */
typedef long long qsize_t; /* Type in which we store sizes */ typedef long long qsize_t; /* Type in which we store sizes */

8
include/linux/quotaops.h
View File

@ -64,10 +64,10 @@ void dquot_destroy(struct dquot *dquot);
int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags); int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags);
void __dquot_free_space(struct inode *inode, qsize_t number, int flags); void __dquot_free_space(struct inode *inode, qsize_t number, int flags);
int dquot_alloc_inode(const struct inode *inode); int dquot_alloc_inode(struct inode *inode);
int dquot_claim_space_nodirty(struct inode *inode, qsize_t number); int dquot_claim_space_nodirty(struct inode *inode, qsize_t number);
void dquot_free_inode(const struct inode *inode); void dquot_free_inode(struct inode *inode);
void dquot_reclaim_space_nodirty(struct inode *inode, qsize_t number); void dquot_reclaim_space_nodirty(struct inode *inode, qsize_t number);
int dquot_disable(struct super_block *sb, int type, unsigned int flags); int dquot_disable(struct super_block *sb, int type, unsigned int flags);
@ -213,12 +213,12 @@ static inline void dquot_drop(struct inode *inode)
{ {
} }
static inline int dquot_alloc_inode(const struct inode *inode) static inline int dquot_alloc_inode(struct inode *inode)
{ {
return 0; return 0;
} }
static inline void dquot_free_inode(const struct inode *inode) static inline void dquot_free_inode(struct inode *inode)
{ {
} }