From: Artem Bityutskiy <dedekind1@gmail.com>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [PATCHv5 15/15] writeback: cleanup bdi_register
Date: Sun, 25 Jul 2010 11:29:41 +0300 [thread overview]
Message-ID: <1280046581-23623-16-git-send-email-dedekind1@gmail.com> (raw)
In-Reply-To: <1280046581-23623-1-git-send-email-dedekind1@gmail.com>
From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
This patch makes sure we first initialize everything and set the BDI_registered
flag, and only after this we add the bdi to 'bdi_list'. Current code adds the
bdi to the list too early, and as a result I the
WARN(!test_bit(BDI_registered, &bdi->state)
in bdi forker is triggered. Also, it is in general good practice to make things
visible only when they are fully initialized.
Also, this patch does few micro clean-ups:
1. Removes the 'exit' label which does not do anything, just returns. This
allows to get rid of few braces and 'ret' variable and make the code smaller.
2. If 'kthread_run()' fails, remove the error code it returns, not hard-coded
'-ENOMEM'. Theoretically, some day 'kthread_run()' can return something
else. Also, in case of failure it is not necessary to set 'bdi->wb.task' to
NULL.
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
---
mm/backing-dev.c | 30 +++++++++++-------------------
1 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/mm/backing-dev.c b/mm/backing-dev.c
index b4d72d4..73d854b 100644
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -511,23 +511,16 @@ int bdi_register(struct backing_dev_info *bdi, struct device *parent,
const char *fmt, ...)
{
va_list args;
- int ret = 0;
struct device *dev;
if (bdi->dev) /* The driver needs to use separate queues per device */
- goto exit;
+ return 0;
va_start(args, fmt);
dev = device_create_vargs(bdi_class, parent, MKDEV(0, 0), bdi, fmt, args);
va_end(args);
- if (IS_ERR(dev)) {
- ret = PTR_ERR(dev);
- goto exit;
- }
-
- spin_lock_bh(&bdi_lock);
- list_add_tail_rcu(&bdi->bdi_list, &bdi_list);
- spin_unlock_bh(&bdi_lock);
+ if (IS_ERR(dev))
+ return PTR_ERR(dev);
bdi->dev = dev;
@@ -541,20 +534,19 @@ int bdi_register(struct backing_dev_info *bdi, struct device *parent,
wb->task = kthread_run(bdi_forker_thread, wb, "bdi-%s",
dev_name(dev));
- if (IS_ERR(wb->task)) {
- wb->task = NULL;
- ret = -ENOMEM;
-
- bdi_remove_from_list(bdi);
- goto exit;
- }
+ if (IS_ERR(wb->task))
+ return PTR_ERR(wb->task);
}
bdi_debug_register(bdi, dev_name(dev));
set_bit(BDI_registered, &bdi->state);
+
+ spin_lock_bh(&bdi_lock);
+ list_add_tail_rcu(&bdi->bdi_list, &bdi_list);
+ spin_unlock_bh(&bdi_lock);
+
trace_writeback_bdi_register(bdi);
-exit:
- return ret;
+ return 0;
}
EXPORT_SYMBOL(bdi_register);
--
1.7.1.1
next prev parent reply other threads:[~2010-07-25 8:31 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-25 8:29 [PATCHv5 00/15] kill unnecessary bdi wakeups + cleanups Artem Bityutskiy
2010-07-25 8:29 ` [PATCHv5 01/15] writeback: harmonize writeback threads naming Artem Bityutskiy
2010-07-25 8:29 ` [PATCHv5 02/15] writeback: fix possible race when creating bdi threads Artem Bityutskiy
2010-07-25 8:29 ` [PATCHv5 03/15] writeback: do not lose wake-ups in the forker thread - 1 Artem Bityutskiy
2010-07-25 8:29 ` [PATCHv5 04/15] writeback: do not lose wake-ups in the forker thread - 2 Artem Bityutskiy
2010-07-25 8:29 ` [PATCHv5 05/15] writeback: do not lose wake-ups in bdi threads Artem Bityutskiy
2010-07-25 8:29 ` [PATCHv5 06/15] writeback: simplify bdi code a little Artem Bityutskiy
2010-07-25 8:29 ` [PATCHv5 07/15] writeback: do not remove bdi from bdi_list Artem Bityutskiy
2010-07-25 8:29 ` [PATCHv5 08/15] writeback: move last_active to bdi Artem Bityutskiy
2010-07-25 8:29 ` [PATCHv5 09/15] writeback: restructure bdi forker loop a little Artem Bityutskiy
2010-07-25 8:29 ` [PATCHv5 10/15] writeback: move bdi threads exiting logic to the forker thread Artem Bityutskiy
2010-07-25 9:26 ` [PATCHv5-1 " Artem Bityutskiy
2010-07-25 8:29 ` [PATCHv5 11/15] writeback: prevent unnecessary bdi threads wakeups Artem Bityutskiy
2010-07-25 8:29 ` [PATCHv5 12/15] writeback: optimize periodic bdi thread wakeups Artem Bityutskiy
2010-07-25 10:41 ` Artem Bityutskiy
2010-07-25 8:29 ` [PATCHv5 13/15] writeback: remove unnecessary init_timer call Artem Bityutskiy
2010-07-25 8:29 ` [PATCHv5 14/15] writeback: add new tracepoints Artem Bityutskiy
2010-07-25 8:29 ` Artem Bityutskiy [this message]
2010-07-25 9:01 ` [PATCHv5 00/15] kill unnecessary bdi wakeups + cleanups Artem Bityutskiy
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=1280046581-23623-16-git-send-email-dedekind1@gmail.com \
--to=dedekind1@gmail.com \
--cc=axboe@kernel.dk \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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).