Patchwork libext2fs: don't mark the superblock as dirty if the fs was opened r/o

login
register
mail settings
Submitter Theodore Ts'o
Date Feb. 21, 2012, 1:36 a.m.
Message ID <1329788182-25431-1-git-send-email-tytso@mit.edu>
Download mbox | patch
Permalink /patch/142229/
State Accepted
Headers show

Comments

Theodore Ts'o - Feb. 21, 2012, 1:36 a.m.
If the file system is read/only opened with a backup superblock, and
the file system has uninit_bg enabled, the super block must not be
marked as dirty; otherwise, ext2fs_close() will call ext2fs_flush(),
which will fail, since the file descriptor for the block device was
opened read/only, and then the file descriptor won't actually be
closed.

This is normally not a problem since most of the time the program will
exit shortly after calling ext2fs_close(), and many programs don't
bother checking the error return from ext2fs_close(), especially if
the file system was opened read/only.

A big exception to this is e2fsck, since it opens and close the file
systems during its startup, and to make matters worse, registers an
error handler which will noisly complain about the failed writes
caused by ext2fs_flush().

Fix this by not marking the superblock as dirty if the file system was
opened read/only.  The changes to the block group descriptors to clear
the uninit bits will still happen, so that e2fsck -n will properly
scan the whole file system.  However, those changes will get dropped
when the file system handle is closed.

Addresses-SourceForge-Bug: #3444351

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---
 lib/ext2fs/openfs.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Patch

diff --git a/lib/ext2fs/openfs.c b/lib/ext2fs/openfs.c
index b1b68ad..32e068c 100644
--- a/lib/ext2fs/openfs.c
+++ b/lib/ext2fs/openfs.c
@@ -382,7 +382,8 @@  errcode_t ext2fs_open2(const char *name, const char *io_options,
 			 * anyway to avoid printing a lot of spurious errors. */
 			ext2fs_group_desc_csum_set(fs, group);
 		}
-		ext2fs_mark_super_dirty(fs);
+		if (fs->flags & EXT2_FLAG_RW)
+			ext2fs_mark_super_dirty(fs);
 	}
 
 	fs->flags &= ~EXT2_FLAG_NOFREE_ON_ERROR;