diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2010-08-10 21:03:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-11 11:59:20 -0400 |
commit | 9c867fbe06458a8957024236b574733fae0cefed (patch) | |
tree | 6eae6def53e4ca9e30f90f6e9c07d8044581f08f /fs/partitions/atari.c | |
parent | ecd6269174c04da5efbd17d6bff793e428eb45ef (diff) |
partitions: fix sometimes unreadable partition strings
Fix this garbage happening quite often:
==> sda:
scsi 3:0:0:0: CD-ROM TOSHIBA
==> sda1 sda2 sda3 sda4 <sr0: scsi3-mmc drive: 24x/24x writer dvd-ram cd/rw xa/form2 cdda tray
^^^
Uniform CD-ROM driver Revision: 3.20
sr 3:0:0:0: Attached scsi CD-ROM sr0
==> sda5 sda6 sda7 >
Make "sda: sda1 ..." lines actually lines.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/partitions/atari.c')
-rw-r--r-- | fs/partitions/atari.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/partitions/atari.c b/fs/partitions/atari.c index 4439ff1b6cec..9875b05e80a2 100644 --- a/fs/partitions/atari.c +++ b/fs/partitions/atari.c | |||
@@ -62,7 +62,7 @@ int atari_partition(struct parsed_partitions *state) | |||
62 | } | 62 | } |
63 | 63 | ||
64 | pi = &rs->part[0]; | 64 | pi = &rs->part[0]; |
65 | printk (" AHDI"); | 65 | strlcat(state->pp_buf, " AHDI", PAGE_SIZE); |
66 | for (slot = 1; pi < &rs->part[4] && slot < state->limit; slot++, pi++) { | 66 | for (slot = 1; pi < &rs->part[4] && slot < state->limit; slot++, pi++) { |
67 | struct rootsector *xrs; | 67 | struct rootsector *xrs; |
68 | Sector sect2; | 68 | Sector sect2; |
@@ -81,7 +81,7 @@ int atari_partition(struct parsed_partitions *state) | |||
81 | #ifdef ICD_PARTS | 81 | #ifdef ICD_PARTS |
82 | part_fmt = 1; | 82 | part_fmt = 1; |
83 | #endif | 83 | #endif |
84 | printk(" XGM<"); | 84 | strlcat(state->pp_buf, " XGM<", PAGE_SIZE); |
85 | partsect = extensect = be32_to_cpu(pi->st); | 85 | partsect = extensect = be32_to_cpu(pi->st); |
86 | while (1) { | 86 | while (1) { |
87 | xrs = read_part_sector(state, partsect, §2); | 87 | xrs = read_part_sector(state, partsect, §2); |
@@ -120,14 +120,14 @@ int atari_partition(struct parsed_partitions *state) | |||
120 | break; | 120 | break; |
121 | } | 121 | } |
122 | } | 122 | } |
123 | printk(" >"); | 123 | strlcat(state->pp_buf, " >", PAGE_SIZE); |
124 | } | 124 | } |
125 | #ifdef ICD_PARTS | 125 | #ifdef ICD_PARTS |
126 | if ( part_fmt!=1 ) { /* no extended partitions -> test ICD-format */ | 126 | if ( part_fmt!=1 ) { /* no extended partitions -> test ICD-format */ |
127 | pi = &rs->icdpart[0]; | 127 | pi = &rs->icdpart[0]; |
128 | /* sanity check: no ICD format if first partition invalid */ | 128 | /* sanity check: no ICD format if first partition invalid */ |
129 | if (OK_id(pi->id)) { | 129 | if (OK_id(pi->id)) { |
130 | printk(" ICD<"); | 130 | strlcat(state->pp_buf, " ICD<", PAGE_SIZE); |
131 | for (; pi < &rs->icdpart[8] && slot < state->limit; slot++, pi++) { | 131 | for (; pi < &rs->icdpart[8] && slot < state->limit; slot++, pi++) { |
132 | /* accept only GEM,BGM,RAW,LNX,SWP partitions */ | 132 | /* accept only GEM,BGM,RAW,LNX,SWP partitions */ |
133 | if (!((pi->flg & 1) && OK_id(pi->id))) | 133 | if (!((pi->flg & 1) && OK_id(pi->id))) |
@@ -137,13 +137,13 @@ int atari_partition(struct parsed_partitions *state) | |||
137 | be32_to_cpu(pi->st), | 137 | be32_to_cpu(pi->st), |
138 | be32_to_cpu(pi->siz)); | 138 | be32_to_cpu(pi->siz)); |
139 | } | 139 | } |
140 | printk(" >"); | 140 | strlcat(state->pp_buf, " >", PAGE_SIZE); |
141 | } | 141 | } |
142 | } | 142 | } |
143 | #endif | 143 | #endif |
144 | put_dev_sector(sect); | 144 | put_dev_sector(sect); |
145 | 145 | ||
146 | printk ("\n"); | 146 | strlcat(state->pp_buf, "\n", PAGE_SIZE); |
147 | 147 | ||
148 | return 1; | 148 | return 1; |
149 | } | 149 | } |