← Back to branch summary

~ubuntu-branches/ubuntu/utopic/multipath-tools/utopic-201407221312

« back to all changes in this revision

Viewing changes to kpartx/kpartx.c

  • Committer: Colin Watson
  • Date: 2012-01-27 11:24:50 UTC
  • mfrom: (41.1.1 multipath-tools)
  • Revision ID: cjwatson@canonical.com-20120127112450-77j6wqc8ui8e14bb
Tags: 0.4.9-3ubuntu2
merge lp:~psusi/ubuntu/precise/multipath-tools/dmraid-fix-gpt

Show diffs side-by-side

added added

removed removed

Lines of Context:
kpartx/kpartx.c
310
310
                device = loopdev;
311
311
        }
312
312
 
313
 
        if (delim == NULL) {
314
 
                delim = malloc(DELIM_SIZE);
315
 
                memset(delim, 0, DELIM_SIZE);
316
 
                set_delimiter(device, delim);
317
 
        }
318
 
 
319
313
        off = find_devname_offset(device);
320
314
 
321
315
        if (!loopdev) {
331
325
        if (!mapname)
332
326
                mapname = device + off;
333
327
 
 
328
        if (delim == NULL) {
 
329
                delim = malloc(DELIM_SIZE);
 
330
                memset(delim, 0, DELIM_SIZE);
 
331
                set_delimiter(mapname, delim);
 
332
        }
 
333
 
334
334
        fd = open(device, O_RDONLY);
335
335
 
336
336
        if (fd == -1) {