From: Oleg Drokin <green@namesys.com>
To: rwhron@earthlink.net
Cc: linux-kernel@vger.kernel.org, sebastian.droege@gmx.de
Subject: Re: Opss! on 2.5.6 with ReiserFS
Date: Mon, 11 Mar 2002 09:44:01 +0300 [thread overview]
Message-ID: <20020311094401.B24600@namesys.com> (raw)
In-Reply-To: <20020310142609.A22174@rushmore>
In-Reply-To: <20020310142609.A22174@rushmore>
[-- Attachment #1: Type: text/plain, Size: 353 bytes --]
Hello!
On Sun, Mar 10, 2002 at 02:26:09PM -0500, rwhron@earthlink.net wrote:
> I have got oops at boot time from 2.5.6-pre3 and 2.5.6 on
> system with reiserfs root filesystem on ide. Oops occurs
> during attempt to mount /. No modules in kernel.
> 2.5.6-pre2 was okay.
This is a known merge problem, attached patch will cure it.
Bye,
Oleg
[-- Attachment #2: 00-jdev_bd_merging_fix.diff --]
[-- Type: text/plain, Size: 891 bytes --]
--- linux-2.5.6-pre3/fs/reiserfs/journal.c.orig Thu Mar 7 12:44:43 2002
+++ linux-2.5.6-pre3/fs/reiserfs/journal.c Thu Mar 7 13:53:36 2002
@@ -1960,8 +1960,7 @@
SB_ONDISK_JOURNAL_DEVICE( super ) ?
to_kdev_t(SB_ONDISK_JOURNAL_DEVICE( super )) : super -> s_dev;
/* there is no "jdev" option and journal is on separate device */
- if( ( !jdev_name || !jdev_name[ 0 ] ) &&
- SB_ONDISK_JOURNAL_DEVICE( super ) ) {
+ if( ( !jdev_name || !jdev_name[ 0 ] ) ) {
journal -> j_dev_bd = bdget( kdev_t_to_nr( jdev ) );
if( journal -> j_dev_bd )
result = blkdev_get( journal -> j_dev_bd,
@@ -1976,9 +1975,6 @@
return result;
}
- /* no "jdev" option and journal is on the host device */
- if( !jdev_name || !jdev_name[ 0 ] )
- return 0;
journal -> j_dev_file = filp_open( jdev_name, 0, 0 );
if( !IS_ERR( journal -> j_dev_file ) ) {
struct inode *jdev_inode;
next prev parent reply other threads:[~2002-03-11 6:44 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-03-10 19:26 Opss! on 2.5.6 with ReiserFS rwhron
2002-03-10 21:57 ` Sebastian Droege
2002-03-11 6:44 ` Oleg Drokin [this message]
-- strict thread matches above, loose matches on Subject: below --
2002-03-11 11:19 rwhron
2002-03-10 15:58 system_lists
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20020311094401.B24600@namesys.com \
--to=green@namesys.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rwhron@earthlink.net \
--cc=sebastian.droege@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox