From: Jan Kara <jack@suse.cz>
To: linux-fsdevel@vger.kernel.org
Cc: Jan Kara <jack@suse.cz>, Evgeniy Dushistov <dushistov@mail.ru>
Subject: [PATCH 11/16] ufs: Use lowercase names of quota functions
Date: Tue, 27 Jan 2009 17:48:44 +0100 [thread overview]
Message-ID: <1233074929-12277-12-git-send-email-jack@suse.cz> (raw)
In-Reply-To: <1233074929-12277-11-git-send-email-jack@suse.cz>
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>
---
fs/ufs/balloc.c | 12 ++++++------
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 0d9ada1..54c16ec 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)
"bit already cleared for fragment %u", i);
}
- DQUOT_FREE_BLOCK (inode, count);
+ vfs_dq_free_block(inode, count);
fs32_add(sb, &ucg->cg_cs.cs_nffree, count);
@@ -195,7 +195,7 @@ do_more:
ubh_setblock(UCPI_UBH(ucpi), ucpi->c_freeoff, blkno);
if ((UFS_SB(sb)->s_flags & UFS_CG_MASK) == UFS_CG_44BSD)
ufs_clusteracct (sb, ucpi, blkno, 1);
- DQUOT_FREE_BLOCK(inode, uspi->s_fpb);
+ vfs_dq_free_block(inode, uspi->s_fpb);
fs32_add(sb, &ucg->cg_cs.cs_nbfree, 1);
uspi->cs_total.cs_nbfree++;
@@ -556,7 +556,7 @@ static u64 ufs_add_fragments(struct inode *inode, u64 fragment,
fs32_add(sb, &ucg->cg_frsum[fragsize - count], 1);
for (i = oldcount; i < newcount; i++)
ubh_clrbit (UCPI_UBH(ucpi), ucpi->c_freeoff, fragno + i);
- if(DQUOT_ALLOC_BLOCK(inode, count)) {
+ if (vfs_dq_alloc_block(inode, count)) {
*err = -EDQUOT;
return 0;
}
@@ -664,7 +664,7 @@ cg_found:
for (i = count; i < uspi->s_fpb; i++)
ubh_setbit (UCPI_UBH(ucpi), ucpi->c_freeoff, goal + i);
i = uspi->s_fpb - count;
- DQUOT_FREE_BLOCK(inode, i);
+ vfs_dq_free_block(inode, i);
fs32_add(sb, &ucg->cg_cs.cs_nffree, i);
uspi->cs_total.cs_nffree += i;
@@ -676,7 +676,7 @@ cg_found:
result = ufs_bitmap_search (sb, ucpi, goal, allocsize);
if (result == INVBLOCK)
return 0;
- if(DQUOT_ALLOC_BLOCK(inode, count)) {
+ if (vfs_dq_alloc_block(inode, count)) {
*err = -EDQUOT;
return 0;
}
@@ -747,7 +747,7 @@ gotit:
ubh_clrblock (UCPI_UBH(ucpi), ucpi->c_freeoff, blkno);
if ((UFS_SB(sb)->s_flags & UFS_CG_MASK) == UFS_CG_44BSD)
ufs_clusteracct (sb, ucpi, blkno, -1);
- if(DQUOT_ALLOC_BLOCK(inode, uspi->s_fpb)) {
+ if (vfs_dq_alloc_block(inode, uspi->s_fpb)) {
*err = -EDQUOT;
return INVBLOCK;
}
diff --git a/fs/ufs/ialloc.c b/fs/ufs/ialloc.c
index 6f5dcf0..3527c00 100644
--- a/fs/ufs/ialloc.c
+++ b/fs/ufs/ialloc.c
@@ -95,8 +95,8 @@ void ufs_free_inode (struct inode * inode)
is_directory = S_ISDIR(inode->i_mode);
- DQUOT_FREE_INODE(inode);
- DQUOT_DROP(inode);
+ vfs_dq_free_inode(inode);
+ vfs_dq_drop(inode);
clear_inode (inode);
@@ -355,8 +355,8 @@ cg_found:
unlock_super (sb);
- if (DQUOT_ALLOC_INODE(inode)) {
- DQUOT_DROP(inode);
+ if (vfs_dq_alloc_inode(inode)) {
+ vfs_dq_drop(inode);
err = -EDQUOT;
goto fail_without_unlock;
}
--
1.6.0.2
next prev parent reply other threads:[~2009-01-27 16:48 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-27 16:48 [PATCH 00/16] Quota cleanups Jan Kara
2009-01-27 16:48 ` [PATCH 01/16] quota: Move quota files into separate directory Jan Kara
2009-01-27 16:48 ` [PATCH 02/16] quota: Make global quota locks cacheline aligned Jan Kara
2009-01-27 16:48 ` [PATCH 03/16] quota: Remove NODQUOT macro Jan Kara
2009-01-27 16:48 ` [PATCH 04/16] quota: Remove dqbuf_t and other cleanups Jan Kara
2009-01-27 16:48 ` [PATCH 05/16] vfs: Use lowercase names of quota functions Jan Kara
2009-01-27 16:48 ` [PATCH 06/16] ramfs: Remove quota call Jan Kara
2009-01-27 16:48 ` [PATCH 07/16] ext2: Use lowercase names of quota functions Jan Kara
2009-01-27 16:48 ` [PATCH 08/16] ext3: " Jan Kara
2009-01-27 16:48 ` [PATCH 09/16] ext4: " Jan Kara
2009-01-27 16:48 ` [PATCH 10/16] reiserfs: " Jan Kara
2009-01-27 16:48 ` Jan Kara [this message]
2009-01-27 16:48 ` [PATCH 12/16] udf: " Jan Kara
2009-01-27 16:48 ` [PATCH 13/16] jfs: " Jan Kara
2009-01-27 16:48 ` [PATCH 14/16] quota: Remove uppercase aliases for " Jan Kara
2009-01-27 16:48 ` [PATCH 15/16] quota: Remove superfluous inlines Jan Kara
2009-01-27 16:48 ` [PATCH 16/16] quota: Coding style fixes Jan Kara
2009-01-28 23:46 ` [PATCH 13/16] jfs: Use lowercase names of quota functions Dave Kleikamp
2009-01-28 0:13 ` [PATCH 09/16] ext4: " Mingming Cao
2009-01-27 17:13 ` [PATCH 05/16] vfs: " Christoph Hellwig
2009-01-27 17:35 ` Jan Kara
2009-01-28 17:19 ` Christoph Hellwig
2009-01-28 23:09 ` Jan Kara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1233074929-12277-12-git-send-email-jack@suse.cz \
--to=jack@suse.cz \
--cc=dushistov@mail.ru \
--cc=linux-fsdevel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).