diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-03-03 12:02:32 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-03-03 12:02:32 +1100 |
| commit | ccb0d8d3b742e6f21eabb06792f6fbd461d3eb59 (patch) | |
| tree | 37674456551c610906e7c43c5d6883d56fc515f0 /block | |
| parent | 7a53412764c6c6c93d3376d362d8c7f7ad308171 (diff) | |
| parent | c2118ec0a377b26bf2ab1664811961e1be4c1963 (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 2f444b87a5f2..a495d8463489 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -901,7 +901,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) |