Re: [PATCH] fix error handling in ext3_create_journal

2007-07-03 Thread Andrew Morton
On Mon, 2 Jul 2007 00:11:11 +0200
Borislav Petkov <[EMAIL PROTECTED]> wrote:

> 
> ---
> From: Borislav Petkov <[EMAIL PROTECTED]>
> 
> Fix error handling in ext3_create_journal according to kernel conventions.
> 
> Signed-off-by: Borislav Petkov <[EMAIL PROTECTED]>
> --
> 
> Index: linux-2.6.22-rc6/fs/ext3/super.c
> ===
> --- linux-2.6.22-rc6/fs/ext3/super.c.orig 2007-07-01 21:12:51.0 
> +0200
> +++ linux-2.6.22-rc6/fs/ext3/super.c  2007-07-01 21:14:32.0 +0200
> @@ -2075,6 +2075,7 @@
>  unsigned int journal_inum)
>  {
>   journal_t *journal;
> + int err;
>  
>   if (sb->s_flags & MS_RDONLY) {
>   printk(KERN_ERR "EXT3-fs: readonly filesystem when trying to "
> @@ -2082,13 +2083,15 @@
>   return -EROFS;
>   }
>  
> - if (!(journal = ext3_get_journal(sb, journal_inum)))
> + journal = ext3_get_journal(sb, journal_inum);
> + if (!journal)
>   return -EINVAL;
>  
>   printk(KERN_INFO "EXT3-fs: creating new journal on inode %u\n",
>  journal_inum);
>  
> - if (journal_create(journal)) {
> + err = journal_create(journal);
> + if (err) {
>   printk(KERN_ERR "EXT3-fs: error creating journal.\n");
>   journal_destroy(journal);
>   return -EIO;

Please prepare the equivalent patch for ext4.  Without that, it'd probably
be better to avoid applying the ext3 patch: there are advantages to keeping
the two in sync where possible.

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH] fix error handling in ext3_create_journal

2007-07-01 Thread Borislav Petkov

---
From: Borislav Petkov <[EMAIL PROTECTED]>

Fix error handling in ext3_create_journal according to kernel conventions.

Signed-off-by: Borislav Petkov <[EMAIL PROTECTED]>
--

Index: linux-2.6.22-rc6/fs/ext3/super.c
===
--- linux-2.6.22-rc6/fs/ext3/super.c.orig   2007-07-01 21:12:51.0 
+0200
+++ linux-2.6.22-rc6/fs/ext3/super.c2007-07-01 21:14:32.0 +0200
@@ -2075,6 +2075,7 @@
   unsigned int journal_inum)
 {
journal_t *journal;
+   int err;
 
if (sb->s_flags & MS_RDONLY) {
printk(KERN_ERR "EXT3-fs: readonly filesystem when trying to "
@@ -2082,13 +2083,15 @@
return -EROFS;
}
 
-   if (!(journal = ext3_get_journal(sb, journal_inum)))
+   journal = ext3_get_journal(sb, journal_inum);
+   if (!journal)
return -EINVAL;
 
printk(KERN_INFO "EXT3-fs: creating new journal on inode %u\n",
   journal_inum);
 
-   if (journal_create(journal)) {
+   err = journal_create(journal);
+   if (err) {
printk(KERN_ERR "EXT3-fs: error creating journal.\n");
journal_destroy(journal);
return -EIO;
-- 
Regards/Gruß,
Boris.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/