* [PATCH v1 2/2] Ext3: add necessary check in case IO error happens
@ 2013-01-12 9:22 shilong wang
2013-01-14 14:17 ` Jan Kara
0 siblings, 1 reply; 2+ messages in thread
From: shilong wang @ 2013-01-12 9:22 UTC (permalink / raw)
To: Jan Kara, viro; +Cc: linux-fsdevel
From: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
As we know io error may happen when the function 'sb_getblk'
is called.Add necessary check for it
The patch also fix a coding style problem.
Signed-off-by: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
---
fs/ext3/inode.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index ff574b4..61bc8bd 100644
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -676,6 +676,10 @@ static int ext3_alloc_branch(handle_t *handle,
struct inode *inode,
* parent to disk.
*/
bh = sb_getblk(inode->i_sb, new_blocks[n-1]);
+ if (unlikely(!bh)) {
+ err = -ENOMEM;
+ goto failed;
+ }
branch[n].bh = bh;
lock_buffer(bh);
BUFFER_TRACE(bh, "call get_create_access");
@@ -717,7 +721,7 @@ failed:
BUFFER_TRACE(branch[i].bh, "call journal_forget");
ext3_journal_forget(handle, branch[i].bh);
}
- for (i = 0; i <indirect_blks; i++)
+ for (i = 0; i < indirect_blks; i++)
ext3_free_blocks(handle, inode, new_blocks[i], 1);
ext3_free_blocks(handle, inode, new_blocks[i], num);
--
1.7.7.6
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v1 2/2] Ext3: add necessary check in case IO error happens
2013-01-12 9:22 [PATCH v1 2/2] Ext3: add necessary check in case IO error happens shilong wang
@ 2013-01-14 14:17 ` Jan Kara
0 siblings, 0 replies; 2+ messages in thread
From: Jan Kara @ 2013-01-14 14:17 UTC (permalink / raw)
To: shilong wang; +Cc: Jan Kara, viro, linux-fsdevel
On Sat 12-01-13 01:22:33, shilong wang wrote:
> From: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
>
> As we know io error may happen when the function 'sb_getblk'
> is called.Add necessary check for it
>
> The patch also fix a coding style problem.
Thanks. I've added the patch to my tree.
Honza
>
> Signed-off-by: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
> ---
> fs/ext3/inode.c | 6 +++++-
> 1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
> index ff574b4..61bc8bd 100644
> --- a/fs/ext3/inode.c
> +++ b/fs/ext3/inode.c
> @@ -676,6 +676,10 @@ static int ext3_alloc_branch(handle_t *handle,
> struct inode *inode,
> * parent to disk.
> */
> bh = sb_getblk(inode->i_sb, new_blocks[n-1]);
> + if (unlikely(!bh)) {
> + err = -ENOMEM;
> + goto failed;
> + }
> branch[n].bh = bh;
> lock_buffer(bh);
> BUFFER_TRACE(bh, "call get_create_access");
> @@ -717,7 +721,7 @@ failed:
> BUFFER_TRACE(branch[i].bh, "call journal_forget");
> ext3_journal_forget(handle, branch[i].bh);
> }
> - for (i = 0; i <indirect_blks; i++)
> + for (i = 0; i < indirect_blks; i++)
> ext3_free_blocks(handle, inode, new_blocks[i], 1);
>
> ext3_free_blocks(handle, inode, new_blocks[i], num);
> --
> 1.7.7.6
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-01-14 14:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-12 9:22 [PATCH v1 2/2] Ext3: add necessary check in case IO error happens shilong wang
2013-01-14 14:17 ` 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).