From: Jan Kara <jack@suse.cz>
To: linux-fsdevel@vger.kernel.org
Cc: Jan Kara <jack@suse.cz>
Subject: [PATCH 12/16] udf: Use lowercase names of quota functions
Date: Tue, 27 Jan 2009 17:48:45 +0100 [thread overview]
Message-ID: <1233074929-12277-13-git-send-email-jack@suse.cz> (raw)
In-Reply-To: <1233074929-12277-12-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>
---
fs/udf/balloc.c | 14 +++++++-------
fs/udf/ialloc.c | 8 ++++----
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c
index 1b809bd..2bb788a 100644
--- a/fs/udf/balloc.c
+++ b/fs/udf/balloc.c
@@ -206,7 +206,7 @@ static void udf_bitmap_free_blocks(struct super_block *sb,
((char *)bh->b_data)[(bit + i) >> 3]);
} else {
if (inode)
- DQUOT_FREE_BLOCK(inode, 1);
+ vfs_dq_free_block(inode, 1);
udf_add_free_space(sbi, sbi->s_partition, 1);
}
}
@@ -261,11 +261,11 @@ static int udf_bitmap_prealloc_blocks(struct super_block *sb,
while (bit < (sb->s_blocksize << 3) && block_count > 0) {
if (!udf_test_bit(bit, bh->b_data))
goto out;
- else if (DQUOT_PREALLOC_BLOCK(inode, 1))
+ else if (vfs_dq_prealloc_block(inode, 1))
goto out;
else if (!udf_clear_bit(bit, bh->b_data)) {
udf_debug("bit already cleared for block %d\n", bit);
- DQUOT_FREE_BLOCK(inode, 1);
+ vfs_dq_free_block(inode, 1);
goto out;
}
block_count--;
@@ -393,7 +393,7 @@ got_block:
/*
* Check quota for allocation of this block.
*/
- if (inode && DQUOT_ALLOC_BLOCK(inode, 1)) {
+ if (inode && vfs_dq_alloc_block(inode, 1)) {
mutex_unlock(&sbi->s_alloc_mutex);
*err = -EDQUOT;
return 0;
@@ -452,7 +452,7 @@ static void udf_table_free_blocks(struct super_block *sb,
/* We do this up front - There are some error conditions that
could occure, but.. oh well */
if (inode)
- DQUOT_FREE_BLOCK(inode, count);
+ vfs_dq_free_block(inode, count);
if (udf_add_free_space(sbi, sbi->s_partition, count))
mark_buffer_dirty(sbi->s_lvid_bh);
@@ -700,7 +700,7 @@ static int udf_table_prealloc_blocks(struct super_block *sb,
epos.offset -= adsize;
alloc_count = (elen >> sb->s_blocksize_bits);
- if (inode && DQUOT_PREALLOC_BLOCK(inode,
+ if (inode && vfs_dq_prealloc_block(inode,
alloc_count > block_count ? block_count : alloc_count))
alloc_count = 0;
else if (alloc_count > block_count) {
@@ -806,7 +806,7 @@ static int udf_table_new_block(struct super_block *sb,
goal_eloc.logicalBlockNum++;
goal_elen -= sb->s_blocksize;
- if (inode && DQUOT_ALLOC_BLOCK(inode, 1)) {
+ if (inode && vfs_dq_alloc_block(inode, 1)) {
brelse(goal_epos.bh);
mutex_unlock(&sbi->s_alloc_mutex);
*err = -EDQUOT;
diff --git a/fs/udf/ialloc.c b/fs/udf/ialloc.c
index 31fc842..47dbe56 100644
--- a/fs/udf/ialloc.c
+++ b/fs/udf/ialloc.c
@@ -36,8 +36,8 @@ void udf_free_inode(struct inode *inode)
* Note: we must free any quota before locking the superblock,
* as writing the quota to disk may need the lock as well.
*/
- DQUOT_FREE_INODE(inode);
- DQUOT_DROP(inode);
+ vfs_dq_free_inode(inode);
+ vfs_dq_drop(inode);
clear_inode(inode);
@@ -154,8 +154,8 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err)
insert_inode_hash(inode);
mark_inode_dirty(inode);
- if (DQUOT_ALLOC_INODE(inode)) {
- DQUOT_DROP(inode);
+ if (vfs_dq_alloc_inode(inode)) {
+ vfs_dq_drop(inode);
inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0;
iput(inode);
--
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 ` [PATCH 11/16] ufs: " Jan Kara
2009-01-27 16:48 ` Jan Kara [this message]
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-13-git-send-email-jack@suse.cz \
--to=jack@suse.cz \
--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).