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

Commit 556a2a45 authored by Jan Kara's avatar Jan Kara Committed by Linus Torvalds
Browse files

[PATCH] quota: reiserfs: improve quota credit estimates 



Use improved credits estimates for quota operations.  Also reserve space
for a quota operation in a transaction only if filesystem was mounted with
some quota option.

Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1f54587b

fs/reiserfs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static int reiserfs_allocate_blocks_for_region( 
    /* If we came here, it means we absolutely need to open a transaction,

       since we need to allocate some blocks */

    reiserfs_write_lock(inode->i_sb); // Journaling stuff and we need that.

    res = journal_begin(th, inode->i_sb, JOURNAL_PER_BALANCE_CNT * 3 + 1 + 2 * REISERFS_QUOTA_TRANS_BLOCKS); // Wish I know if this number enough

    res = journal_begin(th, inode->i_sb, JOURNAL_PER_BALANCE_CNT * 3 + 1 + 2 * REISERFS_QUOTA_TRANS_BLOCKS(inode->i_sb)); // Wish I know if this number enough

    if (res)

        goto error_exit;

    reiserfs_update_inode_transaction(inode) ;
@@ -576,7 +576,7 @@ error_exit: 
        int err;

        // update any changes we made to blk count

        reiserfs_update_sd(th, inode);

        err = journal_end(th, inode->i_sb, JOURNAL_PER_BALANCE_CNT * 3 + 1 + 2 * REISERFS_QUOTA_TRANS_BLOCKS);

        err = journal_end(th, inode->i_sb, JOURNAL_PER_BALANCE_CNT * 3 + 1 + 2 * REISERFS_QUOTA_TRANS_BLOCKS(inode->i_sb));

        if (err)

            res = err;

    }

fs/reiserfs/inode.c

+6 −5
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ static int reiserfs_prepare_write(struct file *f, struct page *page, 
void reiserfs_delete_inode (struct inode * inode)

{

    /* We need blocks for transaction + (user+group) quota update (possibly delete) */

    int jbegin_count = JOURNAL_PER_BALANCE_CNT * 2 + 2 * REISERFS_QUOTA_INIT_BLOCKS;

    int jbegin_count = JOURNAL_PER_BALANCE_CNT * 2 + 2 * REISERFS_QUOTA_INIT_BLOCKS(inode->i_sb);

    struct reiserfs_transaction_handle th ;

  

    reiserfs_write_lock(inode->i_sb);
@@ -591,7 +591,7 @@ int reiserfs_get_block (struct inode * inode, sector_t block, 
       XXX in practically impossible worst case direct2indirect()

       can incur (much) more than 3 balancings.

       quota update for user, group */

    int jbegin_count = JOURNAL_PER_BALANCE_CNT * 3 + 1 + 2 * REISERFS_QUOTA_TRANS_BLOCKS;

    int jbegin_count = JOURNAL_PER_BALANCE_CNT * 3 + 1 + 2 * REISERFS_QUOTA_TRANS_BLOCKS(inode->i_sb);

    int version;

    int dangle = 1;

    loff_t new_offset = (((loff_t)block) << inode->i_sb->s_blocksize_bits) + 1 ;
@@ -2796,14 +2796,15 @@ int reiserfs_setattr(struct dentry *dentry, struct iattr *attr) { 


                if (!error) {

		    struct reiserfs_transaction_handle th;

		    int jbegin_count = 2*(REISERFS_QUOTA_INIT_BLOCKS(inode->i_sb)+REISERFS_QUOTA_DEL_BLOCKS(inode->i_sb))+2;



		    /* (user+group)*(old+new) structure - we count quota info and , inode write (sb, inode) */

		    error = journal_begin(&th, inode->i_sb, 4*REISERFS_QUOTA_INIT_BLOCKS+2);

		    error = journal_begin(&th, inode->i_sb, jbegin_count);

 		    if (error)

 			goto out;

                    error = DQUOT_TRANSFER(inode, attr) ? -EDQUOT : 0;

		    if (error) {

			journal_end(&th, inode->i_sb, 4*REISERFS_QUOTA_INIT_BLOCKS+2);

			journal_end(&th, inode->i_sb, jbegin_count);

			goto out;

		    }

		    /* Update corresponding info in inode so that everything is in
@@ -2813,7 +2814,7 @@ int reiserfs_setattr(struct dentry *dentry, struct iattr *attr) { 
		    if (attr->ia_valid & ATTR_GID)

			inode->i_gid = attr->ia_gid;

		    mark_inode_dirty(inode);

		    error = journal_end(&th, inode->i_sb, 4*REISERFS_QUOTA_INIT_BLOCKS+2);

		    error = journal_end(&th, inode->i_sb, jbegin_count);

		}

        }

        if (!error)

fs/reiserfs/namei.c

+14 −11
Original line number Diff line number Diff line
@@ -586,7 +586,7 @@ static int reiserfs_create (struct inode * dir, struct dentry *dentry, int mode, 
    int retval;

    struct inode * inode;

    /* We need blocks for transaction + (user+group)*(quotas for new inode + update of quota for directory owner) */

    int jbegin_count = JOURNAL_PER_BALANCE_CNT * 2 + 2 * (REISERFS_QUOTA_INIT_BLOCKS+REISERFS_QUOTA_TRANS_BLOCKS);

    int jbegin_count = JOURNAL_PER_BALANCE_CNT * 2 + 2 * (REISERFS_QUOTA_INIT_BLOCKS(dir->i_sb)+REISERFS_QUOTA_TRANS_BLOCKS(dir->i_sb));

    struct reiserfs_transaction_handle th ;

    int locked;
@@ -653,7 +653,7 @@ static int reiserfs_mknod (struct inode * dir, struct dentry *dentry, int mode, 
    struct inode * inode;

    struct reiserfs_transaction_handle th ;

    /* We need blocks for transaction + (user+group)*(quotas for new inode + update of quota for directory owner) */

    int jbegin_count = JOURNAL_PER_BALANCE_CNT * 3 + 2 * (REISERFS_QUOTA_INIT_BLOCKS+REISERFS_QUOTA_TRANS_BLOCKS);

    int jbegin_count = JOURNAL_PER_BALANCE_CNT * 3 + 2 * (REISERFS_QUOTA_INIT_BLOCKS(dir->i_sb)+REISERFS_QUOTA_TRANS_BLOCKS(dir->i_sb));

    int locked;



    if (!new_valid_dev(rdev))
@@ -727,7 +727,7 @@ static int reiserfs_mkdir (struct inode * dir, struct dentry *dentry, int mode) 
    struct inode * inode;

    struct reiserfs_transaction_handle th ;

    /* We need blocks for transaction + (user+group)*(quotas for new inode + update of quota for directory owner) */

    int jbegin_count = JOURNAL_PER_BALANCE_CNT * 3 + 2 * (REISERFS_QUOTA_INIT_BLOCKS+REISERFS_QUOTA_TRANS_BLOCKS);

    int jbegin_count = JOURNAL_PER_BALANCE_CNT * 3 + 2 * (REISERFS_QUOTA_INIT_BLOCKS(dir->i_sb)+REISERFS_QUOTA_TRANS_BLOCKS(dir->i_sb));

    int locked;



#ifdef DISPLACE_NEW_PACKING_LOCALITIES
@@ -829,8 +829,10 @@ static int reiserfs_rmdir (struct inode * dir, struct dentry *dentry) 




    /* we will be doing 2 balancings and update 2 stat data, we change quotas

     * of the owner of the directory and of the owner of the parent directory */

    jbegin_count = JOURNAL_PER_BALANCE_CNT * 2 + 2 + 2 * (REISERFS_QUOTA_INIT_BLOCKS+REISERFS_QUOTA_TRANS_BLOCKS);

     * of the owner of the directory and of the owner of the parent directory.

     * The quota structure is possibly deleted only on last iput => outside

     * of this transaction */

    jbegin_count = JOURNAL_PER_BALANCE_CNT * 2 + 2 + 4 * REISERFS_QUOTA_TRANS_BLOCKS(dir->i_sb);



    reiserfs_write_lock(dir->i_sb);

    retval = journal_begin(&th, dir->i_sb, jbegin_count) ;
@@ -913,9 +915,10 @@ static int reiserfs_unlink (struct inode * dir, struct dentry *dentry) 
    inode = dentry->d_inode;



    /* in this transaction we can be doing at max two balancings and update

       two stat datas, we change quotas of the owner of the directory and of

       the owner of the parent directory */

    jbegin_count = JOURNAL_PER_BALANCE_CNT * 2 + 2 + 2 * (REISERFS_QUOTA_INIT_BLOCKS+REISERFS_QUOTA_TRANS_BLOCKS);

     * two stat datas, we change quotas of the owner of the directory and of

     * the owner of the parent directory. The quota structure is possibly

     * deleted only on iput => outside of this transaction */

    jbegin_count = JOURNAL_PER_BALANCE_CNT * 2 + 2 + 4 * REISERFS_QUOTA_TRANS_BLOCKS(dir->i_sb);



    reiserfs_write_lock(dir->i_sb);

    retval = journal_begin(&th, dir->i_sb, jbegin_count) ;
@@ -1000,7 +1003,7 @@ static int reiserfs_symlink (struct inode * parent_dir, 
    struct reiserfs_transaction_handle th ;

    int mode = S_IFLNK | S_IRWXUGO;

    /* We need blocks for transaction + (user+group)*(quotas for new inode + update of quota for directory owner) */

    int jbegin_count = JOURNAL_PER_BALANCE_CNT * 3 + 2 * (REISERFS_QUOTA_INIT_BLOCKS+REISERFS_QUOTA_TRANS_BLOCKS);

    int jbegin_count = JOURNAL_PER_BALANCE_CNT * 3 + 2 * (REISERFS_QUOTA_INIT_BLOCKS(parent_dir->i_sb)+REISERFS_QUOTA_TRANS_BLOCKS(parent_dir->i_sb));



    if (!(inode = new_inode(parent_dir->i_sb))) {

	return -ENOMEM ;
@@ -1076,7 +1079,7 @@ static int reiserfs_link (struct dentry * old_dentry, struct inode * dir, struct 
    struct inode *inode = old_dentry->d_inode;

    struct reiserfs_transaction_handle th ;

    /* We need blocks for transaction + update of quotas for the owners of the directory */

    int jbegin_count = JOURNAL_PER_BALANCE_CNT * 3 + 2 * REISERFS_QUOTA_TRANS_BLOCKS;

    int jbegin_count = JOURNAL_PER_BALANCE_CNT * 3 + 2 * REISERFS_QUOTA_TRANS_BLOCKS(dir->i_sb);



    reiserfs_write_lock(dir->i_sb);

    if (inode->i_nlink >= REISERFS_LINK_MAX) {
@@ -1196,7 +1199,7 @@ static int reiserfs_rename (struct inode * old_dir, struct dentry *old_dentry, 
       pointed initially and (5) maybe block containing ".." of

       renamed directory

       quota updates: two parent directories */

    jbegin_count = JOURNAL_PER_BALANCE_CNT * 3 + 5 + 4 * REISERFS_QUOTA_TRANS_BLOCKS;

    jbegin_count = JOURNAL_PER_BALANCE_CNT * 3 + 5 + 4 * REISERFS_QUOTA_TRANS_BLOCKS(old_dir->i_sb);



    old_inode = old_dentry->d_inode;

    new_dentry_inode = new_dentry->d_inode;

fs/reiserfs/super.c

+23 −12
Original line number Diff line number Diff line
@@ -866,8 +866,9 @@ static int reiserfs_parse_options (struct super_block * s, char * options, /* st 
	{"jdev",	.arg_required = 'j', .values = NULL},

	{"nolargeio",	.arg_required = 'w', .values = NULL},

	{"commit",	.arg_required = 'c', .values = NULL},

	{"usrquota",},

	{"grpquota",},

	{"usrquota",	.setmask = 1<<REISERFS_QUOTA},

	{"grpquota",	.setmask = 1<<REISERFS_QUOTA},

	{"noquota",	.clrmask = 1<<REISERFS_QUOTA},

	{"errors", 	.arg_required = 'e', .values = error_actions},

	{"usrjquota",	.arg_required = 'u'|(1<<REISERFS_OPT_ALLOWEMPTY), .values = NULL},

	{"grpjquota",	.arg_required = 'g'|(1<<REISERFS_OPT_ALLOWEMPTY), .values = NULL},
@@ -964,6 +965,7 @@ static int reiserfs_parse_options (struct super_block * s, char * options, /* st 
		    return 0;

		}

		strcpy(REISERFS_SB(s)->s_qf_names[qtype], arg);

		*mount_options |= 1<<REISERFS_QUOTA;

	    }

	    else {

		if (REISERFS_SB(s)->s_qf_names[qtype]) {
@@ -995,7 +997,13 @@ static int reiserfs_parse_options (struct super_block * s, char * options, /* st 
	reiserfs_warning(s, "reiserfs_parse_options: journalled quota format not specified.");

	return 0;

    }

    /* This checking is not precise wrt the quota type but for our purposes it is sufficient */

    if (!(*mount_options & (1<<REISERFS_QUOTA)) && sb_any_quota_enabled(s)) {

	reiserfs_warning(s, "reiserfs_parse_options: quota options must be present when quota is turned on.");

	return 0;

    }

#endif



    return 1;

}
@@ -1105,6 +1113,7 @@ static int reiserfs_remount (struct super_block * s, int * mount_flags, char * a 
  safe_mask |= 1 << REISERFS_ERROR_RO;

  safe_mask |= 1 << REISERFS_ERROR_CONTINUE;

  safe_mask |= 1 << REISERFS_ERROR_PANIC;

  safe_mask |= 1 << REISERFS_QUOTA;



  /* Update the bitmask, taking care to keep

   * the bits we're not allowed to change here */
@@ -1845,11 +1854,11 @@ static int reiserfs_dquot_initialize(struct inode *inode, int type) 


    /* We may create quota structure so we need to reserve enough blocks */

    reiserfs_write_lock(inode->i_sb);

    ret = journal_begin(&th, inode->i_sb, 2*REISERFS_QUOTA_INIT_BLOCKS);

    ret = journal_begin(&th, inode->i_sb, 2*REISERFS_QUOTA_INIT_BLOCKS(inode->i_sb));

    if (ret)

	goto out;

    ret = dquot_initialize(inode, type);

    err = journal_end(&th, inode->i_sb, 2*REISERFS_QUOTA_INIT_BLOCKS);

    err = journal_end(&th, inode->i_sb, 2*REISERFS_QUOTA_INIT_BLOCKS(inode->i_sb));

    if (!ret && err)

	ret = err;

out:
@@ -1864,11 +1873,11 @@ static int reiserfs_dquot_drop(struct inode *inode) 


    /* We may delete quota structure so we need to reserve enough blocks */

    reiserfs_write_lock(inode->i_sb);

    ret = journal_begin(&th, inode->i_sb, 2*REISERFS_QUOTA_INIT_BLOCKS);

    ret = journal_begin(&th, inode->i_sb, 2*REISERFS_QUOTA_DEL_BLOCKS(inode->i_sb));

    if (ret)

 	goto out;

    ret = dquot_drop(inode);

    err = journal_end(&th, inode->i_sb, 2*REISERFS_QUOTA_INIT_BLOCKS);

    err = journal_end(&th, inode->i_sb, 2*REISERFS_QUOTA_DEL_BLOCKS(inode->i_sb));

    if (!ret && err)

	ret = err;

out:
@@ -1882,11 +1891,11 @@ static int reiserfs_write_dquot(struct dquot *dquot) 
    int ret, err;



    reiserfs_write_lock(dquot->dq_sb);

    ret = journal_begin(&th, dquot->dq_sb, REISERFS_QUOTA_TRANS_BLOCKS);

    ret = journal_begin(&th, dquot->dq_sb, REISERFS_QUOTA_TRANS_BLOCKS(dquot->dq_sb));

    if (ret)

	goto out;

    ret = dquot_commit(dquot);

    err = journal_end(&th, dquot->dq_sb, REISERFS_QUOTA_TRANS_BLOCKS);

    err = journal_end(&th, dquot->dq_sb, REISERFS_QUOTA_TRANS_BLOCKS(dquot->dq_sb));

    if (!ret && err)

	ret = err;

out:
@@ -1900,11 +1909,11 @@ static int reiserfs_acquire_dquot(struct dquot *dquot) 
    int ret, err;



    reiserfs_write_lock(dquot->dq_sb);

    ret = journal_begin(&th, dquot->dq_sb, REISERFS_QUOTA_INIT_BLOCKS);

    ret = journal_begin(&th, dquot->dq_sb, REISERFS_QUOTA_INIT_BLOCKS(dquot->dq_sb));

    if (ret)

	goto out;

    ret = dquot_acquire(dquot);

    err = journal_end(&th, dquot->dq_sb, REISERFS_QUOTA_INIT_BLOCKS);

    err = journal_end(&th, dquot->dq_sb, REISERFS_QUOTA_INIT_BLOCKS(dquot->dq_sb));

    if (!ret && err)

	ret = err;

out:
@@ -1918,11 +1927,11 @@ static int reiserfs_release_dquot(struct dquot *dquot) 
    int ret, err;



    reiserfs_write_lock(dquot->dq_sb);

    ret = journal_begin(&th, dquot->dq_sb, REISERFS_QUOTA_INIT_BLOCKS);

    ret = journal_begin(&th, dquot->dq_sb, REISERFS_QUOTA_DEL_BLOCKS(dquot->dq_sb));

    if (ret)

 	goto out;

    ret = dquot_release(dquot);

    err = journal_end(&th, dquot->dq_sb, REISERFS_QUOTA_INIT_BLOCKS);

    err = journal_end(&th, dquot->dq_sb, REISERFS_QUOTA_DEL_BLOCKS(dquot->dq_sb));

    if (!ret && err)

	ret = err;

out:
@@ -1978,6 +1987,8 @@ static int reiserfs_quota_on(struct super_block *sb, int type, int format_id, ch 
    int err;

    struct nameidata nd;



    if (!(REISERFS_SB(sb)->s_mount_opt & (1<<REISERFS_QUOTA)))

	return -EINVAL;

    err = path_lookup(path, LOOKUP_FOLLOW, &nd);

    if (err)

        return err;

include/linux/reiserfs_fs.h

+11 −4
Original line number Diff line number Diff line
@@ -1644,11 +1644,18 @@ struct reiserfs_journal_header { 
#define JOURNAL_MAX_TRANS_AGE 30

#define JOURNAL_PER_BALANCE_CNT (3 * (MAX_HEIGHT-2) + 9)

#ifdef CONFIG_QUOTA

#define REISERFS_QUOTA_TRANS_BLOCKS 2	/* We need to update data and inode (atime) */

#define REISERFS_QUOTA_INIT_BLOCKS (DQUOT_MAX_WRITES*(JOURNAL_PER_BALANCE_CNT+2)+1)	/* 1 balancing, 1 bitmap, 1 data per write + stat data update */

/* We need to update data and inode (atime) */

#define REISERFS_QUOTA_TRANS_BLOCKS(s) (REISERFS_SB(s)->s_mount_opt & (1<<REISERFS_QUOTA) ? 2 : 0)

/* 1 balancing, 1 bitmap, 1 data per write + stat data update */

#define REISERFS_QUOTA_INIT_BLOCKS(s) (REISERFS_SB(s)->s_mount_opt & (1<<REISERFS_QUOTA) ? \

(DQUOT_INIT_ALLOC*(JOURNAL_PER_BALANCE_CNT+2)+DQUOT_INIT_REWRITE+1) : 0)

/* same as with INIT */

#define REISERFS_QUOTA_DEL_BLOCKS(s) (REISERFS_SB(s)->s_mount_opt & (1<<REISERFS_QUOTA) ? \

(DQUOT_DEL_ALLOC*(JOURNAL_PER_BALANCE_CNT+2)+DQUOT_DEL_REWRITE+1) : 0)

#else

#define REISERFS_QUOTA_TRANS_BLOCKS 0

#define REISERFS_QUOTA_INIT_BLOCKS 0

#define REISERFS_QUOTA_TRANS_BLOCKS(s) 0

#define REISERFS_QUOTA_INIT_BLOCKS(s) 0

#define REISERFS_QUOTA_DEL_BLOCKS(s) 0

#endif



/* both of these can be as low as 1, or as high as you want.  The min is the