diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-24 17:10:03 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-24 17:14:24 +1000 |
| commit | dbcaf05fe0d9f83a517f8c592342c85b9dbe7be4 (patch) | |
| tree | c5f58bbe5fc719bd1f935a900bcaeaf20547bf05 /block | |
| parent | 3518e7429c1f1430cc49abbc46c280f8f68dffcc (diff) | |
| parent | 02dff0ef2e7f6c991f010dbad1e59942d97d2115 (diff) | |
Merge branch 'akpm-current/current'
Diffstat (limited to 'block')
| -rw-r--r-- | block/genhd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/genhd.c b/block/genhd.c index 7421e4aec34b..a561a40c151b 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -890,7 +890,7 @@ static int show_partition(struct seq_file *seqf, void *v) char buf[BDEVNAME_SIZE]; /* Don't show non-partitionable removeable devices or empty devices */ - if (!get_capacity(sgp) || (!disk_max_parts(sgp) && + if (!get_capacity(sgp) || (!(disk_max_parts(sgp) > 1) && (sgp->flags & GENHD_FL_REMOVABLE))) return 0; if (sgp->flags & GENHD_FL_SUPPRESS_PARTITION_INFO) |