Re: [PATCH 0/9] dquot interface cleanups v2

[Dmitry Monakhov <dmonakhov@openvz.org>]

[-- Attachment #1: Type: text/plain, Size: 1056 bytes --]

Jan Kara <jack@suse.cz> writes:

> On Wed 03-03-10 17:52:00, Dmitry Monakhov wrote:
>> Christoph Hellwig <hch@infradead.org> writes:
>> 
>> > Get rid of the dquot operations that were used for calls from the
>> > filesystems into the dquot code, clean up the namespace for calls
>> > to the dquot code to always be dquot_, and move the few calls into
>> > the dquot code that were in the VFS into the filesystems.
>> >
>> > This version dddresses various comments from Jan and adds a new patch
>> > to get rid of the QUOTA_OK / NO_QUOTA return values.
>> I'm not able to apply the patch set on top of linux-fs-2.6/for_next 
>> and linux-fs-2.6/for_next w/o your previous patches 
>> Which tree/commit this patch-set is aimed to?
>   It replaces the old version of the series in my for_next branch...
> I'll take care of that.
Ok.
BTW: i've able to apply the patch-set, can you please fold tiny fix
below to appropriate patches. It's aimed to complete error code
handling convention. This allow us later to return other than
EDQUOT errors from quota code.


[-- Attachment #2: diff --]
[-- Type: application/octet-stream, Size: 1446 bytes --]

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 3c74096..82b3353 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -1839,7 +1839,7 @@ static int ext4_da_reserve_space(struct inode *inode, sector_t lblock)
 	struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
 	struct ext4_inode_info *ei = EXT4_I(inode);
 	unsigned long md_needed, md_reserved;
-
+	int ret;
 	/*
 	 * recalculate the amount of metadata blocks to reserve
 	 * in order to allocate nrblocks
@@ -1856,8 +1856,9 @@ repeat:
 	 * later. Real quota accounting is done at pages writeout
 	 * time.
 	 */
-	if (dquot_reserve_block(inode, md_needed + 1))
-		return -EDQUOT;
+	ret = dquot_reserve_block(inode, md_needed + 1);
+	if (ret)
+		return ret;
 
 	if (ext4_claim_free_blocks(sbi, md_needed + 1)) {
 		dquot_release_reservation_block(inode, md_needed + 1);
diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c
index 6f9205d..e2ff180 100644
--- a/fs/udf/balloc.c
+++ b/fs/udf/balloc.c
@@ -801,12 +801,13 @@ static int udf_table_new_block(struct super_block *sb,
 	newblock = goal_eloc.logicalBlockNum;
 	goal_eloc.logicalBlockNum++;
 	goal_elen -= sb->s_blocksize;
-
-	if (inode && dquot_alloc_block(inode, 1)) {
-		brelse(goal_epos.bh);
-		mutex_unlock(&sbi->s_alloc_mutex);
-		*err = -EDQUOT;
-		return 0;
+	if (inode) {
+		*err = dquot_alloc_block(inode, 1);
+		if (*err) {
+			brelse(goal_epos.bh);
+			mutex_unlock(&sbi->s_alloc_mutex);
+			return 0;
+		}
 	}
 
 	if (goal_elen)