diff options
| author | Jan Kara <jack@suse.cz> | 2009-01-26 11:15:30 -0500 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2009-03-25 21:18:36 -0400 |
| commit | 5f5fa796c6b0158b50a2d5d2f80a926466ea87b3 (patch) | |
| tree | 43e21528fcc755e32aac0d2d007e7fa33c6d6a6d | |
| parent | 77db4f25bca22ce96be0cd3c5a3160599817ff45 (diff) | |
ufs: 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>
CC: Evgeniy Dushistov <dushistov@mail.ru>
| -rw-r--r-- | fs/ufs/balloc.c | 12 | ||||
| -rw-r--r-- | fs/ufs/ialloc.c | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/fs/ufs/balloc.c b/fs/ufs/balloc.c index 0d9ada173739..54c16ec95dff 100644 --- a/fs/ufs/balloc.c +++ b/fs/ufs/balloc.c | |||
| @@ -85,7 +85,7 @@ void ufs_free_fragments(struct inode *inode, u64 fragment, unsigned count) | |||
| 85 | "bit already cleared for fragment %u", i); | 85 | "bit already cleared for fragment %u", i); |
| 86 | } | 86 | } |
| 87 | 87 | ||
| 88 | DQUOT_FREE_BLOCK (inode, count); | 88 | vfs_dq_free_block(inode, count); |
| 89 | 89 | ||
| 90 | 90 | ||
| 91 | fs32_add(sb, &ucg->cg_cs.cs_nffree, count); | 91 | fs32_add(sb, &ucg->cg_cs.cs_nffree, count); |
| @@ -195,7 +195,7 @@ do_more: | |||
| 195 | ubh_setblock(UCPI_UBH(ucpi), ucpi->c_freeoff, blkno); | 195 | ubh_setblock(UCPI_UBH(ucpi), ucpi->c_freeoff, blkno); |
| 196 | if ((UFS_SB(sb)->s_flags & UFS_CG_MASK) == UFS_CG_44BSD) | 196 | if ((UFS_SB(sb)->s_flags & UFS_CG_MASK) == UFS_CG_44BSD) |
| 197 | ufs_clusteracct (sb, ucpi, blkno, 1); | 197 | ufs_clusteracct (sb, ucpi, blkno, 1); |
| 198 | DQUOT_FREE_BLOCK(inode, uspi->s_fpb); | 198 | vfs_dq_free_block(inode, uspi->s_fpb); |
| 199 | 199 | ||
| 200 | fs32_add(sb, &ucg->cg_cs.cs_nbfree, 1); | 200 | fs32_add(sb, &ucg->cg_cs.cs_nbfree, 1); |
| 201 | uspi->cs_total.cs_nbfree++; | 201 | uspi->cs_total.cs_nbfree++; |
| @@ -556,7 +556,7 @@ static u64 ufs_add_fragments(struct inode *inode, u64 fragment, | |||
| 556 | fs32_add(sb, &ucg->cg_frsum[fragsize - count], 1); | 556 | fs32_add(sb, &ucg->cg_frsum[fragsize - count], 1); |
| 557 | for (i = oldcount; i < newcount; i++) | 557 | for (i = oldcount; i < newcount; i++) |
| 558 | ubh_clrbit (UCPI_UBH(ucpi), ucpi->c_freeoff, fragno + i); | 558 | ubh_clrbit (UCPI_UBH(ucpi), ucpi->c_freeoff, fragno + i); |
| 559 | if(DQUOT_ALLOC_BLOCK(inode, count)) { | 559 | if (vfs_dq_alloc_block(inode, count)) { |
| 560 | *err = -EDQUOT; | 560 | *err = -EDQUOT; |
| 561 | return 0; | 561 | return 0; |
| 562 | } | 562 | } |
| @@ -664,7 +664,7 @@ cg_found: | |||
| 664 | for (i = count; i < uspi->s_fpb; i++) | 664 | for (i = count; i < uspi->s_fpb; i++) |
| 665 | ubh_setbit (UCPI_UBH(ucpi), ucpi->c_freeoff, goal + i); | 665 | ubh_setbit (UCPI_UBH(ucpi), ucpi->c_freeoff, goal + i); |
| 666 | i = uspi->s_fpb - count; | 666 | i = uspi->s_fpb - count; |
| 667 | DQUOT_FREE_BLOCK(inode, i); | 667 | vfs_dq_free_block(inode, i); |
| 668 | 668 | ||
| 669 | fs32_add(sb, &ucg->cg_cs.cs_nffree, i); | 669 | fs32_add(sb, &ucg->cg_cs.cs_nffree, i); |
| 670 | uspi->cs_total.cs_nffree += i; | 670 | uspi->cs_total.cs_nffree += i; |
| @@ -676,7 +676,7 @@ cg_found: | |||
| 676 | result = ufs_bitmap_search (sb, ucpi, goal, allocsize); | 676 | result = ufs_bitmap_search (sb, ucpi, goal, allocsize); |
| 677 | if (result == INVBLOCK) | 677 | if (result == INVBLOCK) |
| 678 | return 0; | 678 | return 0; |
| 679 | if(DQUOT_ALLOC_BLOCK(inode, count)) { | 679 | if (vfs_dq_alloc_block(inode, count)) { |
| 680 | *err = -EDQUOT; | 680 | *err = -EDQUOT; |
| 681 | return 0; | 681 | return 0; |
| 682 | } | 682 | } |
| @@ -747,7 +747,7 @@ gotit: | |||
| 747 | ubh_clrblock (UCPI_UBH(ucpi), ucpi->c_freeoff, blkno); | 747 | ubh_clrblock (UCPI_UBH(ucpi), ucpi->c_freeoff, blkno); |
| 748 | if ((UFS_SB(sb)->s_flags & UFS_CG_MASK) == UFS_CG_44BSD) | 748 | if ((UFS_SB(sb)->s_flags & UFS_CG_MASK) == UFS_CG_44BSD) |
| 749 | ufs_clusteracct (sb, ucpi, blkno, -1); | 749 | ufs_clusteracct (sb, ucpi, blkno, -1); |
| 750 | if(DQUOT_ALLOC_BLOCK(inode, uspi->s_fpb)) { | 750 | if (vfs_dq_alloc_block(inode, uspi->s_fpb)) { |
| 751 | *err = -EDQUOT; | 751 | *err = -EDQUOT; |
| 752 | return INVBLOCK; | 752 | return INVBLOCK; |
| 753 | } | 753 | } |
diff --git a/fs/ufs/ialloc.c b/fs/ufs/ialloc.c index 6f5dcf006096..3527c00fef0d 100644 --- a/fs/ufs/ialloc.c +++ b/fs/ufs/ialloc.c | |||
| @@ -95,8 +95,8 @@ void ufs_free_inode (struct inode * inode) | |||
| 95 | 95 | ||
| 96 | is_directory = S_ISDIR(inode->i_mode); | 96 | is_directory = S_ISDIR(inode->i_mode); |
| 97 | 97 | ||
| 98 | DQUOT_FREE_INODE(inode); | 98 | vfs_dq_free_inode(inode); |
| 99 | DQUOT_DROP(inode); | 99 | vfs_dq_drop(inode); |
| 100 | 100 | ||
| 101 | clear_inode (inode); | 101 | clear_inode (inode); |
| 102 | 102 | ||
| @@ -355,8 +355,8 @@ cg_found: | |||
| 355 | 355 | ||
| 356 | unlock_super (sb); | 356 | unlock_super (sb); |
| 357 | 357 | ||
| 358 | if (DQUOT_ALLOC_INODE(inode)) { | 358 | if (vfs_dq_alloc_inode(inode)) { |
| 359 | DQUOT_DROP(inode); | 359 | vfs_dq_drop(inode); |
| 360 | err = -EDQUOT; | 360 | err = -EDQUOT; |
| 361 | goto fail_without_unlock; | 361 | goto fail_without_unlock; |
| 362 | } | 362 | } |
