socsvn commit: r238605 - soc2012/oleksandr/udf-head/sys/fs/udf2
oleksandr at FreeBSD.org
oleksandr at FreeBSD.org
Fri Jun 29 20:12:26 UTC 2012
Author: oleksandr
Date: Fri Jun 29 20:12:23 2012
New Revision: 238605
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238605
Log:
Fix style of return operator, remove unused code in udf_read_anchors, and add missing brackets
Modified:
soc2012/oleksandr/udf-head/sys/fs/udf2/udf_subr.c
soc2012/oleksandr/udf-head/sys/fs/udf2/udf_vfsops.c
soc2012/oleksandr/udf-head/sys/fs/udf2/udf_vnops.c
Modified: soc2012/oleksandr/udf-head/sys/fs/udf2/udf_subr.c
==============================================================================
--- soc2012/oleksandr/udf-head/sys/fs/udf2/udf_subr.c Fri Jun 29 19:51:06 2012 (r238604)
+++ soc2012/oleksandr/udf-head/sys/fs/udf2/udf_subr.c Fri Jun 29 20:12:23 2012 (r238605)
@@ -176,13 +176,13 @@
error = VOP_IOCTL(devvp, MMCGETDISCINFO, di, FKIOCTL, NOCRED, td);
if (error == 0) {
udf_dump_discinfo(ump);
- return 0;
+ return (0);
}
#if 0
/* disc partition support */
error = VOP_IOCTL(devvp, DIOCGPART, &dpart, FREAD, NOCRED, td);
if (error)
- return ENODEV;
+ return (ENODEV);
#endif
/* set up a disc info profile for partitions */
di->mmc_profile = 0x01; /* disc type */
@@ -208,7 +208,7 @@
di->first_track_last_session = di->last_track_last_session = 1;
udf_dump_discinfo(ump);
- return 0;
+ return (0);
}
@@ -227,12 +227,12 @@
if (class != MMC_CLASS_DISC) {
/* tracknr specified in struct ti */
error = VOP_IOCTL(devvp, MMCGETTRACKINFO, ti, FKIOCTL, NOCRED, td);
- return error;
+ return (error);
}
/* disc partition support */
if (ti->tracknr != 1)
- return EIO;
+ return (EIO);
/* create fake ti (TODO check for resized vnds) */
ti->sessionnr = 1;
@@ -250,7 +250,7 @@
ti->last_recorded = ti->next_writable;
ti->free_blocks = 0;
- return 0;
+ return (0);
}
#if 0
@@ -261,7 +261,7 @@
int error;
if (ump->discinfo.mmc_class == MMC_CLASS_DISC)
- return 0;
+ return (0);
/*
* only CD burning normally needs setting up, but other disc types
@@ -292,7 +292,7 @@
error = VOP_IOCTL(ump->devvp, MMCSETUPWRITEPARAMS,
&mmc_writeparams, FKIOCTL, NOCRED);
}
- return error;
+ return (error);
}
@@ -304,11 +304,11 @@
DPRINTF(CALL, ("udf_synchronise_caches()\n"));
if (ump->vfs_mountp->mnt_flag & MNT_RDONLY)
- return 0;
+ return (0);
/* discs are done now */
if (ump->discinfo.mmc_class == MMC_CLASS_DISC)
- return 0;
+ return (0);
memset(&mmc_op, 0, sizeof(struct mmc_op));
mmc_op.operation = MMC_OP_SYNCHRONISECACHE;
@@ -316,7 +316,7 @@
/* ignore return code */
(void) VOP_IOCTL(ump->devvp, MMCOP, &mmc_op, FKIOCTL, NOCRED);
- return 0;
+ return (0);
}
/* --------------------------------------------------------------------- */
@@ -362,7 +362,7 @@
trackinfo.tracknr = tracknr;
error = udf_update_trackinfo(ump, &trackinfo);
if (error)
- return error;
+ return (error);
if (trackinfo.sessionnr == args->sessionnr)
break;
@@ -387,11 +387,11 @@
if (*last_tracknr < *first_tracknr) {
printf( "udf_search_tracks: sanity check on drive+disc failed, "
"drive returned garbage\n");
- return EINVAL;
+ return (EINVAL);
}
/* assert(*last_tracknr >= *first_tracknr); */
- return 0;
+ return (0);
}
#if 0
@@ -511,7 +511,7 @@
/* update discinfo since it might have changed */
error = udf_update_discinfo(ump);
if (error)
- return error;
+ return (error);
num_tracks = ump->discinfo.num_tracks;
start_track = ump->discinfo.first_track;
@@ -520,7 +520,7 @@
trackinfo.tracknr = start_track;
error = udf_update_trackinfo(ump, &trackinfo);
if (error)
- return error;
+ return (error);
/* copy results to our mount point */
ump->data_track = trackinfo;
@@ -528,14 +528,14 @@
/* if not sequential, we're done */
if (num_tracks == 1)
- return 0;
+ return (0);
for (tracknr = start_track;tracknr <= num_tracks; tracknr++) {
/* get track info */
trackinfo.tracknr = tracknr;
error = udf_update_trackinfo(ump, &trackinfo);
if (error)
- return error;
+ return (error);
/*
* If this track is marked damaged, ask for repair. This is an
@@ -555,7 +555,7 @@
/* reget track info */
error = udf_update_trackinfo(ump, &trackinfo);
if (error)
- return error;
+ return (error);
}
if ((trackinfo.flags & MMC_TRACKINFO_NWA_VALID) == 0)
continue;
@@ -583,12 +583,12 @@
}
if ((ump->data_track.flags & MMC_TRACKINFO_NWA_VALID) == 0)
- return EROFS;
+ return (EROFS);
if ((ump->metadata_track.flags & MMC_TRACKINFO_NWA_VALID) == 0)
- return EROFS;
+ return (EROFS);
- return 0;
+ return (0);
}
#endif
@@ -617,10 +617,10 @@
}
if (sum != tag->cksum) {
/* bad tag header checksum; this is not a valid tag */
- return EINVAL;
+ return (EINVAL);
}
- return 0;
+ return (0);
}
@@ -639,18 +639,18 @@
/* check payload CRC if applicable */
if (crc_len == 0)
- return 0;
+ return (0);
if (crc_len > max_length)
- return EIO;
+ return (EIO);
crc = udf_cksum(((uint8_t *) tag) + UDF_DESC_TAG_LENGTH, crc_len);
if (crc != le16toh(tag->desc_crc)) {
/* bad payload CRC; this is a broken tag */
- return EINVAL;
+ return (EINVAL);
}
- return 0;
+ return (0);
}
@@ -773,7 +773,7 @@
size = UDF_FID_SIZE + fid->l_fi + le16toh(fid->l_iu);
size = (size + 3) & ~3;
- return size;
+ return (size);
}
/* --------------------------------------------------------------------- */
@@ -831,7 +831,7 @@
if (!error) {
/* blank terminator blocks are not allowed here */
if (*dst == NULL)
- return ENOENT;
+ return (ENOENT);
if (le16toh((*dst)->tag.id) != TAGID_ANCHOR) {
error = ENOENT;
free(*dst, M_UDFTEMP);
@@ -839,7 +839,7 @@
}
}
- return error;
+ return (error);
}
void
@@ -896,7 +896,7 @@
}
if (error) {
printf("UDF mount: reading disc geometry failed\n");
- return 0;
+ return (0);
}
track_start = first_track.track_start;
@@ -941,43 +941,6 @@
int
udf_read_anchors(struct udf_mount *ump)
{
-#if 0
- struct anchor_vdp **anchorsp;
- int error, anch, ok, first_anchor;
- uint32_t positions[4], track_start, track_end;
-
- track_start = ump->session_start;
- track_end = ump->session_end;
-
- /* read anchors start+256, start+512, end-256, end */
- positions[0] = track_start+256;
- if (track_end) {
- positions[1] = track_end-256;
- positions[2] = track_end;
- } else {
- positions[1] = 0;
- positions[2] = 0;
- }
- positions[3] = track_start+512; /* [UDF 2.60/6.11.2] */
- /* XXX shouldn't +512 be prefered above +256 for compat with Roxio CD */
-
- ok = 0;
- anchorsp = ump->anchors;
- first_anchor = 0;
- if (ump->first_trackblank)
- first_anchor = 1;
- for (anch = first_anchor; anch < 4; anch++) {
- if (positions[anch]) {
- error = udf_read_anchor(ump, positions[anch], anchorsp);
- if (!error) {
- anchorsp++;
- ok++;
- }
- }
- }
-
- return ok;
-#endif
struct udf_args *args = &ump->mount_args;
struct mmc_trackinfo first_track;
struct mmc_trackinfo second_track;
@@ -1005,7 +968,7 @@
}
if (error) {
printf("UDF mount: reading disc geometry failed\n");
- return 0;
+ return (0);
}
track_start = first_track.track_start;
@@ -1063,7 +1026,7 @@
ump->first_possible_vat_location = track_start + 2;
ump->last_possible_vat_location = track_end + last_track.packet_size;
- return ok;
+ return (ok);
}
/* --------------------------------------------------------------------- */
@@ -1080,7 +1043,7 @@
if (udf_node == udf_node->ump->metadatabitmap_node)
what = UDF_C_METADATA_SBM;
- return what;
+ return (what);
}
@@ -1095,7 +1058,7 @@
if (udf_c_type == UDF_C_FIDS)
vpart_num = ump->fids_part;
- return vpart_num;
+ return (vpart_num);
}
#endif
@@ -1221,9 +1184,10 @@
/* dscr is assigned into ump */
error = udf_process_vds_descriptor(ump, dscr);
- if (error)
+ if (error) {
free(dscr, M_UDFTEMP);
break;
+ }
/* assert((dscr_size % sector_size) == 0); */
len -= dscr_size;
@@ -1384,7 +1348,7 @@
error = ENOENT;
ump->logvol_integrity = lvint;
- return error;
+ return (error);
}
#if 0
@@ -1541,7 +1505,7 @@
free(bufs, M_UDFTEMP);
- return 0;
+ return (0);
}
@@ -1579,17 +1543,17 @@
if ((space < 3) && (lvflag & UDF_APPENDONLY_LVINT)) {
/* don't allow this logvol to be opened */
/* TODO extent LVINT space if possible */
- return EROFS;
+ return (EROFS);
}
}
if (space < 1) {
if (lvflag & UDF_APPENDONLY_LVINT)
- return EROFS;
+ return (EROFS);
/* loose history by re-writing extents */
error = udf_loose_lvint_history(ump);
if (error)
- return error;
+ return (error);
goto again;
}
@@ -1608,7 +1572,7 @@
sector, sector);
DPRINTF(VOLUMES, ("writeout lvint : error = %d\n", error));
if (error)
- return error;
+ return (error);
/* advance write position */
trace->wpos++; space--;
@@ -1627,7 +1591,7 @@
DPRINTF(VOLUMES, ("finished writing out logvol integrity descriptor "
"successfull\n"));
- return error;
+ return (error);
}
/* --------------------------------------------------------------------- */
@@ -1679,12 +1643,12 @@
printf( "UDF mount: error reading unallocated "
"space bitmap\n");
- return EROFS;
+ return (EROFS);
}
} else {
/* blank not allowed */
printf("UDF mount: blank unallocated space bitmap\n");
- return EROFS;
+ return (EROFS);
}
}
@@ -1698,7 +1662,7 @@
len = le32toh(parthdr->unalloc_space_table.len);
if (len) {
printf("UDF mount: space tables not supported\n");
- return EROFS;
+ return (EROFS);
}
}
@@ -1738,12 +1702,12 @@
printf( "UDF mount: error reading freed "
"space bitmap\n");
- return EROFS;
+ return (EROFS);
}
} else {
/* blank not allowed */
printf("UDF mount: blank freed space bitmap\n");
- return EROFS;
+ return (EROFS);
}
}
@@ -1757,11 +1721,11 @@
len = le32toh(parthdr->freed_space_table.len);
if (len) {
printf("UDF mount: space tables not supported\n");
- return EROFS;
+ return (EROFS);
}
}
- return 0;
+ return (0);
}
@@ -1829,7 +1793,7 @@
}
}
- return error_all;
+ return (error_all);
}
#endif
@@ -1847,7 +1811,7 @@
/* only read in when metadata bitmap node is read in */
if (bitmap_node == NULL)
- return 0;
+ return (0);
if (bitmap_node->fe) {
inflen = le64toh(bitmap_node->fe->inf_len);
@@ -1862,7 +1826,7 @@
/* allocate space for bitmap */
dscr = malloc(inflen, M_UDFTEMP, M_WAITOK); /*M_CANFAIL was removed from third param*/
if (!dscr)
- return ENOMEM;
+ return (ENOMEM);
/* set vnode type to regular file or we can't read from it! */
bitmap_node->vnode->v_type = VREG;
@@ -1899,13 +1863,13 @@
goto errorout;
}
- return 0;
+ return (0);
errorout:
free(dscr, M_UDFTEMP);
printf( "UDF mount: error reading unallocated "
"space bitmap for metadata partition\n");
- return EROFS;
+ return (EROFS);
}
@@ -1921,7 +1885,7 @@
/* only write out when metadata bitmap node is known */
if (bitmap_node == NULL)
- return 0;
+ return (0);
if (bitmap_node->fe) {
inflen = le64toh(bitmap_node->fe->inf_len);
@@ -1958,7 +1922,7 @@
printf( "Error writing out metadata partition unalloced "
"space bitmap!\n");
- return error;
+ return (error);
}
#endif
@@ -2244,7 +2208,7 @@
(ump->strategy == &udf_strat_rmw) ? "RMW" : "UNKNOWN!"));
#endif
/* signal its OK for now */
- return 0;
+ return (0);
}
/* --------------------------------------------------------------------- */
@@ -2305,7 +2269,7 @@
ump->logvol_integrity->lvint_next_unique_id = htole64(unique_id + 1);
mutex_exit(&ump->logvol_mutex);
- return unique_id;
+ return (unique_id);
}
@@ -2410,7 +2374,7 @@
fid->tag.desc_crc_len = htole16(fidsize - UDF_DESC_TAG_LENGTH);
(void) udf_validate_tag_and_crc_sums((union dscrptr *) fid);
- return fidsize;
+ return (fidsize);
}
#endif
/* --------------------------------------------------------------------- */
@@ -2447,9 +2411,9 @@
/* checksum valid? */
spos = (uint16_t *) implext->data;
if (le16toh(*spos) != udf_ea_cksum((uint8_t *) implext))
- return EINVAL;
+ return (EINVAL);
}
- return 0;
+ return (0);
}
static void
@@ -2479,7 +2443,7 @@
uint8_t *pos;
/* get mountpoint */
- sector_size = node->ump->sector_size;
+ sector_size = node->ump->discinfo.sector_size;
/* get information from fe/efe */
if (node->fe) {
@@ -2492,17 +2456,17 @@
/* something recorded here? */
if (l_ea == 0)
- return ENOENT;
+ return (ENOENT);
/* check extended attribute tag; what to do if it fails? */
error = udf_check_tag(eahdr);
if (error)
- return EINVAL;
+ return (EINVAL);
if (le16toh(eahdr->tag.id) != TAGID_EXTATTR_HDR)
- return EINVAL;
+ return (EINVAL);
error = udf_check_tag_payload(eahdr, sizeof(struct extattrhdr_desc));
if (error)
- return EINVAL;
+ return (EINVAL);
/* looking for Ecma-167 attributes? */
offset = sizeof(struct extattrhdr_desc);
@@ -2511,17 +2475,17 @@
if (sattr == 2048) { /* [4/48.10.8] */
offset = le32toh(eahdr->impl_attr_loc);
if (offset == UDF_IMPL_ATTR_LOC_NOT_PRESENT)
- return ENOENT;
+ return (ENOENT);
}
if (sattr == 65536) { /* [4/48.10.9] */
offset = le32toh(eahdr->appl_attr_loc);
if (offset == UDF_APPL_ATTR_LOC_NOT_PRESENT)
- return ENOENT;
+ return (ENOENT);
}
/* paranoia check offset and l_ea */
if (l_ea + offset >= sector_size - sizeof(struct extattr_entry))
- return EINVAL;
+ return (EINVAL);
/* find our extended attribute */
l_ea -= offset;
@@ -2534,7 +2498,7 @@
/* get complete attribute length and check for roque values */
a_l = le32toh(attrhdr->a_l);
if ((a_l == 0) || (a_l > l_ea))
- return EINVAL;
+ return (EINVAL);
if (attrhdr->type != sattr)
goto next_attribute;
@@ -2543,7 +2507,7 @@
if (attrhdr->type < 2048) { /* Ecma-167 attribute */
*offsetp = offset;
*lengthp = a_l;
- return 0; /* success */
+ return (0); /* success */
}
/*
@@ -2557,7 +2521,7 @@
/* we have found our appl/implementation attribute */
*offsetp = offset;
*lengthp = a_l;
- return 0; /* success */
+ return (0); /* success */
}
next_attribute:
@@ -2567,7 +2531,7 @@
offset += a_l;
}
/* not found */
- return ENOENT;
+ return (ENOENT);
}
@@ -2711,16 +2675,16 @@
error = udf_extattr_search_intern(vat_node, 2048, extstr, &offset, &a_l);
if (error)
- return error;
+ return (error);
implext = (struct impl_extattr_entry *) (ea_start + offset);
error = udf_impl_extattr_check(implext);
if (error)
- return error;
+ return (error);
/* paranoia */
if (a_l != sizeof(*implext) -1 + le32toh(implext->iu_l) + sizeof(lvext))
- return EINVAL;
+ return (EINVAL);
/*
* we have found our "VAT LVExtension attribute. BUT due to a
@@ -2742,7 +2706,7 @@
udf_calc_impl_extattr_checksum(implext);
}
- return 0;
+ return (0);
}
#if 0
@@ -2774,7 +2738,7 @@
error = udf_extattr_search_intern(vat_node, 2048, extstr, &offset, &a_l);
if (error)
- return error;
+ return (error);
/* found, it existed */
/* paranoia */
@@ -2782,7 +2746,7 @@
error = udf_impl_extattr_check(implext);
if (error) {
DPRINTF(VOLUMES, ("VAT LVExtension bad on update\n"));
- return error;
+ return (error);
}
/* it is correct */
@@ -2801,7 +2765,7 @@
memcpy(lvextpos, &lvext, sizeof(lvext));
- return 0;
+ return (0);
}
#endif
/* --------------------------------------------------------------------- */
@@ -2813,11 +2777,11 @@
/* mutex_enter(&ump->allocate_mutex); */
if (offset + size > ump->vat_offset + ump->vat_entries * 4)
- return EINVAL;
+ return (EINVAL);
memcpy(blob, ump->vat_table + offset, size);
/* mutex_exit(&ump->allocate_mutex); */
- return 0;
+ return (0);
}
#if 0
@@ -2837,7 +2801,7 @@
M_UDFTEMP, M_WAITOK | M_CANFAIL);
if (!new_vat_table) {
printf("udf_vat_write: can't extent VAT, out of mem\n");
- return ENOMEM;
+ return (ENOMEM);
}
ump->vat_table = new_vat_table;
ump->vat_table_alloc_len += UDF_VAT_CHUNKSIZE;
@@ -2845,7 +2809,7 @@
ump->vat_table_len = MAX(ump->vat_table_len, offset_high);
memcpy(ump->vat_table + offset, blob, size);
- return 0;
+ return (0);
}
/* --------------------------------------------------------------------- */
@@ -2925,7 +2889,7 @@
}
free(raw_vat, M_UDFTEMP);
- return error; /* success! */
+ return (error); /* success! */
}
@@ -2962,7 +2926,7 @@
printf("udf_writeout_vat: error writing VAT node!\n");
out:
- return error;
+ return (error);
}
#endif
@@ -2992,7 +2956,7 @@
/* vat_length is really 64 bits though impossible */
if (!vat_node)
- return ENOENT;
+ return (ENOENT);
/* get mount info */
ump = vat_node->ump;
@@ -3021,7 +2985,7 @@
/* Check icb filetype! it has to be 0 or UDF_ICB_FILETYPE_VAT */
filetype = icbtag->file_type;
if ((filetype != 0) && (filetype != UDF_ICB_FILETYPE_VAT))
- return ENOENT;
+ return (ENOENT);
vat_table_alloc_len =
((vat_length + UDF_VAT_CHUNKSIZE-1) / UDF_VAT_CHUNKSIZE)
@@ -3033,7 +2997,7 @@
if (vat_table == NULL) {
printf("allocation of %d bytes failed for VAT\n",
vat_table_alloc_len);
- return ENOMEM;
+ return (ENOMEM);
}
#endif
@@ -3137,7 +3101,7 @@
}
free(raw_vat, M_UDFTEMP);
- return error;
+ return (error);
}
/* --------------------------------------------------------------------- */
@@ -3205,7 +3169,7 @@
/* keep our VAT node around */
ump->vat_node = vat_node;
- return error;
+ return (error);
}
/* --------------------------------------------------------------------- */
@@ -3244,9 +3208,9 @@
}
if (ump->sparing_table)
- return 0;
+ return (0);
- return ENOENT;
+ return (ENOENT);
}
/* --------------------------------------------------------------------- */
@@ -3325,7 +3289,7 @@
}
/* DPRINTFIF(VOLUMES, error, ("udf mount: failed to read "
"metadata files\n")); */
- return error;
+ return (error);
}
/* --------------------------------------------------------------------- */
@@ -3353,19 +3317,19 @@
/* search and load VAT */
error = udf_search_vat(ump, mapping);
if (error)
- return ENOENT;
+ return (ENOENT);
break;
case UDF_VTOP_TYPE_SPARABLE :
/* load one of the sparable tables */
error = udf_read_sparables(ump, mapping);
if (error)
- return ENOENT;
+ return (ENOENT);
break;
case UDF_VTOP_TYPE_META :
/* load the associated file descriptors */
error = udf_read_metadata_nodes(ump, mapping);
if (error)
- return ENOENT;
+ return (ENOENT);
break;
default:
break;
@@ -3379,14 +3343,14 @@
if ((ump->vfs_mountp->mnt_flag & MNT_RDONLY) == 0) {
error = udf_read_physical_partition_spacetables(ump);
if (error)
- return error;
+ return (error);
/* also read in metadata partition spacebitmap if defined */
error = udf_read_metadata_partition_spacetable(ump);
return error;
}
#endif
- return 0;
+ return (0);
}
/* --------------------------------------------------------------------- */
@@ -3429,7 +3393,7 @@
break;
if (dscr_type != TAGID_FSD) {
free(dscr, M_UDFTEMP);
- return ENOENT;
+ return (ENOENT);
}
/*
@@ -3461,7 +3425,7 @@
/* there has to be one */
if (ump->fileset_desc == NULL)
- return ENOENT;
+ return (ENOENT);
DPRINTF(VOLUMES, ("FSD read in fine\n"));
DPRINTF(VOLUMES, ("Updating fsd logical volume id\n"));
@@ -3482,7 +3446,7 @@
ino = udf_get_node_id(dir_loc);
error = udf_vget(mp, ino, LK_EXCLUSIVE, &rootdir_node);
if (error)
- return ENOENT;
+ return (ENOENT);
/* aparently it read in fine */
@@ -3514,7 +3478,7 @@
vput(rootdir_node);
}
- return 0;
+ return (0);
}
/* --------------------------------------------------------------------- */
@@ -3542,7 +3506,7 @@
ino = (blkn + 1) | (part << 29);
//printf("Raw blkno: %u, raw part: %u\n", icbptr->loc.lb_num, icbptr->loc.part_num);
//printf("udf_get_node_id -- blkno: %u, part: %u, ino: %u\n", blkn, part, ino);
- return ino;
+ return (ino);
}
int
@@ -3561,7 +3525,7 @@
//printf("Raw blkno: %u, raw part: %u\n", icbptr->loc.lb_num, icbptr->loc.part_num);
//printf("udf_get_node_longad -- blkno: %u, part: %u, ino: %u\n", blkn, part, ino2);
- return 0;
+ return (0);
}
#if 0
@@ -3569,16 +3533,16 @@
udf_compare_icb(const struct long_ad *a, const struct long_ad *b)
{
if (le16toh(a->loc.part_num) < le16toh(b->loc.part_num))
- return -1;
+ return (-1);
if (le16toh(a->loc.part_num) > le16toh(b->loc.part_num))
- return 1;
+ return (1);
if (le32toh(a->loc.lb_num) < le32toh(b->loc.lb_num))
- return -1;
+ return (-1);
if (le32toh(a->loc.lb_num) > le32toh(b->loc.lb_num))
- return 1;
+ return (1);
- return 0;
+ return (0);
}
@@ -3588,7 +3552,7 @@
struct udf_node *a_node = RBTOUDFNODE(a);
struct udf_node *b_node = RBTOUDFNODE(b);
- return udf_compare_icb(&a_node->loc, &b_node->loc);
+ return (udf_compare_icb(&a_node->loc, &b_node->loc));
}
@@ -3598,7 +3562,7 @@
struct udf_node *a_node = RBTOUDFNODE(a);
const struct long_ad * const icb = key;
- return udf_compare_icb(&a_node->loc, icb);
+ return (udf_compare_icb(&a_node->loc, icb));
}
@@ -3634,11 +3598,11 @@
mutex_exit(&ump->ihash_lock);
if (vget(vp, LK_EXCLUSIVE))
goto loop;
- return udf_node;
+ return (udf_node);
}
mutex_exit(&ump->ihash_lock);
- return NULL;
+ return (NULL);
}
@@ -3680,11 +3644,11 @@
/* disc appendable? */
if (ump->discinfo.disc_state == MMC_STATE_FULL)
- return EROFS;
+ return (EROFS);
/* already written here? if so, there should be an ISO VDS */
if (ump->discinfo.last_session_state == MMC_STATE_INCOMPLETE)
- return 0;
+ return (0);
/*
* Check if the first track of the session is blank and if so, copy or
@@ -3696,7 +3660,7 @@
trackinfo.tracknr = tracknr;
error = udf_update_trackinfo(ump, &trackinfo);
if (error)
- return error;
+ return (error);
udf_dump_trackinfo(&trackinfo);
KASSERT(trackinfo.flags & (MMC_TRACKINFO_BLANK | MMC_TRACKINFO_RESERVED));
@@ -3716,13 +3680,13 @@
trackinfo.tracknr = tracknr;
error = udf_update_trackinfo(ump, &trackinfo);
if (error)
- return error;
+ return (error);
if (trackinfo.sessionnr == sessionnr)
break;
tracknr++;
}
if (trackinfo.sessionnr != sessionnr)
- return ENOENT;
+ return (ENOENT);
udf_dump_trackinfo(&trackinfo);
@@ -3840,7 +3804,7 @@
/* synchronise device caches */
(void) udf_synchronise_caches(ump);
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-soc-all
mailing list