summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2017-02-14 09:50:09 +0200
committerHans Rosenfeld <rosenfeld@grumpf.hope-2000.org>2017-02-23 15:52:04 +0100
commitc99fb8b374bfc91bf70c6decb2ee7fb9f4a0be58 (patch)
tree36e208b34f9ea8b7b23bb116e46ff070a877716d
parente1419c48e5d913ef3df4ed3fd63dda38e84ffad1 (diff)
downloadillumos-gate-c99fb8b374bfc91bf70c6decb2ee7fb9f4a0be58.tar.gz
7859 uts: indentation errors
Reviewed by: Marcel Telka <marcel@telka.sk> Reviewed by: Juraj Lutter <juraj@lutter.sk> Reviewed by: Yuri Pankov <yuri.pankov@gmail.com> Reviewed by: Dale Ghent <daleg@omniti.com> Approved by: Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
-rw-r--r--usr/src/uts/common/syscall/sendfile.c13
-rw-r--r--usr/src/uts/common/vm/seg_spt.c17
-rw-r--r--usr/src/uts/common/vm/vm_usage.c3
3 files changed, 18 insertions, 15 deletions
diff --git a/usr/src/uts/common/syscall/sendfile.c b/usr/src/uts/common/syscall/sendfile.c
index cb8246f584..822f14416c 100644
--- a/usr/src/uts/common/syscall/sendfile.c
+++ b/usr/src/uts/common/syscall/sendfile.c
@@ -345,7 +345,7 @@ sendvec_chunk64(file_t *fp, u_offset_t *fileoff, struct ksendfilevec64 *sfv,
ssize32_t
sendvec64(file_t *fp, const struct ksendfilevec64 *vec, int sfvcnt,
- size32_t *xferred, int fildes)
+ size32_t *xferred, int fildes)
{
u_offset_t fileoff;
int copy_cnt;
@@ -1316,12 +1316,13 @@ sendfilev(int opcode, int fildes, const struct sendfilevec *vec, int sfvcnt,
#ifdef _SYSCALL32_IMPL
- if (get_udatamodel() == DATAMODEL_ILP32)
- copy_vec = (const struct sendfilevec *)((char *)copy_vec +
- (copy_cnt * sizeof (ksendfilevec32_t)));
- else
+ if (get_udatamodel() == DATAMODEL_ILP32) {
+ copy_vec = (const struct sendfilevec *)
+ ((char *)copy_vec +
+ (copy_cnt * sizeof (ksendfilevec32_t)));
+ } else
#endif
- copy_vec += copy_cnt;
+ copy_vec += copy_cnt;
sfvcnt -= copy_cnt;
/* Process all vector members up to first error */
diff --git a/usr/src/uts/common/vm/seg_spt.c b/usr/src/uts/common/vm/seg_spt.c
index 6a4389676c..b0f992b7a6 100644
--- a/usr/src/uts/common/vm/seg_spt.c
+++ b/usr/src/uts/common/vm/seg_spt.c
@@ -185,7 +185,7 @@ static int spt_anon_getpages(struct seg *seg, caddr_t addr, size_t len,
/*ARGSUSED*/
int
sptcreate(size_t size, struct seg **sptseg, struct anon_map *amp,
- uint_t prot, uint_t flags, uint_t share_szc)
+ uint_t prot, uint_t flags, uint_t share_szc)
{
int err;
struct as *newas;
@@ -249,10 +249,11 @@ segspt_free(struct seg *seg)
if (sptd->spt_realsize)
segspt_free_pages(seg, seg->s_base, sptd->spt_realsize);
- if (sptd->spt_ppa_lckcnt)
- kmem_free(sptd->spt_ppa_lckcnt,
- sizeof (*sptd->spt_ppa_lckcnt)
- * btopr(sptd->spt_amp->size));
+ if (sptd->spt_ppa_lckcnt) {
+ kmem_free(sptd->spt_ppa_lckcnt,
+ sizeof (*sptd->spt_ppa_lckcnt)
+ * btopr(sptd->spt_amp->size));
+ }
kmem_free(sptd->spt_vp, sizeof (*sptd->spt_vp));
cv_destroy(&sptd->spt_cv);
mutex_destroy(&sptd->spt_lock);
@@ -263,7 +264,7 @@ segspt_free(struct seg *seg)
/*ARGSUSED*/
static int
segspt_shmsync(struct seg *seg, caddr_t addr, size_t len, int attr,
- uint_t flags)
+ uint_t flags)
{
ASSERT(seg->s_as && AS_LOCK_HELD(seg->s_as));
@@ -1434,7 +1435,7 @@ segspt_purge(struct seg *seg)
static int
segspt_reclaim(void *ptag, caddr_t addr, size_t len, struct page **pplist,
- enum seg_rw rw, int async)
+ enum seg_rw rw, int async)
{
struct seg *seg = (struct seg *)ptag;
struct shm_data *shmd = (struct shm_data *)seg->s_data;
@@ -1573,7 +1574,7 @@ segspt_reclaim(void *ptag, caddr_t addr, size_t len, struct page **pplist,
*/
static void
segspt_softunlock(struct seg *seg, caddr_t sptseg_addr,
- size_t len, enum seg_rw rw)
+ size_t len, enum seg_rw rw)
{
struct shm_data *shmd = (struct shm_data *)seg->s_data;
struct seg *sptseg;
diff --git a/usr/src/uts/common/vm/vm_usage.c b/usr/src/uts/common/vm/vm_usage.c
index 57166b4e63..e542e8e479 100644
--- a/usr/src/uts/common/vm/vm_usage.c
+++ b/usr/src/uts/common/vm/vm_usage.c
@@ -1547,9 +1547,10 @@ vmu_calculate_proc(proc_t *p)
static void
vmu_clear_calc()
{
- if (vmu_data.vmu_system != NULL)
+ if (vmu_data.vmu_system != NULL) {
vmu_free_entity(vmu_data.vmu_system);
vmu_data.vmu_system = NULL;
+ }
if (vmu_data.vmu_zones_hash != NULL)
i_mod_hash_clear_nosync(vmu_data.vmu_zones_hash);
if (vmu_data.vmu_projects_col_hash != NULL)