← Back to branch summary

~ubuntu-branches/debian/jessie/btrfs-tools/jessie

« back to all changes in this revision

Viewing changes to .pc/0001-Fixing-unaligned-memory-accesses.patch/volumes.c

  • Committer: Package Import Robot
  • Author(s): Dimitri John Ledkov
  • Date: 2014-10-23 22:04:07 UTC
  • mfrom: (1.2.15) (6.1.40 sid)
  • Revision ID: package-import@ubuntu.com-20141023220407-skt9hy0ft4oim95o
Tags: 3.17-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/0001-Fixing-unaligned-memory-accesses.patch/volumes.c
116
116
                }
117
117
                device->fd = -1;
118
118
                device->devid = devid;
 
119
                device->generation = found_transid;
119
120
                memcpy(device->uuid, disk_super->dev_item.uuid,
120
121
                       BTRFS_UUID_SIZE);
121
122
                device->name = kstrdup(path, GFP_NOFS);
1672
1673
 
1673
1674
        fs_devices = find_fsid(fsid);
1674
1675
        if (!fs_devices) {
1675
 
                ret = -ENOENT;
1676
 
                goto out;
 
1676
                /* missing all seed devices */
 
1677
                fs_devices = kzalloc(sizeof(*fs_devices), GFP_NOFS);
 
1678
                if (!fs_devices) {
 
1679
                        ret = -ENOMEM;
 
1680
                        goto out;
 
1681
                }
 
1682
                INIT_LIST_HEAD(&fs_devices->devices);
 
1683
                list_add(&fs_devices->list, &fs_uuids);
 
1684
                memcpy(fs_devices->fsid, fsid, BTRFS_FSID_SIZE);
1677
1685
        }
1678
1686
 
1679
1687
        ret = btrfs_open_devices(fs_devices, O_RDONLY);