From: Sedat Dilek <sedat.dilek@googlemail.com>
To: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Theodore Tso <tytso@mit.edu>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Mingming Cao <cmm@us.ibm.com>
Subject: Re: linux-next: manual merge of the ext4 tree with Linus' tree
Date: Fri, 25 Mar 2011 17:30:49 +0100 [thread overview]
Message-ID: <AANLkTik=H0coPODvznFOLb8Kyq05RoypE_duNZ0U8wsi@mail.gmail.com> (raw)
In-Reply-To: <20110325144544.GF1409@htj.dyndns.org>
On Fri, Mar 25, 2011 at 3:45 PM, Tejun Heo <tj@kernel.org> wrote:
> Hello, Stephen, Ted.
>
> On Fri, Mar 25, 2011 at 12:56:43PM +1100, Stephen Rothwell wrote:
>> Today's linux-next merge of the ext4 tree got a conflict in
>> fs/ext4/super.c between commit fd89d5f2030a ("ext4: convert to
>> alloc_workqueue()") from Linus' tree and commit 198868f35de9 ("ext4: Use
>> single thread to perform DIO unwritten convertion") from the ext4 tree.
>>
>> I just used the ext4 tree version.
>
> Both are about the same conversion but the one using alloc_workqueue()
> is better because 1. create_singlethread_workqueue() is going away and
> 2. it doesn't require strict ordering among queued works.
>
> Ted, what do you think?
>
> Thanks.
>
> --
> tejun
>
As my linux-next system is unstable, I had a look into my own merge
(into linux-next GIT) before ext4 stuff went to mainline.
Just wanted to test a revert to "old" code in linux-next (see below).
- Sedat -
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -596,7 +596,7 @@ __acquires(bitlock)
vaf.fmt = fmt;
vaf.va = &args;
- printk(KERN_CRIT "EXT4-fs error (device %s): %s:%d: group %u",
+ printk(KERN_CRIT "EXT4-fs error (device %s): %s:%d: group %u, ",
sb->s_id, function, line, grp);
if (ino)
printk(KERN_CONT "inode %lu: ", ino);
@@ -3518,12 +3518,7 @@ static int ext4_fill_super(struct super_block
*sb, void *data, int silent)
percpu_counter_set(&sbi->s_dirtyblocks_counter, 0);
no_journal:
- /*
- * The maximum number of concurrent works can be high and
- * concurrency isn't really necessary. Limit it to 1.
- */
- EXT4_SB(sb)->dio_unwritten_wq =
- alloc_workqueue("ext4-dio-unwritten", WQ_MEM_RECLAIM, 1);
+ EXT4_SB(sb)->dio_unwritten_wq =
create_singlethread_workqueue("ext4-dio-unwritten");
if (!EXT4_SB(sb)->dio_unwritten_wq) {
printk(KERN_ERR "EXT4-fs: failed to create DIO workqueue\n");
goto failed_mount_wq;
- EOT -
next prev parent reply other threads:[~2011-03-25 16:30 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-25 1:56 linux-next: manual merge of the ext4 tree with Linus' tree Stephen Rothwell
2011-03-25 14:45 ` Tejun Heo
2011-03-25 16:30 ` Sedat Dilek [this message]
2011-03-25 19:58 ` Ted Ts'o
-- strict thread matches above, loose matches on Subject: below --
2023-06-27 0:39 Stephen Rothwell
2023-06-27 6:37 ` Christoph Hellwig
2023-06-27 7:26 ` Stephen Rothwell
2021-06-07 0:27 Stephen Rothwell
2020-12-17 23:12 Stephen Rothwell
2020-10-20 23:03 Stephen Rothwell
2019-09-19 11:44 Mark Brown
2016-03-21 0:29 Stephen Rothwell
2013-08-13 1:33 Stephen Rothwell
2011-02-14 2:19 Stephen Rothwell
2010-10-28 0:45 Stephen Rothwell
2010-05-22 5:50 Stephen Rothwell
2009-09-17 1:56 linux-next: manual merge of the ext4 tree with Linus tree Stephen Rothwell
2009-09-17 13:22 ` Theodore Tso
2009-09-17 13:30 ` Stephen Rothwell
2009-02-02 2:56 linux-next: manual merge of the ext4 tree with Linus' tree Stephen Rothwell
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='AANLkTik=H0coPODvznFOLb8Kyq05RoypE_duNZ0U8wsi@mail.gmail.com' \
--to=sedat.dilek@googlemail.com \
--cc=cmm@us.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sedat.dilek@gmail.com \
--cc=sfr@canb.auug.org.au \
--cc=tj@kernel.org \
--cc=tytso@mit.edu \
/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;
as well as URLs for NNTP newsgroup(s).