* [PATCH 2/3] Ext2: mark inode dirty after the function dquot_free_block_nodirty is called
@ 2013-02-06 20:02 Wang Shilong
0 siblings, 0 replies; 3+ messages in thread
From: Wang Shilong @ 2013-02-06 20:02 UTC (permalink / raw)
To: Jan Kara; +Cc: linux-ext4
From: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
We should mark inode dirty after the function dquot_free_block_nodirty
is called.Besides,add a check whether it is necessary to call
dquot_free_block_nodirty functon.
Signed-off-by: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
---
fs/ext2/balloc.c | 15 ++++++++++-----
fs/ext2/xattr.c | 1 +
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
index 22993a0..9d372bf 100644
--- a/fs/ext2/balloc.c
+++ b/fs/ext2/balloc.c
@@ -568,8 +568,11 @@ do_more:
}
error_return:
brelse(bitmap_bh);
- release_blocks(sb, freed);
- dquot_free_block_nodirty(inode, freed);
+ if (freed) {
+ release_blocks(sb, freed);
+ dquot_free_block_nodirty(inode, freed);
+ mark_inode_dirty(inode);
+ }
}
/**
@@ -1412,9 +1415,11 @@ allocated:
*errp = 0;
brelse(bitmap_bh);
- dquot_free_block_nodirty(inode, *count-num);
- mark_inode_dirty(inode);
- *count = num;
+ if (num < *count) {
+ dquot_free_block_nodirty(inode, *count-num);
+ mark_inode_dirty(inode);
+ *count = num;
+ }
return ret_block;
io_error:
diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
index b6754db..4c4cda9 100644
--- a/fs/ext2/xattr.c
+++ b/fs/ext2/xattr.c
@@ -795,6 +795,7 @@ ext2_xattr_delete_inode(struct inode *inode)
if (IS_SYNC(inode))
sync_dirty_buffer(bh);
dquot_free_block_nodirty(inode, 1);
+ mark_inode_dirty(inode);
}
EXT2_I(inode)->i_file_acl = 0;
--
1.7.11.7
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 1/3] Ext2: remove the overhead check about sb in the function ext2_new_blocks
@ 2013-02-06 6:14 Wang shilong
2013-02-06 6:14 ` [PATCH 2/3] Ext2: mark inode dirty after the function dquot_free_block_nodirty is called Wang shilong
0 siblings, 1 reply; 3+ messages in thread
From: Wang shilong @ 2013-02-06 6:14 UTC (permalink / raw)
To: jack; +Cc: linux-ext4, Wang shilong, Wang Shilong
From: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
It can be guranteed that inode->i_sb should not be null in vfs.
So here the check about it is overhead.
Signed-off-by: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
---
fs/ext2/balloc.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
index 1c36139..22993a0 100644
--- a/fs/ext2/balloc.c
+++ b/fs/ext2/balloc.c
@@ -1239,10 +1239,6 @@ ext2_fsblk_t ext2_new_blocks(struct inode *inode, ext2_fsblk_t goal,
*errp = -ENOSPC;
sb = inode->i_sb;
- if (!sb) {
- printk("ext2_new_blocks: nonexistent device");
- return 0;
- }
/*
* Check quota for allocation of this block.
--
1.7.11.7
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 2/3] Ext2: mark inode dirty after the function dquot_free_block_nodirty is called
2013-02-06 6:14 [PATCH 1/3] Ext2: remove the overhead check about sb in the function ext2_new_blocks Wang shilong
@ 2013-02-06 6:14 ` Wang shilong
2013-02-06 12:44 ` Jan Kara
0 siblings, 1 reply; 3+ messages in thread
From: Wang shilong @ 2013-02-06 6:14 UTC (permalink / raw)
To: jack; +Cc: linux-ext4, Wang shilong, Wang Shilong
From: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
We should mark inode dirty after the function dquot_free_block_nodirty
is called.Besides,add a check whether it is necessary to call
dquot_free_block_nodirty functon.
Signed-off-by: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
---
fs/ext2/balloc.c | 15 ++++++++++-----
fs/ext2/xattr.c | 1 +
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
index 22993a0..9d372bf 100644
--- a/fs/ext2/balloc.c
+++ b/fs/ext2/balloc.c
@@ -568,8 +568,11 @@ do_more:
}
error_return:
brelse(bitmap_bh);
- release_blocks(sb, freed);
- dquot_free_block_nodirty(inode, freed);
+ if (freed) {
+ release_blocks(sb, freed);
+ dquot_free_block_nodirty(inode, freed);
+ mark_inode_dirty(inode);
+ }
}
/**
@@ -1412,9 +1415,11 @@ allocated:
*errp = 0;
brelse(bitmap_bh);
- dquot_free_block_nodirty(inode, *count-num);
- mark_inode_dirty(inode);
- *count = num;
+ if (num < *count) {
+ dquot_free_block_nodirty(inode, *count-num);
+ mark_inode_dirty(inode);
+ *count = num;
+ }
return ret_block;
io_error:
diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
index b6754db..4c4cda9 100644
--- a/fs/ext2/xattr.c
+++ b/fs/ext2/xattr.c
@@ -795,6 +795,7 @@ ext2_xattr_delete_inode(struct inode *inode)
if (IS_SYNC(inode))
sync_dirty_buffer(bh);
dquot_free_block_nodirty(inode, 1);
+ mark_inode_dirty(inode);
}
EXT2_I(inode)->i_file_acl = 0;
--
1.7.11.7
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 2/3] Ext2: mark inode dirty after the function dquot_free_block_nodirty is called
2013-02-06 6:14 ` [PATCH 2/3] Ext2: mark inode dirty after the function dquot_free_block_nodirty is called Wang shilong
@ 2013-02-06 12:44 ` Jan Kara
0 siblings, 0 replies; 3+ messages in thread
From: Jan Kara @ 2013-02-06 12:44 UTC (permalink / raw)
To: Wang shilong; +Cc: jack, linux-ext4, Wang Shilong
Hello,
On Wed 06-02-13 14:14:27, Wang shilong wrote:
> From: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
>
> We should mark inode dirty after the function dquot_free_block_nodirty
> is called.Besides,add a check whether it is necessary to call
> dquot_free_block_nodirty functon.
Thanks for the patch. Just one comment below.
> Signed-off-by: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
> ---
> fs/ext2/balloc.c | 15 ++++++++++-----
> fs/ext2/xattr.c | 1 +
> 2 files changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
> index 22993a0..9d372bf 100644
> --- a/fs/ext2/balloc.c
> +++ b/fs/ext2/balloc.c
> @@ -568,8 +568,11 @@ do_more:
> }
> error_return:
> brelse(bitmap_bh);
> - release_blocks(sb, freed);
> - dquot_free_block_nodirty(inode, freed);
> + if (freed) {
> + release_blocks(sb, freed);
> + dquot_free_block_nodirty(inode, freed);
> + mark_inode_dirty(inode);
> + }
> }
>
> /**
> @@ -1412,9 +1415,11 @@ allocated:
>
> *errp = 0;
> brelse(bitmap_bh);
> - dquot_free_block_nodirty(inode, *count-num);
> - mark_inode_dirty(inode);
> - *count = num;
> + if (num < *count) {
> + dquot_free_block_nodirty(inode, *count-num);
> + mark_inode_dirty(inode);
> + *count = num;
> + }
> return ret_block;
>
> io_error:
> diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
> index b6754db..4c4cda9 100644
> --- a/fs/ext2/xattr.c
> +++ b/fs/ext2/xattr.c
> @@ -795,6 +795,7 @@ ext2_xattr_delete_inode(struct inode *inode)
> if (IS_SYNC(inode))
> sync_dirty_buffer(bh);
> dquot_free_block_nodirty(inode, 1);
> + mark_inode_dirty(inode);
> }
> EXT2_I(inode)->i_file_acl = 0;
This isn't necessary as the function is meant to be called only when
inode is going to be deleted and thus there's no point in marking it dirty.
Honza
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-02-06 12:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-06 20:02 [PATCH 2/3] Ext2: mark inode dirty after the function dquot_free_block_nodirty is called Wang Shilong
-- strict thread matches above, loose matches on Subject: below --
2013-02-06 6:14 [PATCH 1/3] Ext2: remove the overhead check about sb in the function ext2_new_blocks Wang shilong
2013-02-06 6:14 ` [PATCH 2/3] Ext2: mark inode dirty after the function dquot_free_block_nodirty is called Wang shilong
2013-02-06 12:44 ` Jan Kara
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).