diff options
| author | Hannes Reinecke | 2014-03-20 11:03:50 +0100 |
|---|---|---|
| committer | Karel Zak | 2014-03-20 15:26:48 +0100 |
| commit | 37f4060225df0591ab8e1dd676dbc8115d900d4f (patch) | |
| tree | 47b445e8868687025b4769ada1824a5bdd2e8b8e /libblkid/src/superblocks/nilfs.c | |
| parent | blkid: stop scanning on I/O error (diff) | |
| download | kernel-qcow2-util-linux-37f4060225df0591ab8e1dd676dbc8115d900d4f.tar.gz kernel-qcow2-util-linux-37f4060225df0591ab8e1dd676dbc8115d900d4f.tar.xz kernel-qcow2-util-linux-37f4060225df0591ab8e1dd676dbc8115d900d4f.zip | |
blkid: convert superblocks to new calling convention
With the previous patch the scanning functions were
modified to return a differentiated return code.
To correctly abort scanning when an I/O error occurs
we need to differentiate between 'error' (= -1) and
'not found' (= 1) in the probe functions.
This patch updates all superblock scanning functions
to the new calling convention.
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libblkid/src/superblocks/nilfs.c')
| -rw-r--r-- | libblkid/src/superblocks/nilfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libblkid/src/superblocks/nilfs.c b/libblkid/src/superblocks/nilfs.c index 24ccf633e..894dadf53 100644 --- a/libblkid/src/superblocks/nilfs.c +++ b/libblkid/src/superblocks/nilfs.c @@ -93,12 +93,12 @@ static int probe_nilfs2(blkid_probe pr, const struct blkid_idmag *mag) sbp = (struct nilfs_super_block *) blkid_probe_get_buffer( pr, NILFS_SB_OFFSET, sizeof(struct nilfs_super_block)); if (!sbp) - return -1; + return errno ? -errno : 1; /* backup */ sbb = (struct nilfs_super_block *) blkid_probe_get_buffer( pr, ((pr->size / 0x200) - 8) * 0x200, sizeof(struct nilfs_super_block)); if (!sbp) - return -1; + return errno ? -errno : 1; /* * Compare two super blocks and set 1 in swp if the secondary |