Get rid of the initialize dquot operation - it is now always called from
the filesystem and if a filesystem really needs it's own (which none
currently does) it can just call into it's own routine directly.
Rename the now static low-level dquot_initialize helper to __dquot_initialize
and vfs_dq_init to dquot_initialize to have a consistent namespace.
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Index: linux-2.6/Documentation/filesystems/Locking
===================================================================
--- linux-2.6.orig/Documentation/filesystems/Locking 2010-02-20 11:59:10.826282123 +0100
+++ linux-2.6/Documentation/filesystems/Locking 2010-02-20 12:04:17.076004291 +0100
@@ -460,7 +460,6 @@ in sys_read() and friends.
--------------------------- dquot_operations -------------------------------
prototypes:
- int (*initialize) (struct inode *, int);
int (*write_dquot) (struct dquot *);
int (*acquire_dquot) (struct dquot *);
int (*release_dquot) (struct dquot *);
@@ -473,7 +472,6 @@ a proper locking wrt the filesystem and
What filesystem should expect from the generic quota functions:
FS recursion Held locks when called
-initialize: yes maybe dqonoff_sem
write_dquot: yes dqonoff_sem or dqptr_sem
acquire_dquot: yes dqonoff_sem or dqptr_sem
release_dquot: yes dqonoff_sem or dqptr_sem
Index: linux-2.6/fs/ext2/ialloc.c
===================================================================
--- linux-2.6.orig/fs/ext2/ialloc.c 2010-02-20 11:59:10.751275697 +0100
+++ linux-2.6/fs/ext2/ialloc.c 2010-02-20 12:04:17.077004431 +0100
@@ -586,7 +586,7 @@ got:
goto fail_drop;
}
- vfs_dq_init(inode);
+ dquot_initialize(inode);
if (dquot_alloc_inode(inode)) {
err = -EDQUOT;
goto fail_drop;
Index: linux-2.6/fs/ext2/inode.c
===================================================================
--- linux-2.6.orig/fs/ext2/inode.c 2010-02-20 12:00:45.486253976 +0100
+++ linux-2.6/fs/ext2/inode.c 2010-02-20 12:04:17.083004640 +0100
@@ -59,7 +59,7 @@ static inline int ext2_inode_is_fast_sym
void ext2_delete_inode (struct inode * inode)
{
if (!is_bad_inode(inode))
- vfs_dq_init(inode);
+ dquot_initialize(inode);
truncate_inode_pages(&inode->i_data, 0);
if (is_bad_inode(inode))
@@ -1461,7 +1461,7 @@ int ext2_setattr(struct dentry *dentry,
return error;
if (iattr->ia_valid & ATTR_SIZE)
- vfs_dq_init(inode);
+ dquot_initialize(inode);
if ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) ||
(iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid)) {
error = dquot_transfer(inode, iattr);
Index: linux-2.6/fs/ext3/ialloc.c
===================================================================
--- linux-2.6.orig/fs/ext3/ialloc.c 2010-02-20 11:59:10.755255373 +0100
+++ linux-2.6/fs/ext3/ialloc.c 2010-02-20 12:04:17.097261729 +0100
@@ -123,7 +123,7 @@ void ext3_free_inode (handle_t *handle,
* Note: we must free any quota before locking the superblock,
* as writing the quota to disk may need the lock as well.
*/
- vfs_dq_init(inode);
+ dquot_initialize(inode);
ext3_xattr_delete_inode(handle, inode);
dquot_free_inode(inode);
dquot_drop(inode);
@@ -588,7 +588,7 @@ got:
sizeof(struct ext3_inode) - EXT3_GOOD_OLD_INODE_SIZE : 0;
ret = inode;
- vfs_dq_init(inode);
+ dquot_initialize(inode);
if (dquot_alloc_inode(inode)) {
err = -EDQUOT;
goto fail_drop;
Index: linux-2.6/fs/ext3/inode.c
===================================================================
--- linux-2.6.orig/fs/ext3/inode.c 2010-02-20 12:00:45.488257957 +0100
+++ linux-2.6/fs/ext3/inode.c 2010-02-20 12:04:17.104177430 +0100
@@ -197,7 +197,7 @@ void ext3_delete_inode (struct inode * i
handle_t *handle;
if (!is_bad_inode(inode))
- vfs_dq_init(inode);
+ dquot_initialize(inode);
truncate_inode_pages(&inode->i_data, 0);
@@ -3144,7 +3144,7 @@ int ext3_setattr(struct dentry *dentry,
return error;
if (ia_valid & ATTR_SIZE)
- vfs_dq_init(inode);
+ dquot_initialize(inode);
if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
(ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) {
handle_t *handle;
@@ -3242,7 +3242,7 @@ static int ext3_writepage_trans_blocks(s
ret = 2 * (bpp + indirects) + 2;
#ifdef CONFIG_QUOTA
- /* We know that structure was already allocated during vfs_dq_init so
+ /* We know that structure was already allocated during dquot_initialize so
* we will be updating only the data blocks + inodes */
ret += EXT3_MAXQUOTAS_TRANS_BLOCKS(inode->i_sb);
#endif
Index: linux-2.6/fs/ext3/namei.c
===================================================================
--- linux-2.6.orig/fs/ext3/namei.c 2010-02-20 12:00:45.584007015 +0100
+++ linux-2.6/fs/ext3/namei.c 2010-02-20 12:04:17.113255723 +0100
@@ -1696,7 +1696,7 @@ static int ext3_create (struct inode * d
struct inode * inode;
int err, retries = 0;
- vfs_dq_init(dir);
+ dquot_initialize(dir);
retry:
handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) +
@@ -1732,7 +1732,7 @@ static int ext3_mknod (struct inode * di
if (!new_valid_dev(rdev))
return -EINVAL;
- vfs_dq_init(dir);
+ dquot_initialize(dir);
retry:
handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) +
@@ -1770,7 +1770,7 @@ static int ext3_mkdir(struct inode * dir
if (dir->i_nlink >= EXT3_LINK_MAX)
return -EMLINK;
- vfs_dq_init(dir);
+ dquot_initialize(dir);
retry:
handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) +
@@ -2066,8 +2066,8 @@ static int ext3_rmdir (struct inode * di
/* Initialize quotas before so that eventual writes go in
* separate transaction */
- vfs_dq_init(dir);
- vfs_dq_init(dentry->d_inode);
+ dquot_initialize(dir);
+ dquot_initialize(dentry->d_inode);
handle = ext3_journal_start(dir, EXT3_DELETE_TRANS_BLOCKS(dir->i_sb));
if (IS_ERR(handle))
@@ -2127,8 +2127,8 @@ static int ext3_unlink(struct inode * di
/* Initialize quotas before so that eventual writes go
* in separate transaction */
- vfs_dq_init(dir);
- vfs_dq_init(dentry->d_inode);
+ dquot_initialize(dir);
+ dquot_initialize(dentry->d_inode);
handle = ext3_journal_start(dir, EXT3_DELETE_TRANS_BLOCKS(dir->i_sb));
if (IS_ERR(handle))
@@ -2184,7 +2184,7 @@ static int ext3_symlink (struct inode *
if (l > dir->i_sb->s_blocksize)
return -ENAMETOOLONG;
- vfs_dq_init(dir);
+ dquot_initialize(dir);
retry:
handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) +
@@ -2241,7 +2241,7 @@ static int ext3_link (struct dentry * ol
if (inode->i_nlink >= EXT3_LINK_MAX)
return -EMLINK;
- vfs_dq_init(dir);
+ dquot_initialize(dir);
/*
* Return -ENOENT if we've raced with unlink and i_nlink is 0. Doing
@@ -2293,15 +2293,15 @@ static int ext3_rename (struct inode * o
struct ext3_dir_entry_2 * old_de, * new_de;
int retval, flush_file = 0;
- vfs_dq_init(old_dir);
- vfs_dq_init(new_dir);
+ dquot_initialize(old_dir);
+ dquot_initialize(new_dir);
old_bh = new_bh = dir_bh = NULL;
/* Initialize quotas before so that eventual writes go
* in separate transaction */
if (new_dentry->d_inode)
- vfs_dq_init(new_dentry->d_inode);
+ dquot_initialize(new_dentry->d_inode);
handle = ext3_journal_start(old_dir, 2 *
EXT3_DATA_TRANS_BLOCKS(old_dir->i_sb) +
EXT3_INDEX_EXTRA_TRANS_BLOCKS + 2);
Index: linux-2.6/fs/ext3/super.c
===================================================================
--- linux-2.6.orig/fs/ext3/super.c 2010-02-20 11:59:10.736253977 +0100
+++ linux-2.6/fs/ext3/super.c 2010-02-20 12:04:17.120255792 +0100
@@ -752,7 +752,6 @@ static ssize_t ext3_quota_write(struct s
const char *data, size_t len, loff_t off);
static const struct dquot_operations ext3_quota_operations = {
- .initialize = dquot_initialize,
.write_dquot = ext3_write_dquot,
.acquire_dquot = ext3_acquire_dquot,
.release_dquot = ext3_release_dquot,
@@ -1480,7 +1479,7 @@ static void ext3_orphan_cleanup (struct
}
list_add(&EXT3_I(inode)->i_orphan, &EXT3_SB(sb)->s_orphan);
- vfs_dq_init(inode);
+ dquot_initialize(inode);
if (inode->i_nlink) {
printk(KERN_DEBUG
"%s: truncating inode %lu to %Ld bytes\n",
@@ -2736,7 +2735,7 @@ static int ext3_statfs (struct dentry *
* Process 1 Process 2
* ext3_create() quota_sync()
* journal_start() write_dquot()
- * vfs_dq_init() down(dqio_mutex)
+ * dquot_initialize() down(dqio_mutex)
* down(dqio_mutex) journal_start()
*
*/
Index: linux-2.6/fs/ext4/ialloc.c
===================================================================
--- linux-2.6.orig/fs/ext4/ialloc.c 2010-02-20 11:59:10.764254954 +0100
+++ linux-2.6/fs/ext4/ialloc.c 2010-02-20 12:04:17.131257259 +0100
@@ -217,7 +217,7 @@ void ext4_free_inode(handle_t *handle, s
* Note: we must free any quota before locking the superblock,
* as writing the quota to disk may need the lock as well.
*/
- vfs_dq_init(inode);
+ dquot_initialize(inode);
ext4_xattr_delete_inode(handle, inode);
dquot_free_inode(inode);
dquot_drop(inode);
@@ -1034,7 +1034,7 @@ got:
ei->i_extra_isize = EXT4_SB(sb)->s_want_extra_isize;
ret = inode;
- vfs_dq_init(inode);
+ dquot_initialize(inode);
if (dquot_alloc_inode(inode)) {
err = -EDQUOT;
goto fail_drop;
Index: linux-2.6/fs/ext4/inode.c
===================================================================
--- linux-2.6.orig/fs/ext4/inode.c 2010-02-20 12:00:45.505255373 +0100
+++ linux-2.6/fs/ext4/inode.c 2010-02-20 12:04:17.147255024 +0100
@@ -171,7 +171,7 @@ void ext4_delete_inode(struct inode *ino
int err;
if (!is_bad_inode(inode))
- vfs_dq_init(inode);
+ dquot_initialize(inode);
if (ext4_should_order_data(inode))
ext4_begin_ordered_truncate(inode, 0);
@@ -5253,7 +5253,7 @@ int ext4_setattr(struct dentry *dentry,
return error;
if (ia_valid & ATTR_SIZE)
- vfs_dq_init(inode);
+ dquot_initialize(inode);
if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
(ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) {
handle_t *handle;
Index: linux-2.6/fs/ext4/namei.c
===================================================================
--- linux-2.6.orig/fs/ext4/namei.c 2010-02-20 12:00:45.602005827 +0100
+++ linux-2.6/fs/ext4/namei.c 2010-02-20 12:04:17.182254466 +0100
@@ -1766,7 +1766,7 @@ static int ext4_create(struct inode *dir
struct inode *inode;
int err, retries = 0;
- vfs_dq_init(dir);
+ dquot_initialize(dir);
retry:
handle = ext4_journal_start(dir, EXT4_DATA_TRANS_BLOCKS(dir->i_sb) +
@@ -1802,7 +1802,7 @@ static int ext4_mknod(struct inode *dir,
if (!new_valid_dev(rdev))
return -EINVAL;
- vfs_dq_init(dir);
+ dquot_initialize(dir);
retry:
handle = ext4_journal_start(dir, EXT4_DATA_TRANS_BLOCKS(dir->i_sb) +
@@ -1841,7 +1841,7 @@ static int ext4_mkdir(struct inode *dir,
if (EXT4_DIR_LINK_MAX(dir))
return -EMLINK;
- vfs_dq_init(dir);
+ dquot_initialize(dir);
retry:
handle = ext4_journal_start(dir, EXT4_DATA_TRANS_BLOCKS(dir->i_sb) +
@@ -2142,8 +2142,8 @@ static int ext4_rmdir(struct inode *dir,
/* Initialize quotas before so that eventual writes go in
* separate transaction */
- vfs_dq_init(dir);
- vfs_dq_init(dentry->d_inode);
+ dquot_initialize(dir);
+ dquot_initialize(dentry->d_inode);
handle = ext4_journal_start(dir, EXT4_DELETE_TRANS_BLOCKS(dir->i_sb));
if (IS_ERR(handle))
@@ -2203,8 +2203,8 @@ static int ext4_unlink(struct inode *dir
/* Initialize quotas before so that eventual writes go
* in separate transaction */
- vfs_dq_init(dir);
- vfs_dq_init(dentry->d_inode);
+ dquot_initialize(dir);
+ dquot_initialize(dentry->d_inode);
handle = ext4_journal_start(dir, EXT4_DELETE_TRANS_BLOCKS(dir->i_sb));
if (IS_ERR(handle))
@@ -2260,7 +2260,7 @@ static int ext4_symlink(struct inode *di
if (l > dir->i_sb->s_blocksize)
return -ENAMETOOLONG;
- vfs_dq_init(dir);
+ dquot_initialize(dir);
retry:
handle = ext4_journal_start(dir, EXT4_DATA_TRANS_BLOCKS(dir->i_sb) +
@@ -2320,7 +2320,7 @@ static int ext4_link(struct dentry *old_
if (inode->i_nlink >= EXT4_LINK_MAX)
return -EMLINK;
- vfs_dq_init(dir);
+ dquot_initialize(dir);
/*
* Return -ENOENT if we've raced with unlink and i_nlink is 0. Doing
@@ -2372,15 +2372,15 @@ static int ext4_rename(struct inode *old
struct ext4_dir_entry_2 *old_de, *new_de;
int retval, force_da_alloc = 0;
- vfs_dq_init(old_dir);
- vfs_dq_init(new_dir);
+ dquot_initialize(old_dir);
+ dquot_initialize(new_dir);
old_bh = new_bh = dir_bh = NULL;
/* Initialize quotas before so that eventual writes go
* in separate transaction */
if (new_dentry->d_inode)
- vfs_dq_init(new_dentry->d_inode);
+ dquot_initialize(new_dentry->d_inode);
handle = ext4_journal_start(old_dir, 2 *
EXT4_DATA_TRANS_BLOCKS(old_dir->i_sb) +
EXT4_INDEX_EXTRA_TRANS_BLOCKS + 2);
Index: linux-2.6/fs/ext4/super.c
===================================================================
--- linux-2.6.orig/fs/ext4/super.c 2010-02-20 11:59:10.738253837 +0100
+++ linux-2.6/fs/ext4/super.c 2010-02-20 12:04:17.201255373 +0100
@@ -1013,7 +1013,6 @@ static ssize_t ext4_quota_write(struct s
const char *data, size_t len, loff_t off);
static const struct dquot_operations ext4_quota_operations = {
- .initialize = dquot_initialize,
#ifdef CONFIG_QUOTA
.get_reserved_space = ext4_get_reserved_space,
#endif
@@ -1931,7 +1930,7 @@ static void ext4_orphan_cleanup(struct s
}
list_add(&EXT4_I(inode)->i_orphan, &EXT4_SB(sb)->s_orphan);
- vfs_dq_init(inode);
+ dquot_initialize(inode);
if (inode->i_nlink) {
ext4_msg(sb, KERN_DEBUG,
"%s: truncating inode %lu to %lld bytes",
@@ -3700,7 +3699,7 @@ static int ext4_statfs(struct dentry *de
* Process 1 Process 2
* ext4_create() quota_sync()
* jbd2_journal_start() write_dquot()
- * vfs_dq_init() down(dqio_mutex)
+ * dquot_initialize() down(dqio_mutex)
* down(dqio_mutex) jbd2_journal_start()
*
*/
Index: linux-2.6/fs/jfs/inode.c
===================================================================
--- linux-2.6.orig/fs/jfs/inode.c 2010-02-20 12:00:45.545255374 +0100
+++ linux-2.6/fs/jfs/inode.c 2010-02-20 12:04:17.209005478 +0100
@@ -147,7 +147,7 @@ void jfs_delete_inode(struct inode *inod
jfs_info("In jfs_delete_inode, inode = 0x%p", inode);
if (!is_bad_inode(inode))
- vfs_dq_init(inode);
+ dquot_initialize(inode);
if (!is_bad_inode(inode) &&
(JFS_IP(inode)->fileset == FILESYSTEM_I)) {
@@ -161,7 +161,7 @@ void jfs_delete_inode(struct inode *inod
/*
* Free the inode from the quota allocation.
*/
- vfs_dq_init(inode);
+ dquot_initialize(inode);
dquot_free_inode(inode);
dquot_drop(inode);
}
Index: linux-2.6/fs/jfs/jfs_inode.c
===================================================================
--- linux-2.6.orig/fs/jfs/jfs_inode.c 2010-02-20 11:59:10.780255583 +0100
+++ linux-2.6/fs/jfs/jfs_inode.c 2010-02-20 12:04:17.212005897 +0100
@@ -116,7 +116,7 @@ struct inode *ialloc(struct inode *paren
/*
* Allocate inode to quota.
*/
- vfs_dq_init(inode);
+ dquot_initialize(inode);
if (dquot_alloc_inode(inode)) {
rc = -EDQUOT;
goto fail_drop;
Index: linux-2.6/fs/jfs/namei.c
===================================================================
--- linux-2.6.orig/fs/jfs/namei.c 2010-02-20 12:00:45.617005478 +0100
+++ linux-2.6/fs/jfs/namei.c 2010-02-20 12:04:17.215285056 +0100
@@ -85,7 +85,7 @@ static int jfs_create(struct inode *dip,
jfs_info("jfs_create: dip:0x%p name:%s", dip, dentry->d_name.name);
- vfs_dq_init(dip);
+ dquot_initialize(dip);
/*
* search parent directory for entry/freespace
@@ -217,7 +217,7 @@ static int jfs_mkdir(struct inode *dip,
jfs_info("jfs_mkdir: dip:0x%p name:%s", dip, dentry->d_name.name);
- vfs_dq_init(dip);
+ dquot_initialize(dip);
/* link count overflow on parent directory ? */
if (dip->i_nlink == JFS_LINK_MAX) {
@@ -360,8 +360,8 @@ static int jfs_rmdir(struct inode *dip,
jfs_info("jfs_rmdir: dip:0x%p name:%s", dip, dentry->d_name.name);
/* Init inode for quota operations. */
- vfs_dq_init(dip);
- vfs_dq_init(ip);
+ dquot_initialize(dip);
+ dquot_initialize(ip);
/* directory must be empty to be removed */
if (!dtEmpty(ip)) {
@@ -488,8 +488,8 @@ static int jfs_unlink(struct inode *dip,
jfs_info("jfs_unlink: dip:0x%p name:%s", dip, dentry->d_name.name);
/* Init inode for quota operations. */
- vfs_dq_init(dip);
- vfs_dq_init(ip);
+ dquot_initialize(dip);
+ dquot_initialize(ip);
if ((rc = get_UCSname(&dname, dentry)))
goto out;
@@ -811,7 +811,7 @@ static int jfs_link(struct dentry *old_d
if (ip->i_nlink == 0)
return -ENOENT;
- vfs_dq_init(dir);
+ dquot_initialize(dir);
tid = txBegin(ip->i_sb, 0);
@@ -904,7 +904,7 @@ static int jfs_symlink(struct inode *dip
jfs_info("jfs_symlink: dip:0x%p name:%s", dip, name);
- vfs_dq_init(dip);
+ dquot_initialize(dip);
ssize = strlen(name) + 1;
@@ -1097,8 +1097,8 @@ static int jfs_rename(struct inode *old_
jfs_info("jfs_rename: %s %s", old_dentry->d_name.name,
new_dentry->d_name.name);
- vfs_dq_init(old_dir);
- vfs_dq_init(new_dir);
+ dquot_initialize(old_dir);
+ dquot_initialize(new_dir);
old_ip = old_dentry->d_inode;
new_ip = new_dentry->d_inode;
@@ -1149,7 +1149,7 @@ static int jfs_rename(struct inode *old_
} else if (new_ip) {
IWRITE_LOCK(new_ip, RDWRLOCK_NORMAL);
/* Init inode for quota operations. */
- vfs_dq_init(new_ip);
+ dquot_initialize(new_ip);
}
/*
@@ -1373,7 +1373,7 @@ static int jfs_mknod(struct inode *dir,
jfs_info("jfs_mknod: %s", dentry->d_name.name);
- vfs_dq_init(dir);
+ dquot_initialize(dir);
if ((rc = get_UCSname(&dname, dentry)))
goto out;
Index: linux-2.6/fs/ocfs2/inode.c
===================================================================
--- linux-2.6.orig/fs/ocfs2/inode.c 2010-02-20 12:00:45.548255793 +0100
+++ linux-2.6/fs/ocfs2/inode.c 2010-02-20 12:04:17.220257329 +0100
@@ -971,7 +971,7 @@ void ocfs2_delete_inode(struct inode *in
goto bail;
}
- vfs_dq_init(inode);
+ dquot_initialize(inode);
if (!ocfs2_inode_is_valid_to_delete(inode)) {
/* It's probably not necessary to truncate_inode_pages
Index: linux-2.6/fs/ocfs2/namei.c
===================================================================
--- linux-2.6.orig/fs/ocfs2/namei.c 2010-02-20 12:00:45.625285195 +0100
+++ linux-2.6/fs/ocfs2/namei.c 2010-02-20 12:04:17.224281983 +0100
@@ -212,7 +212,7 @@ static struct inode *ocfs2_get_init_inod
} else
inode->i_gid = current_fsgid();
inode->i_mode = mode;
- vfs_dq_init(inode);
+ dquot_initialize(inode);
return inode;
}
@@ -244,7 +244,7 @@ static int ocfs2_mknod(struct inode *dir
(unsigned long)dev, dentry->d_name.len,
dentry->d_name.name);
- vfs_dq_init(dir);
+ dquot_initialize(dir);
/* get our super block */
osb = OCFS2_SB(dir->i_sb);
@@ -635,7 +635,7 @@ static int ocfs2_link(struct dentry *old
if (S_ISDIR(inode->i_mode))
return -EPERM;
- vfs_dq_init(dir);
+ dquot_initialize(dir);
err = ocfs2_inode_lock_nested(dir, &parent_fe_bh, 1, OI_LS_PARENT);
if (err < 0) {
@@ -792,7 +792,7 @@ static int ocfs2_unlink(struct inode *di
mlog_entry("(0x%p, 0x%p, '%.*s')\n", dir, dentry,
dentry->d_name.len, dentry->d_name.name);
- vfs_dq_init(dir);
+ dquot_initialize(dir);
BUG_ON(dentry->d_parent->d_inode != dir);
@@ -1054,8 +1054,8 @@ static int ocfs2_rename(struct inode *ol
old_dentry->d_name.len, old_dentry->d_name.name,
new_dentry->d_name.len, new_dentry->d_name.name);
- vfs_dq_init(old_dir);
- vfs_dq_init(new_dir);
+ dquot_initialize(old_dir);
+ dquot_initialize(new_dir);
osb = OCFS2_SB(old_dir->i_sb);
@@ -1605,7 +1605,7 @@ static int ocfs2_symlink(struct inode *d
mlog_entry("(0x%p, 0x%p, symname='%s' actual='%.*s')\n", dir,
dentry, symname, dentry->d_name.len, dentry->d_name.name);
- vfs_dq_init(dir);
+ dquot_initialize(dir);
sb = dir->i_sb;
osb = OCFS2_SB(sb);
Index: linux-2.6/fs/ocfs2/quota_global.c
===================================================================
--- linux-2.6.orig/fs/ocfs2/quota_global.c 2010-02-20 11:59:10.823282332 +0100
+++ linux-2.6/fs/ocfs2/quota_global.c 2010-02-20 12:04:17.235255094 +0100
@@ -851,7 +851,6 @@ static void ocfs2_destroy_dquot(struct d
}
const struct dquot_operations ocfs2_quota_operations = {
- .initialize = dquot_initialize,
.write_dquot = ocfs2_write_dquot,
.acquire_dquot = ocfs2_acquire_dquot,
.release_dquot = ocfs2_release_dquot,
Index: linux-2.6/fs/ocfs2/refcounttree.c
===================================================================
--- linux-2.6.orig/fs/ocfs2/refcounttree.c 2010-02-20 11:40:47.758025663 +0100
+++ linux-2.6/fs/ocfs2/refcounttree.c 2010-02-20 12:04:17.247255512 +0100
@@ -4390,7 +4390,7 @@ static int ocfs2_vfs_reflink(struct dent
}
mutex_lock(&inode->i_mutex);
- vfs_dq_init(dir);
+ dquot_initialize(dir);
error = ocfs2_reflink(old_dentry, dir, new_dentry, preserve);
mutex_unlock(&inode->i_mutex);
if (!error)
Index: linux-2.6/fs/quota/dquot.c
===================================================================
--- linux-2.6.orig/fs/quota/dquot.c 2010-02-20 12:00:45.687005339 +0100
+++ linux-2.6/fs/quota/dquot.c 2010-02-20 12:04:17.274255304 +0100
@@ -230,6 +230,7 @@ struct dqstats dqstats;
EXPORT_SYMBOL(dqstats);
static qsize_t inode_get_rsv_space(struct inode *inode);
+static void __dquot_initialize(struct inode *inode, int type);
static inline unsigned int
hashfn(const struct super_block *sb, unsigned int id, int type)
@@ -890,7 +891,7 @@ static void add_dquot_ref(struct super_b
spin_unlock(&inode_lock);
iput(old_inode);
- sb->dq_op->initialize(inode, type);
+ __dquot_initialize(inode, type);
/* We hold a reference to 'inode' so it couldn't have been
* removed from s_inodes list while we dropped the inode_lock.
* We cannot iput the inode now as we can be holding the last
@@ -1293,22 +1294,26 @@ static int info_bdq_free(struct dquot *d
}
/*
- * Initialize quota pointers in inode
- * We do things in a bit complicated way but by that we avoid calling
- * dqget() and thus filesystem callbacks under dqptr_sem.
+ * Initialize quota pointers in inode
+ *
+ * We do things in a bit complicated way but by that we avoid calling
+ * dqget() and thus filesystem callbacks under dqptr_sem.
+ *
+ * It is better to call this function outside of any transaction as it
+ * might need a lot of space in journal for dquot structure allocation.
*/
-int dquot_initialize(struct inode *inode, int type)
+static void __dquot_initialize(struct inode *inode, int type)
{
unsigned int id = 0;
- int cnt, ret = 0;
+ int cnt;
struct dquot *got[MAXQUOTAS];
struct super_block *sb = inode->i_sb;
qsize_t rsv;
/* First test before acquiring mutex - solves deadlocks when we
* re-enter the quota code and are already holding the mutex */
- if (IS_NOQUOTA(inode))
- return 0;
+ if (!sb_any_quota_active(inode->i_sb) || IS_NOQUOTA(inode))
+ return;
/* First get references to structures we might need. */
for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
@@ -1351,7 +1356,11 @@ out_err:
up_write(&sb_dqopt(sb)->dqptr_sem);
/* Drop unused references */
dqput_all(got);
- return ret;
+}
+
+void dquot_initialize(struct inode *inode)
+{
+ __dquot_initialize(inode, -1);
}
EXPORT_SYMBOL(dquot_initialize);
@@ -1783,7 +1792,7 @@ int dquot_transfer(struct inode *inode,
chid[GRPQUOTA] = iattr->ia_gid;
}
if (sb_any_quota_active(inode->i_sb) && !IS_NOQUOTA(inode)) {
- vfs_dq_init(inode);
+ dquot_initialize(inode);
if (__dquot_transfer(inode, chid, mask) == NO_QUOTA)
return -EDQUOT;
}
@@ -1810,7 +1819,6 @@ EXPORT_SYMBOL(dquot_commit_info);
* Definitions of diskquota operations.
*/
const struct dquot_operations dquot_operations = {
- .initialize = dquot_initialize,
.write_dquot = dquot_commit,
.acquire_dquot = dquot_acquire,
.release_dquot = dquot_release,
@@ -1829,7 +1837,7 @@ int dquot_file_open(struct inode *inode,
error = generic_file_open(inode, file);
if (!error && (file->f_mode & FMODE_WRITE))
- vfs_dq_init(inode);
+ dquot_initialize(inode);
return error;
}
EXPORT_SYMBOL(dquot_file_open);
Index: linux-2.6/fs/reiserfs/inode.c
===================================================================
--- linux-2.6.orig/fs/reiserfs/inode.c 2010-02-20 12:00:45.554256073 +0100
+++ linux-2.6/fs/reiserfs/inode.c 2010-02-20 12:04:17.290256002 +0100
@@ -35,7 +35,7 @@ void reiserfs_delete_inode(struct inode
int err;
if (!is_bad_inode(inode))
- vfs_dq_init(inode);
+ dquot_initialize(inode);
truncate_inode_pages(&inode->i_data, 0);
@@ -1768,7 +1768,7 @@ int reiserfs_new_inode(struct reiserfs_t
BUG_ON(!th->t_trans_id);
- vfs_dq_init(inode);
+ dquot_initialize(inode);
if (dquot_alloc_inode(inode)) {
err = -EDQUOT;
goto out_end_trans;
@@ -3077,7 +3077,7 @@ int reiserfs_setattr(struct dentry *dent
depth = reiserfs_write_lock_once(inode->i_sb);
if (ia_valid & ATTR_SIZE)
- vfs_dq_init(inode);
+ dquot_initialize(inode);
if (attr->ia_valid & ATTR_SIZE) {
/* version 2 items will be caught by the s_maxbytes check
** done for us in vmtruncate
Index: linux-2.6/fs/reiserfs/namei.c
===================================================================
--- linux-2.6.orig/fs/reiserfs/namei.c 2010-02-20 12:00:45.631256001 +0100
+++ linux-2.6/fs/reiserfs/namei.c 2010-02-20 12:04:17.302255234 +0100
@@ -554,7 +554,7 @@ static int drop_new_inode(struct inode *
}
/* utility function that does setup for reiserfs_new_inode.
-** vfs_dq_init needs lots of credits so it's better to have it
+** dquot_initialize needs lots of credits so it's better to have it
** outside of a transaction, so we had to pull some bits of
** reiserfs_new_inode out into this func.
*/
@@ -577,7 +577,7 @@ static int new_inode_init(struct inode *
} else {
inode->i_gid = current_fsgid();
}
- vfs_dq_init(inode);
+ dquot_initialize(inode);
return 0;
}
@@ -594,7 +594,7 @@ static int reiserfs_create(struct inode
struct reiserfs_transaction_handle th;
struct reiserfs_security_handle security;
- vfs_dq_init(dir);
+ dquot_initialize(dir);
if (!(inode = new_inode(dir->i_sb))) {
return -ENOMEM;
@@ -668,7 +668,7 @@ static int reiserfs_mknod(struct inode *
if (!new_valid_dev(rdev))
return -EINVAL;
- vfs_dq_init(dir);
+ dquot_initialize(dir);
if (!(inode = new_inode(dir->i_sb))) {
return -ENOMEM;
@@ -743,7 +743,7 @@ static int reiserfs_mkdir(struct inode *
2 * (REISERFS_QUOTA_INIT_BLOCKS(dir->i_sb) +
REISERFS_QUOTA_TRANS_BLOCKS(dir->i_sb));
- vfs_dq_init(dir);
+ dquot_initialize(dir);
#ifdef DISPLACE_NEW_PACKING_LOCALITIES
/* set flag that new packing locality created and new blocks for the content * of that directory are not displaced yet */
@@ -848,7 +848,7 @@ static int reiserfs_rmdir(struct inode *
JOURNAL_PER_BALANCE_CNT * 2 + 2 +
4 * REISERFS_QUOTA_TRANS_BLOCKS(dir->i_sb);
- vfs_dq_init(dir);
+ dquot_initialize(dir);
reiserfs_write_lock(dir->i_sb);
retval = journal_begin(&th, dir->i_sb, jbegin_count);
@@ -931,7 +931,7 @@ static int reiserfs_unlink(struct inode
unsigned long savelink;
int depth;
- vfs_dq_init(dir);
+ dquot_initialize(dir);
inode = dentry->d_inode;
@@ -1034,7 +1034,7 @@ static int reiserfs_symlink(struct inode
2 * (REISERFS_QUOTA_INIT_BLOCKS(parent_dir->i_sb) +
REISERFS_QUOTA_TRANS_BLOCKS(parent_dir->i_sb));
- vfs_dq_init(parent_dir);
+ dquot_initialize(parent_dir);
if (!(inode = new_inode(parent_dir->i_sb))) {
return -ENOMEM;
@@ -1123,7 +1123,7 @@ static int reiserfs_link(struct dentry *
JOURNAL_PER_BALANCE_CNT * 3 +
2 * REISERFS_QUOTA_TRANS_BLOCKS(dir->i_sb);
- vfs_dq_init(dir);
+ dquot_initialize(dir);
reiserfs_write_lock(dir->i_sb);
if (inode->i_nlink >= REISERFS_LINK_MAX) {
@@ -1249,8 +1249,8 @@ static int reiserfs_rename(struct inode
JOURNAL_PER_BALANCE_CNT * 3 + 5 +
4 * REISERFS_QUOTA_TRANS_BLOCKS(old_dir->i_sb);
- vfs_dq_init(old_dir);
- vfs_dq_init(new_dir);
+ dquot_initialize(old_dir);
+ dquot_initialize(new_dir);
old_inode = old_dentry->d_inode;
new_dentry_inode = new_dentry->d_inode;
Index: linux-2.6/fs/reiserfs/super.c
===================================================================
--- linux-2.6.orig/fs/reiserfs/super.c 2010-02-20 11:59:10.746276675 +0100
+++ linux-2.6/fs/reiserfs/super.c 2010-02-20 12:04:17.307283729 +0100
@@ -246,7 +246,7 @@ static int finish_unfinished(struct supe
retval = remove_save_link_only(s, &save_link_key, 0);
continue;
}
- vfs_dq_init(inode);
+ dquot_initialize(inode);
if (truncate && S_ISDIR(inode->i_mode)) {
/* We got a truncate request for a dir which is impossible.
@@ -622,7 +622,6 @@ static int reiserfs_write_info(struct su
static int reiserfs_quota_on(struct super_block *, int, int, char *, int);
static const struct dquot_operations reiserfs_quota_operations = {
- .initialize = dquot_initialize,
.write_dquot = reiserfs_write_dquot,
.acquire_dquot = reiserfs_acquire_dquot,
.release_dquot = reiserfs_release_dquot,
Index: linux-2.6/fs/udf/ialloc.c
===================================================================
--- linux-2.6.orig/fs/udf/ialloc.c 2010-02-20 11:59:10.818035510 +0100
+++ linux-2.6/fs/udf/ialloc.c 2010-02-20 12:04:17.312280167 +0100
@@ -153,7 +153,7 @@ struct inode *udf_new_inode(struct inode
insert_inode_hash(inode);
mark_inode_dirty(inode);
- vfs_dq_init(inode);
+ dquot_initialize(inode);
if (dquot_alloc_inode(inode)) {
dquot_drop(inode);
inode->i_flags |= S_NOQUOTA;
Index: linux-2.6/fs/ufs/ialloc.c
===================================================================
--- linux-2.6.orig/fs/ufs/ialloc.c 2010-02-20 11:59:10.819293437 +0100
+++ linux-2.6/fs/ufs/ialloc.c 2010-02-20 12:04:17.314255653 +0100
@@ -355,7 +355,7 @@ cg_found:
unlock_super (sb);
- vfs_dq_init(inode);
+ dquot_initialize(inode);
if (dquot_alloc_inode(inode)) {
dquot_drop(inode);
err = -EDQUOT;
Index: linux-2.6/fs/ufs/inode.c
===================================================================
--- linux-2.6.orig/fs/ufs/inode.c 2010-02-20 12:00:45.560257050 +0100
+++ linux-2.6/fs/ufs/inode.c 2010-02-20 12:04:17.317260053 +0100
@@ -910,7 +910,7 @@ void ufs_delete_inode (struct inode * in
loff_t old_i_size;
if (!is_bad_inode(inode))
- vfs_dq_init(inode);
+ dquot_initialize(inode);
truncate_inode_pages(&inode->i_data, 0);
if (is_bad_inode(inode))
Index: linux-2.6/include/linux/quota.h
===================================================================
--- linux-2.6.orig/include/linux/quota.h 2010-02-20 11:59:10.833269202 +0100
+++ linux-2.6/include/linux/quota.h 2010-02-20 12:04:17.321005059 +0100
@@ -295,7 +295,6 @@ struct quota_format_ops {
/* Operations working with dquots */
struct dquot_operations {
- int (*initialize) (struct inode *, int);
int (*write_dquot) (struct dquot *); /* Ordinary dquot write */
struct dquot *(*alloc_dquot)(struct super_block *, int); /* Allocate memory for new dquot */
void (*destroy_dquot)(struct dquot *); /* Free memory for dquot */
Index: linux-2.6/include/linux/quotaops.h
===================================================================
--- linux-2.6.orig/include/linux/quotaops.h 2010-02-20 12:00:45.701253558 +0100
+++ linux-2.6/include/linux/quotaops.h 2010-02-20 12:04:17.323004850 +0100
@@ -251,6 +251,8 @@ static inline int dquot_claim_space_nodi
return 0;
}
+#define dquot_file_open generic_file_open
+
#endif /* CONFIG_QUOTA */
static inline int dquot_alloc_space_nodirty(struct inode *inode, qsize_t nr)
@@ -335,6 +337,4 @@ static inline void dquot_release_reserva
__dquot_free_space(inode, nr << inode->i_blkbits, 1);
}
-#define dquot_file_open generic_file_open
-
#endif /* _LINUX_QUOTAOPS_ */
Index: linux-2.6/fs/ext2/namei.c
===================================================================
--- linux-2.6.orig/fs/ext2/namei.c 2010-02-20 12:00:45.577006037 +0100
+++ linux-2.6/fs/ext2/namei.c 2010-02-20 12:04:17.327005897 +0100
@@ -102,7 +102,7 @@ static int ext2_create (struct inode * d
{
struct inode *inode;
- vfs_dq_init(dir);
+ dquot_initialize(dir);
inode = ext2_new_inode(dir, mode);
if (IS_ERR(inode))
@@ -131,7 +131,7 @@ static int ext2_mknod (struct inode * di
if (!new_valid_dev(rdev))
return -EINVAL;
- vfs_dq_init(dir);
+ dquot_initialize(dir);
inode = ext2_new_inode (dir, mode);
err = PTR_ERR(inode);
@@ -157,7 +157,7 @@ static int ext2_symlink (struct inode *
if (l > sb->s_blocksize)
goto out;
- vfs_dq_init(dir);
+ dquot_initialize(dir);
inode = ext2_new_inode (dir, S_IFLNK | S_IRWXUGO);
err = PTR_ERR(inode);
@@ -202,7 +202,7 @@ static int ext2_link (struct dentry * ol
if (inode->i_nlink >= EXT2_LINK_MAX)
return -EMLINK;
- vfs_dq_init(dir);
+ dquot_initialize(dir);
inode->i_ctime = CURRENT_TIME_SEC;
inode_inc_link_count(inode);
@@ -226,7 +226,7 @@ static int ext2_mkdir(struct inode * dir
if (dir->i_nlink >= EXT2_LINK_MAX)
goto out;
- vfs_dq_init(dir);
+ dquot_initialize(dir);
inode_inc_link_count(dir);
@@ -274,7 +274,7 @@ static int ext2_unlink(struct inode * di
struct page * page;
int err = -ENOENT;
- vfs_dq_init(dir);
+ dquot_initialize(dir);
de = ext2_find_entry (dir, &dentry->d_name, &page);
if (!de)
@@ -318,8 +318,8 @@ static int ext2_rename (struct inode * o
struct ext2_dir_entry_2 * old_de;
int err = -ENOENT;
- vfs_dq_init(old_dir);
- vfs_dq_init(new_dir);
+ dquot_initialize(old_dir);
+ dquot_initialize(new_dir);
old_de = ext2_find_entry (old_dir, &old_dentry->d_name, &old_page);
if (!old_de)
Index: linux-2.6/fs/jfs/file.c
===================================================================
--- linux-2.6.orig/fs/jfs/file.c 2010-02-20 12:00:45.672027269 +0100
+++ linux-2.6/fs/jfs/file.c 2010-02-20 12:04:17.332255653 +0100
@@ -99,7 +99,7 @@ int jfs_setattr(struct dentry *dentry, s
return rc;
if (iattr->ia_valid & ATTR_SIZE)
- vfs_dq_init(inode);
+ dquot_initialize(inode);
if ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) ||
(iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid)) {
rc = dquot_transfer(inode, iattr);
Index: linux-2.6/fs/ocfs2/file.c
===================================================================
--- linux-2.6.orig/fs/ocfs2/file.c 2010-02-20 12:00:45.648255722 +0100
+++ linux-2.6/fs/ocfs2/file.c 2010-02-20 12:04:17.337268643 +0100
@@ -108,7 +108,7 @@ static int ocfs2_file_open(struct inode
file->f_path.dentry->d_name.len, file->f_path.dentry->d_name.name);
if (file->f_mode & FMODE_WRITE)
- vfs_dq_init(inode);
+ dquot_initialize(inode);
spin_lock(&oi->ip_lock);
@@ -980,7 +980,7 @@ int ocfs2_setattr(struct dentry *dentry,
return status;
if (attr->ia_valid & ATTR_SIZE)
- vfs_dq_init(inode);
+ dquot_initialize(inode);
size_change = S_ISREG(inode->i_mode) && attr->ia_valid & ATTR_SIZE;
if (size_change) {
Index: linux-2.6/fs/ufs/namei.c
===================================================================
--- linux-2.6.orig/fs/ufs/namei.c 2010-02-20 12:00:45.638255862 +0100
+++ linux-2.6/fs/ufs/namei.c 2010-02-20 12:04:17.353254675 +0100
@@ -86,7 +86,7 @@ static int ufs_create (struct inode * di
UFSD("BEGIN\n");
- vfs_dq_init(dir);
+ dquot_initialize(dir);
inode = ufs_new_inode(dir, mode);
err = PTR_ERR(inode);
@@ -112,7 +112,7 @@ static int ufs_mknod (struct inode * dir
if (!old_valid_dev(rdev))
return -EINVAL;
- vfs_dq_init(dir);
+ dquot_initialize(dir);
inode = ufs_new_inode(dir, mode);
err = PTR_ERR(inode);
@@ -138,7 +138,7 @@ static int ufs_symlink (struct inode * d
if (l > sb->s_blocksize)
goto out_notlocked;
- vfs_dq_init(dir);
+ dquot_initialize(dir);
lock_kernel();
inode = ufs_new_inode(dir, S_IFLNK | S_IRWXUGO);
@@ -185,7 +185,7 @@ static int ufs_link (struct dentry * old
return -EMLINK;
}
- vfs_dq_init(dir);
+ dquot_initialize(dir);
inode->i_ctime = CURRENT_TIME_SEC;
inode_inc_link_count(inode);
@@ -204,7 +204,7 @@ static int ufs_mkdir(struct inode * dir,
if (dir->i_nlink >= UFS_LINK_MAX)
goto out;
- vfs_dq_init(dir);
+ dquot_initialize(dir);
lock_kernel();
inode_inc_link_count(dir);
@@ -250,7 +250,7 @@ static int ufs_unlink(struct inode *dir,
struct page *page;
int err = -ENOENT;
- vfs_dq_init(dir);
+ dquot_initialize(dir);
de = ufs_find_entry(dir, &dentry->d_name, &page);
if (!de)
@@ -296,8 +296,8 @@ static int ufs_rename(struct inode *old_
struct ufs_dir_entry *old_de;
int err = -ENOENT;
- vfs_dq_init(old_dir);
- vfs_dq_init(new_dir);
+ dquot_initialize(old_dir);
+ dquot_initialize(new_dir);
old_de = ufs_find_entry(old_dir, &old_dentry->d_name, &old_page);
if (!old_de)
Index: linux-2.6/fs/ext2/file.c
===================================================================
--- linux-2.6.orig/fs/ext2/file.c 2010-02-20 12:00:45.675031669 +0100
+++ linux-2.6/fs/ext2/file.c 2010-02-20 12:04:17.357255234 +0100
@@ -20,6 +20,7 @@
#include <linux/time.h>
#include <linux/pagemap.h>
+#include <linux/quotaops.h>
#include "ext2.h"
#include "xattr.h"
#include "acl.h"
Index: linux-2.6/fs/ext3/file.c
===================================================================
--- linux-2.6.orig/fs/ext3/file.c 2010-02-20 12:00:45.679005408 +0100
+++ linux-2.6/fs/ext3/file.c 2010-02-20 12:04:17.360281844 +0100
@@ -21,6 +21,7 @@
#include <linux/time.h>
#include <linux/fs.h>
#include <linux/jbd.h>
+#include <linux/quotaops.h>
#include <linux/ext3_fs.h>
#include <linux/ext3_jbd.h>
#include "xattr.h"
Index: linux-2.6/fs/ext4/file.c
===================================================================
--- linux-2.6.orig/fs/ext4/file.c 2010-02-20 12:00:45.682007294 +0100
+++ linux-2.6/fs/ext4/file.c 2010-02-20 12:04:17.363282472 +0100
@@ -23,6 +23,7 @@
#include <linux/jbd2.h>
#include <linux/mount.h>
#include <linux/path.h>
+#include <linux/quotaops.h>
#include "ext4.h"
#include "ext4_jbd2.h"
#include "xattr.h"
Index: linux-2.6/fs/ufs/file.c
===================================================================
--- linux-2.6.orig/fs/ufs/file.c 2010-02-20 12:00:45.699274231 +0100
+++ linux-2.6/fs/ufs/file.c 2010-02-20 12:04:17.366284079 +0100
@@ -24,6 +24,7 @@
*/
#include <linux/fs.h>
+#include <linux/quotaops.h>
#include "ufs_fs.h"
#include "ufs.h"
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
