Patchwork [V1,1/2] Ext2: return ENOMEM rather than EIO if sb_getblk fails

login
register
mail settings
Submitter Wang shilong
Date Jan. 13, 2013, 10:44 a.m.
Message ID <1358073846-1662-1-git-send-email-wangshilong1991@gmail.com>
Download mbox | patch
Permalink /patch/211608/
State Superseded
Headers show

Comments

Wang shilong - Jan. 13, 2013, 10:44 a.m.
From: Wang Shilong <wangsl-fnst@cn.fujitsu.com>

As the only reason that sb_getblk fails is that allocation fails.
It will be better to use ENOMEM rather than EIO.

Signed-off-by: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
---
 fs/ext2/super.c | 2 +-
 fs/ext2/xattr.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Jan Kara - Jan. 14, 2013, 2:25 p.m.
On Sun 13-01-13 18:44:06, Wang shilong wrote:
> From: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
> 
> As the only reason that sb_getblk fails is that allocation fails.
> It will be better to use ENOMEM rather than EIO.
> 
> Signed-off-by: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
> ---
>  fs/ext2/super.c | 2 +-
>  fs/ext2/xattr.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/ext2/super.c b/fs/ext2/super.c
> index 663fdcd..3308a55 100644
> --- a/fs/ext2/super.c
> +++ b/fs/ext2/super.c
> @@ -1457,7 +1457,7 @@ static ssize_t ext2_quota_write(struct super_block *sb, int type,
>  		else
>  			bh = sb_getblk(sb, tmp_bh.b_blocknr);
>  		if (unlikely(!bh)) {
> -			err = -EIO;
> +			err = -ENOMEM;
  This is actually wrong. sb_bread() can return NULL in case of IO error as
well as in case of ENOMEM. In theory you could split the error check for
the sb_getblk() and sb_bread() branch but I prefer not to bother...

								Honza
>  			goto out;
>  		}
>  		lock_buffer(bh);
> diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
> index 06209ec..2d7557d 100644
> --- a/fs/ext2/xattr.c
> +++ b/fs/ext2/xattr.c
> @@ -665,7 +665,7 @@ ext2_xattr_set2(struct inode *inode, struct buffer_head *old_bh,
>  			if (unlikely(!new_bh)) {
>  				ext2_free_blocks(inode, block, 1);
>  				mark_inode_dirty(inode);
> -				error = -EIO;
> +				error = -ENOMEM;
>  				goto cleanup;
>  			}
>  			lock_buffer(new_bh);
> -- 
> 1.7.11.7
>

Patch

diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index 663fdcd..3308a55 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -1457,7 +1457,7 @@  static ssize_t ext2_quota_write(struct super_block *sb, int type,
 		else
 			bh = sb_getblk(sb, tmp_bh.b_blocknr);
 		if (unlikely(!bh)) {
-			err = -EIO;
+			err = -ENOMEM;
 			goto out;
 		}
 		lock_buffer(bh);
diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
index 06209ec..2d7557d 100644
--- a/fs/ext2/xattr.c
+++ b/fs/ext2/xattr.c
@@ -665,7 +665,7 @@  ext2_xattr_set2(struct inode *inode, struct buffer_head *old_bh,
 			if (unlikely(!new_bh)) {
 				ext2_free_blocks(inode, block, 1);
 				mark_inode_dirty(inode);
-				error = -EIO;
+				error = -ENOMEM;
 				goto cleanup;
 			}
 			lock_buffer(new_bh);