diff options
author | Anton Altaparmakov | 2005-05-21 23:00:02 +0200 |
---|---|---|
committer | Anton Altaparmakov | 2005-05-21 23:00:02 +0200 |
commit | 67394f8f069c2fdf90f3b6d851824c07815442af (patch) | |
tree | 0c33e62d34dbaecea434ae9ece3cc0c56db8b1f7 /fs/ext3/super.c | |
parent | Merge with /usr/src/ntfs-2.6.git (diff) | |
parent | Automatic merge of rsync://www.parisc-linux.org/~jejb/git/scsi-for-linus-2.6.git (diff) | |
download | kernel-qcow2-linux-67394f8f069c2fdf90f3b6d851824c07815442af.tar.gz kernel-qcow2-linux-67394f8f069c2fdf90f3b6d851824c07815442af.tar.xz kernel-qcow2-linux-67394f8f069c2fdf90f3b6d851824c07815442af.zip |
Merge with /usr/src/ntfs-2.6.git
Diffstat (limited to 'fs/ext3/super.c')
-rw-r--r-- | fs/ext3/super.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c index 545b440a2d2f..981ccb233ef5 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c @@ -225,8 +225,16 @@ void __ext3_std_error (struct super_block * sb, const char * function, int errno) { char nbuf[16]; - const char *errstr = ext3_decode_error(sb, errno, nbuf); + const char *errstr; + + /* Special case: if the error is EROFS, and we're not already + * inside a transaction, then there's really no point in logging + * an error. */ + if (errno == -EROFS && journal_current_handle() == NULL && + (sb->s_flags & MS_RDONLY)) + return; + errstr = ext3_decode_error(sb, errno, nbuf); printk (KERN_CRIT "EXT3-fs error (device %s) in %s: %s\n", sb->s_id, function, errstr); |