diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2011-06-17 14:22:48 +0000 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2011-06-17 14:22:48 +0000 |
| commit | c6168a14c9f89349320f0075eea9ccf420c92d95 (patch) | |
| tree | 5e45e0cba9ad599c02d8a44a3ac7ea75decac834 /lib/snapshot/snapshot.c | |
| parent | 3c9ff9e142d380578fe905fdff399250ac869ea7 (diff) | |
| download | lvm2-c6168a14c9f89349320f0075eea9ccf420c92d95.tar.gz lvm2-c6168a14c9f89349320f0075eea9ccf420c92d95.tar.xz lvm2-c6168a14c9f89349320f0075eea9ccf420c92d95.zip | |
Use lv_activate_opts struct instead of ACTIVATE_EXCL status flag
Let's hope all conditions has been properly converted.
Diffstat (limited to 'lib/snapshot/snapshot.c')
| -rw-r--r-- | lib/snapshot/snapshot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/snapshot/snapshot.c b/lib/snapshot/snapshot.c index 3555f366..8c483089 100644 --- a/lib/snapshot/snapshot.c +++ b/lib/snapshot/snapshot.c @@ -31,7 +31,7 @@ static const char *_snap_name(const struct lv_segment *seg) static const char *_snap_target_name(const struct lv_segment *seg, const struct lv_activate_opts *laopts) { - if (seg->status & MERGING) + if (!laopts->no_merging && (seg->status & MERGING)) return "snapshot-merge"; return _snap_name(seg); |