Re: Errors reported by Coverity in ext3

[Amir Goldor <amir73il@users.sourceforge.net>]

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

Here it is.

Also, the patch that you posted back in 2006 mostly handled
jbd error check for "retaking write access" in ext3_clear_blocks().
Do you have a newer patch for that? are you still using that old patch?

Thanks,
Amir.

On Tue, Apr 14, 2009 at 1:02 AM, Andreas Dilger <adilger@sun.com> wrote:
>
> On Apr 12, 2009  14:58 +0300, Amir Goldor wrote:
> > in reply to your message from 2006
> > (http://marc.info/?l=linux-ext4&m=116310729115980&w=2)
> > I have prepared a small patch to check jbd errors on 4 occurrences in namei.c
> > could you please review my patch
>
> Could you please regenerate your patch with "diff -up" so that the
> function names are included into the patch context.
>
> Cheers, Andreas
> --
> Andreas Dilger
> Sr. Staff Engineer, Lustre Group
> Sun Microsystems of Canada, Inc.
>

[-- Attachment #2: ext3-namei-check-jbd-errors-2.6.28.patch --]
[-- Type: application/octet-stream, Size: 2321 bytes --]

diff -up linux-2.6.28.orig/fs/ext3/namei.c linux-2.6.28/fs/ext3/namei.c
--- linux-2.6.28.orig/fs/ext3/namei.c	2009-04-16 12:11:44.000000000 +0300
+++ linux-2.6.28/fs/ext3/namei.c	2009-04-16 12:13:32.000000000 +0300
@@ -1616,7 +1616,7 @@ static int ext3_delete_entry (handle_t *
 			      struct buffer_head * bh)
 {
 	struct ext3_dir_entry_2 * de, * pde;
-	int i;
+	int i, err;
 
 	i = 0;
 	pde = NULL;
@@ -1626,7 +1626,9 @@ static int ext3_delete_entry (handle_t *
 			return -EIO;
 		if (de == de_del)  {
 			BUFFER_TRACE(bh, "get_write_access");
-			ext3_journal_get_write_access(handle, bh);
+			err = ext3_journal_get_write_access(handle, bh);
+			if (err)
+				return err;
 			if (pde)
 				pde->rec_len = ext3_rec_len_to_disk(
 					ext3_rec_len_from_disk(pde->rec_len) +
@@ -1770,7 +1772,13 @@ retry:
 		goto out_stop;
 	}
 	BUFFER_TRACE(dir_block, "get_write_access");
-	ext3_journal_get_write_access(handle, dir_block);
+	err = ext3_journal_get_write_access(handle, dir_block);
+	if (err) {
+		drop_nlink(inode); /* is this nlink == 0? */
+		ext3_mark_inode_dirty(handle, inode);
+		iput (inode);
+		goto out_stop;
+	}
 	de = (struct ext3_dir_entry_2 *) dir_block->b_data;
 	de->inode = cpu_to_le32(inode->i_ino);
 	de->name_len = 1;
@@ -2302,7 +2310,9 @@ static int ext3_rename (struct inode * o
 			goto end_rename;
 	} else {
 		BUFFER_TRACE(new_bh, "get write access");
-		ext3_journal_get_write_access(handle, new_bh);
+		retval = ext3_journal_get_write_access(handle, new_bh);
+		if (retval)
+			goto end_rename;
 		new_de->inode = cpu_to_le32(old_inode->i_ino);
 		if (EXT3_HAS_INCOMPAT_FEATURE(new_dir->i_sb,
 					      EXT3_FEATURE_INCOMPAT_FILETYPE))
@@ -2360,7 +2370,14 @@ static int ext3_rename (struct inode * o
 	ext3_update_dx_flag(old_dir);
 	if (dir_bh) {
 		BUFFER_TRACE(dir_bh, "get_write_access");
-		ext3_journal_get_write_access(handle, dir_bh);
+		retval = ext3_journal_get_write_access(handle, dir_bh);
+		if (retval) {
+			ext3_warning(old_dir->i_sb, "ext3_rename",
+					"Updating new directory (%lu) parent link, %d, error=%d",
+					new_dir->i_ino, new_dir->i_nlink, retval);
+		}
+	}
+	if (dir_bh && !retval) {
 		PARENT_INO(dir_bh->b_data) = cpu_to_le32(new_dir->i_ino);
 		BUFFER_TRACE(dir_bh, "call ext3_journal_dirty_metadata");
 		ext3_journal_dirty_metadata(handle, dir_bh);