diff options
| author | Steve French <sfrench@hera.kernel.org> | 2005-05-19 12:26:57 -0700 |
|---|---|---|
| committer | Steve French <sfrench@hera.kernel.org> | 2005-05-19 12:26:57 -0700 |
| commit | 7e2987503dda95a5f80290bb8c06279009c2419e (patch) | |
| tree | e841944c911ada8d2b806e13d2c7b7320adaeb2f /fs | |
| parent | b1a45695bde0204597957e448923f09ce271ca80 (diff) | |
| parent | 49a43876b935c811cfd29d8fe998a6912a1cc5c4 (diff) | |
| download | op-kernel-dev-7e2987503dda95a5f80290bb8c06279009c2419e.zip op-kernel-dev-7e2987503dda95a5f80290bb8c06279009c2419e.tar.gz | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs')
| -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 545b440..981ccb2 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); |
