lkml.org 
[lkml]   [2009]   [Jan]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: [PATCH 10/11] ext4: Remove unnecessary quota functions
    From
    Date

    在 2009-01-16五的 19:08 +0100,Jan Kara写道:
    > ext4_dquot_initialize() and ext4_dquot_drop() is no longer
    > needed because of modified quota locking.
    >
    > Signed-off-by: Jan Kara <jack@suse.cz>

    Reviewed_by: Mingming Cao <cmm@us.ibm.com>
    > ---
    > fs/ext4/super.c | 44 ++------------------------------------------
    > 1 files changed, 2 insertions(+), 42 deletions(-)
    >
    > diff --git a/fs/ext4/super.c b/fs/ext4/super.c
    > index e5f06a5..f0785fd 100644
    > --- a/fs/ext4/super.c
    > +++ b/fs/ext4/super.c
    > @@ -926,8 +926,6 @@ static int bdev_try_to_free_page(struct super_block *sb, struct page *page, gfp_
    > #define QTYPE2NAME(t) ((t) == USRQUOTA ? "user" : "group")
    > #define QTYPE2MOPT(on, t) ((t) == USRQUOTA?((on)##USRJQUOTA):((on)##GRPJQUOTA))
    >
    > -static int ext4_dquot_initialize(struct inode *inode, int type);
    > -static int ext4_dquot_drop(struct inode *inode);
    > static int ext4_write_dquot(struct dquot *dquot);
    > static int ext4_acquire_dquot(struct dquot *dquot);
    > static int ext4_release_dquot(struct dquot *dquot);
    > @@ -942,8 +940,8 @@ static ssize_t ext4_quota_write(struct super_block *sb, int type,
    > const char *data, size_t len, loff_t off);
    >
    > static struct dquot_operations ext4_quota_operations = {
    > - .initialize = ext4_dquot_initialize,
    > - .drop = ext4_dquot_drop,
    > + .initialize = dquot_initialize,
    > + .drop = dquot_drop,
    > .alloc_space = dquot_alloc_space,
    > .alloc_inode = dquot_alloc_inode,
    > .free_space = dquot_free_space,
    > @@ -3378,44 +3376,6 @@ static inline struct inode *dquot_to_inode(struct dquot *dquot)
    > return sb_dqopt(dquot->dq_sb)->files[dquot->dq_type];
    > }
    >
    > -static int ext4_dquot_initialize(struct inode *inode, int type)
    > -{
    > - handle_t *handle;
    > - int ret, err;
    > -
    > - /* We may create quota structure so we need to reserve enough blocks */
    > - handle = ext4_journal_start(inode, 2*EXT4_QUOTA_INIT_BLOCKS(inode->i_sb));
    > - if (IS_ERR(handle))
    > - return PTR_ERR(handle);
    > - ret = dquot_initialize(inode, type);
    > - err = ext4_journal_stop(handle);
    > - if (!ret)
    > - ret = err;
    > - return ret;
    > -}
    > -
    > -static int ext4_dquot_drop(struct inode *inode)
    > -{
    > - handle_t *handle;
    > - int ret, err;
    > -
    > - /* We may delete quota structure so we need to reserve enough blocks */
    > - handle = ext4_journal_start(inode, 2*EXT4_QUOTA_DEL_BLOCKS(inode->i_sb));
    > - if (IS_ERR(handle)) {
    > - /*
    > - * We call dquot_drop() anyway to at least release references
    > - * to quota structures so that umount does not hang.
    > - */
    > - dquot_drop(inode);
    > - return PTR_ERR(handle);
    > - }
    > - ret = dquot_drop(inode);
    > - err = ext4_journal_stop(handle);
    > - if (!ret)
    > - ret = err;
    > - return ret;
    > -}
    > -
    > static int ext4_write_dquot(struct dquot *dquot)
    > {
    > int ret, err;

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2009-01-20 23:05    [W:0.033 / U:29.416 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site