openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

jfs: Use lowercase names of quota functions 

Use lowercase names of quota functions instead of old uppercase ones.

Signed-off-by: Jan Kara <jack@suse.cz>
Acked-by: Dave Kleikamp <shaggy@austin.ibm.com>
This commit is contained in:
Jan Kara 2009-01-26 17:22:32 +01:00
parent bacfb7c2e5
commit c94d2a22f2
8 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/jfs/acl.c
View File

@ -233,7 +233,7 @@ int jfs_setattr(struct dentry *dentry, struct iattr *iattr)
if ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) || if ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) ||
(iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid)) { (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid)) {
if (DQUOT_TRANSFER(inode, iattr)) if (vfs_dq_transfer(inode, iattr))
return -EDQUOT; return -EDQUOT;
} }

6
fs/jfs/inode.c
View File

@ -158,9 +158,9 @@ void jfs_delete_inode(struct inode *inode)
/* /*
* Free the inode from the quota allocation. * Free the inode from the quota allocation.
*/ */
DQUOT_INIT(inode); vfs_dq_init(inode);
DQUOT_FREE_INODE(inode); vfs_dq_free_inode(inode);
DQUOT_DROP(inode); vfs_dq_drop(inode);
} }
clear_inode(inode); clear_inode(inode);

18
fs/jfs/jfs_dtree.c
View File

@ -381,10 +381,10 @@ static u32 add_index(tid_t tid, struct inode *ip, s64 bn, int slot)
* It's time to move the inline table to an external * It's time to move the inline table to an external
* page and begin to build the xtree * page and begin to build the xtree
*/ */
if (DQUOT_ALLOC_BLOCK(ip, sbi->nbperpage)) if (vfs_dq_alloc_block(ip, sbi->nbperpage))
goto clean_up; goto clean_up;
if (dbAlloc(ip, 0, sbi->nbperpage, &xaddr)) { if (dbAlloc(ip, 0, sbi->nbperpage, &xaddr)) {
DQUOT_FREE_BLOCK(ip, sbi->nbperpage); vfs_dq_free_block(ip, sbi->nbperpage);
goto clean_up; goto clean_up;
} }
@ -408,7 +408,7 @@ static u32 add_index(tid_t tid, struct inode *ip, s64 bn, int slot)
memcpy(&jfs_ip->i_dirtable, temp_table, memcpy(&jfs_ip->i_dirtable, temp_table,
sizeof (temp_table)); sizeof (temp_table));
dbFree(ip, xaddr, sbi->nbperpage); dbFree(ip, xaddr, sbi->nbperpage);
DQUOT_FREE_BLOCK(ip, sbi->nbperpage); vfs_dq_free_block(ip, sbi->nbperpage);
goto clean_up; goto clean_up;
} }
ip->i_size = PSIZE; ip->i_size = PSIZE;
@ -1027,7 +1027,7 @@ static int dtSplitUp(tid_t tid,
n = xlen; n = xlen;
/* Allocate blocks to quota. */ /* Allocate blocks to quota. */
if (DQUOT_ALLOC_BLOCK(ip, n)) { if (vfs_dq_alloc_block(ip, n)) {
rc = -EDQUOT; rc = -EDQUOT;
goto extendOut; goto extendOut;
} }
@ -1308,7 +1308,7 @@ static int dtSplitUp(tid_t tid,
/* Rollback quota allocation */ /* Rollback quota allocation */
if (rc && quota_allocation) if (rc && quota_allocation)
DQUOT_FREE_BLOCK(ip, quota_allocation); vfs_dq_free_block(ip, quota_allocation);
dtSplitUp_Exit: dtSplitUp_Exit:
@ -1369,7 +1369,7 @@ static int dtSplitPage(tid_t tid, struct inode *ip, struct dtsplit * split,
return -EIO; return -EIO;
/* Allocate blocks to quota. */ /* Allocate blocks to quota. */
if (DQUOT_ALLOC_BLOCK(ip, lengthPXD(pxd))) { if (vfs_dq_alloc_block(ip, lengthPXD(pxd))) {
release_metapage(rmp); release_metapage(rmp);
return -EDQUOT; return -EDQUOT;
} }
@ -1916,7 +1916,7 @@ static int dtSplitRoot(tid_t tid,
rp = rmp->data; rp = rmp->data;
/* Allocate blocks to quota. */ /* Allocate blocks to quota. */
if (DQUOT_ALLOC_BLOCK(ip, lengthPXD(pxd))) { if (vfs_dq_alloc_block(ip, lengthPXD(pxd))) {
release_metapage(rmp); release_metapage(rmp);
return -EDQUOT; return -EDQUOT;
} }
@ -2287,7 +2287,7 @@ static int dtDeleteUp(tid_t tid, struct inode *ip,
xlen = lengthPXD(&fp->header.self); xlen = lengthPXD(&fp->header.self);
/* Free quota allocation. */ /* Free quota allocation. */
DQUOT_FREE_BLOCK(ip, xlen); vfs_dq_free_block(ip, xlen);
/* free/invalidate its buffer page */ /* free/invalidate its buffer page */
discard_metapage(fmp); discard_metapage(fmp);
@ -2363,7 +2363,7 @@ static int dtDeleteUp(tid_t tid, struct inode *ip,
xlen = lengthPXD(&p->header.self); xlen = lengthPXD(&p->header.self);
/* Free quota allocation */ /* Free quota allocation */
DQUOT_FREE_BLOCK(ip, xlen); vfs_dq_free_block(ip, xlen);
/* free/invalidate its buffer page */ /* free/invalidate its buffer page */
discard_metapage(mp); discard_metapage(mp);

10
fs/jfs/jfs_extent.c
View File

@ -141,7 +141,7 @@ extAlloc(struct inode *ip, s64 xlen, s64 pno, xad_t * xp, bool abnr)
} }
/* Allocate blocks to quota. */ /* Allocate blocks to quota. */
if (DQUOT_ALLOC_BLOCK(ip, nxlen)) { if (vfs_dq_alloc_block(ip, nxlen)) {
dbFree(ip, nxaddr, (s64) nxlen); dbFree(ip, nxaddr, (s64) nxlen);
mutex_unlock(&JFS_IP(ip)->commit_mutex); mutex_unlock(&JFS_IP(ip)->commit_mutex);
return -EDQUOT; return -EDQUOT;
@ -164,7 +164,7 @@ extAlloc(struct inode *ip, s64 xlen, s64 pno, xad_t * xp, bool abnr)
*/ */
if (rc) { if (rc) {
dbFree(ip, nxaddr, nxlen); dbFree(ip, nxaddr, nxlen);
DQUOT_FREE_BLOCK(ip, nxlen); vfs_dq_free_block(ip, nxlen);
mutex_unlock(&JFS_IP(ip)->commit_mutex); mutex_unlock(&JFS_IP(ip)->commit_mutex);
return (rc); return (rc);
} }
@ -256,7 +256,7 @@ int extRealloc(struct inode *ip, s64 nxlen, xad_t * xp, bool abnr)
goto exit; goto exit;
/* Allocat blocks to quota. */ /* Allocat blocks to quota. */
if (DQUOT_ALLOC_BLOCK(ip, nxlen)) { if (vfs_dq_alloc_block(ip, nxlen)) {
dbFree(ip, nxaddr, (s64) nxlen); dbFree(ip, nxaddr, (s64) nxlen);
mutex_unlock(&JFS_IP(ip)->commit_mutex); mutex_unlock(&JFS_IP(ip)->commit_mutex);
return -EDQUOT; return -EDQUOT;
@ -297,7 +297,7 @@ int extRealloc(struct inode *ip, s64 nxlen, xad_t * xp, bool abnr)
/* extend the extent */ /* extend the extent */
if ((rc = xtExtend(0, ip, xoff + xlen, (int) nextend, 0))) { if ((rc = xtExtend(0, ip, xoff + xlen, (int) nextend, 0))) {
dbFree(ip, xaddr + xlen, delta); dbFree(ip, xaddr + xlen, delta);
DQUOT_FREE_BLOCK(ip, nxlen); vfs_dq_free_block(ip, nxlen);
goto exit; goto exit;
} }
} else { } else {
@ -308,7 +308,7 @@ int extRealloc(struct inode *ip, s64 nxlen, xad_t * xp, bool abnr)
*/ */
if ((rc = xtTailgate(0, ip, xoff, (int) ntail, nxaddr, 0))) { if ((rc = xtTailgate(0, ip, xoff, (int) ntail, nxaddr, 0))) {
dbFree(ip, nxaddr, nxlen); dbFree(ip, nxaddr, nxlen);
DQUOT_FREE_BLOCK(ip, nxlen); vfs_dq_free_block(ip, nxlen);
goto exit; goto exit;
} }
} }

4
fs/jfs/jfs_inode.c
View File

@ -116,7 +116,7 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
/* /*
* Allocate inode to quota. * Allocate inode to quota.
*/ */
if (DQUOT_ALLOC_INODE(inode)) { if (vfs_dq_alloc_inode(inode)) {
rc = -EDQUOT; rc = -EDQUOT;
goto fail_drop; goto fail_drop;
} }
@ -162,7 +162,7 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
return inode; return inode;
fail_drop: fail_drop:
DQUOT_DROP(inode); vfs_dq_drop(inode);
inode->i_flags |= S_NOQUOTA; inode->i_flags |= S_NOQUOTA;
fail_unlock: fail_unlock:
inode->i_nlink = 0; inode->i_nlink = 0;

14
fs/jfs/jfs_xtree.c
View File

@ -846,10 +846,10 @@ int xtInsert(tid_t tid, /* transaction id */
hint = addressXAD(xad) + lengthXAD(xad) - 1; hint = addressXAD(xad) + lengthXAD(xad) - 1;
} else } else
hint = 0; hint = 0;
if ((rc = DQUOT_ALLOC_BLOCK(ip, xlen))) if ((rc = vfs_dq_alloc_block(ip, xlen)))
goto out; goto out;
if ((rc = dbAlloc(ip, hint, (s64) xlen, &xaddr))) { if ((rc = dbAlloc(ip, hint, (s64) xlen, &xaddr))) {
DQUOT_FREE_BLOCK(ip, xlen); vfs_dq_free_block(ip, xlen);
goto out; goto out;
} }
} }
@ -878,7 +878,7 @@ int xtInsert(tid_t tid, /* transaction id */
/* undo data extent allocation */ /* undo data extent allocation */
if (*xaddrp == 0) { if (*xaddrp == 0) {
dbFree(ip, xaddr, (s64) xlen); dbFree(ip, xaddr, (s64) xlen);
DQUOT_FREE_BLOCK(ip, xlen); vfs_dq_free_block(ip, xlen);
} }
return rc; return rc;
} }
@ -1246,7 +1246,7 @@ xtSplitPage(tid_t tid, struct inode *ip,
rbn = addressPXD(pxd); rbn = addressPXD(pxd);
/* Allocate blocks to quota. */ /* Allocate blocks to quota. */
if (DQUOT_ALLOC_BLOCK(ip, lengthPXD(pxd))) { if (vfs_dq_alloc_block(ip, lengthPXD(pxd))) {
rc = -EDQUOT; rc = -EDQUOT;
goto clean_up; goto clean_up;
} }
@ -1456,7 +1456,7 @@ xtSplitPage(tid_t tid, struct inode *ip,
/* Rollback quota allocation. */ /* Rollback quota allocation. */
if (quota_allocation) if (quota_allocation)
DQUOT_FREE_BLOCK(ip, quota_allocation); vfs_dq_free_block(ip, quota_allocation);
return (rc); return (rc);
} }
@ -1513,7 +1513,7 @@ xtSplitRoot(tid_t tid,
return -EIO; return -EIO;
/* Allocate blocks to quota. */ /* Allocate blocks to quota. */
if (DQUOT_ALLOC_BLOCK(ip, lengthPXD(pxd))) { if (vfs_dq_alloc_block(ip, lengthPXD(pxd))) {
release_metapage(rmp); release_metapage(rmp);
return -EDQUOT; return -EDQUOT;
} }
@ -3941,7 +3941,7 @@ s64 xtTruncate(tid_t tid, struct inode *ip, s64 newsize, int flag)
ip->i_size = newsize; ip->i_size = newsize;
/* update quota allocation to reflect freed blocks */ /* update quota allocation to reflect freed blocks */
DQUOT_FREE_BLOCK(ip, nfreed); vfs_dq_free_block(ip, nfreed);
/* /*
* free tlock of invalidated pages * free tlock of invalidated pages

6
fs/jfs/namei.c
View File

@ -356,7 +356,7 @@ static int jfs_rmdir(struct inode *dip, struct dentry *dentry)
jfs_info("jfs_rmdir: dip:0x%p name:%s", dip, dentry->d_name.name); jfs_info("jfs_rmdir: dip:0x%p name:%s", dip, dentry->d_name.name);
/* Init inode for quota operations. */ /* Init inode for quota operations. */
DQUOT_INIT(ip); vfs_dq_init(ip);
/* directory must be empty to be removed */ /* directory must be empty to be removed */
if (!dtEmpty(ip)) { if (!dtEmpty(ip)) {
@ -483,7 +483,7 @@ static int jfs_unlink(struct inode *dip, struct dentry *dentry)
jfs_info("jfs_unlink: dip:0x%p name:%s", dip, dentry->d_name.name); jfs_info("jfs_unlink: dip:0x%p name:%s", dip, dentry->d_name.name);
/* Init inode for quota operations. */ /* Init inode for quota operations. */
DQUOT_INIT(ip); vfs_dq_init(ip);
if ((rc = get_UCSname(&dname, dentry))) if ((rc = get_UCSname(&dname, dentry)))
goto out; goto out;
@ -1136,7 +1136,7 @@ static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
} else if (new_ip) { } else if (new_ip) {
IWRITE_LOCK(new_ip, RDWRLOCK_NORMAL); IWRITE_LOCK(new_ip, RDWRLOCK_NORMAL);
/* Init inode for quota operations. */ /* Init inode for quota operations. */
DQUOT_INIT(new_ip); vfs_dq_init(new_ip);
} }
/* /*

12
fs/jfs/xattr.c
View File

@ -260,14 +260,14 @@ static int ea_write(struct inode *ip, struct jfs_ea_list *ealist, int size,
nblocks = (size + (sb->s_blocksize - 1)) >> sb->s_blocksize_bits; nblocks = (size + (sb->s_blocksize - 1)) >> sb->s_blocksize_bits;
/* Allocate new blocks to quota. */ /* Allocate new blocks to quota. */
if (DQUOT_ALLOC_BLOCK(ip, nblocks)) { if (vfs_dq_alloc_block(ip, nblocks)) {
return -EDQUOT; return -EDQUOT;
} }
rc = dbAlloc(ip, INOHINT(ip), nblocks, &blkno); rc = dbAlloc(ip, INOHINT(ip), nblocks, &blkno);
if (rc) { if (rc) {
/*Rollback quota allocation. */ /*Rollback quota allocation. */
DQUOT_FREE_BLOCK(ip, nblocks); vfs_dq_free_block(ip, nblocks);
return rc; return rc;
} }
@ -332,7 +332,7 @@ static int ea_write(struct inode *ip, struct jfs_ea_list *ealist, int size,
failed: failed:
/* Rollback quota allocation. */ /* Rollback quota allocation. */
DQUOT_FREE_BLOCK(ip, nblocks); vfs_dq_free_block(ip, nblocks);
dbFree(ip, blkno, nblocks); dbFree(ip, blkno, nblocks);
return rc; return rc;
@ -538,7 +538,7 @@ static int ea_get(struct inode *inode, struct ea_buffer *ea_buf, int min_size)
if (blocks_needed > current_blocks) { if (blocks_needed > current_blocks) {
/* Allocate new blocks to quota. */ /* Allocate new blocks to quota. */
if (DQUOT_ALLOC_BLOCK(inode, blocks_needed)) if (vfs_dq_alloc_block(inode, blocks_needed))
return -EDQUOT; return -EDQUOT;
quota_allocation = blocks_needed; quota_allocation = blocks_needed;
@ -602,7 +602,7 @@ static int ea_get(struct inode *inode, struct ea_buffer *ea_buf, int min_size)
clean_up: clean_up:
/* Rollback quota allocation */ /* Rollback quota allocation */
if (quota_allocation) if (quota_allocation)
DQUOT_FREE_BLOCK(inode, quota_allocation); vfs_dq_free_block(inode, quota_allocation);
return (rc); return (rc);
} }
@ -677,7 +677,7 @@ static int ea_put(tid_t tid, struct inode *inode, struct ea_buffer *ea_buf,
/* If old blocks exist, they must be removed from quota allocation. */ /* If old blocks exist, they must be removed from quota allocation. */
if (old_blocks) if (old_blocks)
DQUOT_FREE_BLOCK(inode, old_blocks); vfs_dq_free_block(inode, old_blocks);
inode->i_ctime = CURRENT_TIME; inode->i_ctime = CURRENT_TIME;