public inbox for lvm2-cvs@sourceware.org
help / color / mirror / Atom feed
From: zkabelac@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/lib/activate dev_manager.c dev_manager.h
Date: Tue, 30 Nov 2010 22:28:00 -0000 [thread overview]
Message-ID: <20101130222807.10187.qmail@sourceware.org> (raw)
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: zkabelac@sourceware.org 2010-11-30 22:28:06
Modified files:
lib/activate : dev_manager.c dev_manager.h
Log message:
Remove check for lv is NULL
'lv' is deferenced in the begining of the function so any check
later is not helpful.
Parameters for dev_manager_transien() are marked as nonnull.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/activate/dev_manager.c.diff?cvsroot=lvm2&r1=1.206&r2=1.207
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/activate/dev_manager.h.diff?cvsroot=lvm2&r1=1.35&r2=1.36
--- LVM2/lib/activate/dev_manager.c 2010/11/30 11:53:31 1.206
+++ LVM2/lib/activate/dev_manager.c 2010/11/30 22:28:06 1.207
@@ -601,14 +601,13 @@
do {
next = dm_get_next_target(dmt, next, &start, &length, &type,
¶ms);
- if (lv) {
- if (!(segh = dm_list_next(&lv->segments, segh))) {
- log_error("Number of segments in active LV %s "
- "does not match metadata", lv->name);
- goto out;
- }
- seg = dm_list_item(segh, struct lv_segment);
+
+ if (!(segh = dm_list_next(&lv->segments, segh))) {
+ log_error("Number of segments in active LV %s "
+ "does not match metadata", lv->name);
+ goto out;
}
+ seg = dm_list_item(segh, struct lv_segment);
if (!type || !params)
continue;
@@ -619,7 +618,7 @@
} while (next);
- if (lv && (segh = dm_list_next(&lv->segments, segh))) {
+ if ((segh = dm_list_next(&lv->segments, segh))) {
log_error("Number of segments in active LV %s does not "
"match metadata", lv->name);
goto out;
--- LVM2/lib/activate/dev_manager.h 2010/11/30 11:53:31 1.35
+++ LVM2/lib/activate/dev_manager.h 2010/11/30 22:28:06 1.36
@@ -56,7 +56,7 @@
int dev_manager_preload(struct dev_manager *dm, struct logical_volume *lv,
unsigned origin_only, int *flush_required);
int dev_manager_deactivate(struct dev_manager *dm, struct logical_volume *lv);
-int dev_manager_transient(struct dev_manager *dm, struct logical_volume *lv);
+int dev_manager_transient(struct dev_manager *dm, struct logical_volume *lv) __attribute__((nonnull(1, 2)));
int dev_manager_mknodes(const struct logical_volume *lv);
next reply other threads:[~2010-11-30 22:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-30 22:28 zkabelac [this message]
2011-12-21 13:09 zkabelac
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=20101130222807.10187.qmail@sourceware.org \
--to=zkabelac@sourceware.org \
--cc=lvm-devel@redhat.com \
--cc=lvm2-cvs@sourceware.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 read-only IMAP folder(s) and NNTP newsgroup(s).