clang-format

kern/fs/semfs/semfs.h

@@ -42,7 +42,7 @@
  * Constants
  */
 
-#define SEMFS_ROOTDIR	0xffffffffU		/* semnum for root dir */
+#define SEMFS_ROOTDIR 0xffffffffU /* semnum for root dir */
 
 /*
  * A user-facing semaphore.
@@ -52,11 +52,11 @@
  * XXX: or would we? review once all this is done.
  */
 struct semfs_sem {
-	struct lock *sems_lock;			/* Lock to protect count */
-	struct cv *sems_cv;			/* CV to wait */
-	unsigned sems_count;			/* Semaphore count */
-	bool sems_hasvnode;			/* The vnode exists */
-	bool sems_linked;			/* In the directory */
+  struct lock *sems_lock; /* Lock to protect count */
+  struct cv *sems_cv;     /* CV to wait */
+  unsigned sems_count;    /* Semaphore count */
+  bool sems_hasvnode;     /* The vnode exists */
+  bool sems_linked;       /* In the directory */
 };
 DECLARRAY(semfs_sem, SEMFS_INLINE);
 
@@ -64,8 +64,8 @@ DECLARRAY(semfs_sem, SEMFS_INLINE);
  * Directory entry; name and reference to a semaphore.
  */
 struct semfs_direntry {
-	char *semd_name;			/* Name */
-	unsigned semd_semnum;			/* Which semaphore */
+  char *semd_name;      /* Name */
+  unsigned semd_semnum; /* Which semaphore */
 };
 DECLARRAY(semfs_direntry, SEMFS_INLINE);
 
@@ -77,9 +77,9 @@ DECLARRAY(semfs_direntry, SEMFS_INLINE);
  * practice. XXX: review after finishing)
  */
 struct semfs_vnode {
-	struct vnode semv_absvn;		/* Abstract vnode */
-	struct semfs *semv_semfs;		/* Back-pointer to fs */
-	unsigned semv_semnum;			/* Which semaphore */
+  struct vnode semv_absvn;  /* Abstract vnode */
+  struct semfs *semv_semfs; /* Back-pointer to fs */
+  unsigned semv_semnum;     /* Which semaphore */
 };
 
 /*
@@ -87,14 +87,14 @@ struct semfs_vnode {
  * is only one of these.
  */
 struct semfs {
-	struct fs semfs_absfs;			/* Abstract fs object */
+  struct fs semfs_absfs; /* Abstract fs object */
 
-	struct lock *semfs_tablelock;		/* Lock for following */
-	struct vnodearray *semfs_vnodes;	/* Currently extant vnodes */
-	struct semfs_semarray *semfs_sems;	/* Semaphores */
+  struct lock *semfs_tablelock;      /* Lock for following */
+  struct vnodearray *semfs_vnodes;   /* Currently extant vnodes */
+  struct semfs_semarray *semfs_sems; /* Semaphores */
 
-	struct lock *semfs_dirlock;		/* Lock for following */
-	struct semfs_direntryarray *semfs_dents; /* The root directory */
+  struct lock *semfs_dirlock;              /* Lock for following */
+  struct semfs_direntryarray *semfs_dents; /* The root directory */
 };
 
 /*
@@ -104,7 +104,6 @@ struct semfs {
 DEFARRAY(semfs_sem, SEMFS_INLINE);
 DEFARRAY(semfs_direntry, SEMFS_INLINE);
 
-
 /*
  * Functions.
  */
@@ -119,5 +118,4 @@ void semfs_direntry_destroy(struct semfs_direntry *);
 /* in semfs_vnops.c */
 int semfs_getvnode(struct semfs *, unsigned, struct vnode **ret);
 
-
 #endif /* SEMFS_H */

kern/fs/semfs/semfs_fsops.c

@@ -42,185 +42,163 @@
 /*
  * Sync doesn't need to do anything.
  */
-static
-int
-semfs_sync(struct fs *fs)
-{
-	(void)fs;
-	return 0;
+static int semfs_sync(struct fs *fs) {
+  (void)fs;
+  return 0;
 }
 
 /*
  * We have only one volume name and it's hardwired.
  */
-static
-const char *
-semfs_getvolname(struct fs *fs)
-{
-	(void)fs;
-	return "sem";
+static const char *semfs_getvolname(struct fs *fs) {
+  (void)fs;
+  return "sem";
 }
 
 /*
  * Get the root directory vnode.
  */
-static
-int
-semfs_getroot(struct fs *fs, struct vnode **ret)
-{
-	struct semfs *semfs = fs->fs_data;
-	struct vnode *vn;
-	int result;
+static int semfs_getroot(struct fs *fs, struct vnode **ret) {
+  struct semfs *semfs = fs->fs_data;
+  struct vnode *vn;
+  int result;
 
-	result = semfs_getvnode(semfs, SEMFS_ROOTDIR, &vn);
-	if (result) {
-		kprintf("semfs: couldn't load root vnode: %s\n",
-			strerror(result));
-		return result;
-	}
-	*ret = vn;
-	return 0;
+  result = semfs_getvnode(semfs, SEMFS_ROOTDIR, &vn);
+  if (result) {
+    kprintf("semfs: couldn't load root vnode: %s\n", strerror(result));
+    return result;
+  }
+  *ret = vn;
+  return 0;
 }
 
 ////////////////////////////////////////////////////////////
 // mount and unmount logic
 
-
 /*
  * Destructor for struct semfs.
  */
-static
-void
-semfs_destroy(struct semfs *semfs)
-{
-	struct semfs_sem *sem;
-	struct semfs_direntry *dent;
-	unsigned i, num;
+static void semfs_destroy(struct semfs *semfs) {
+  struct semfs_sem *sem;
+  struct semfs_direntry *dent;
+  unsigned i, num;
 
-	num = semfs_semarray_num(semfs->semfs_sems);
-	for (i=0; i<num; i++) {
-		sem = semfs_semarray_get(semfs->semfs_sems, i);
-		semfs_sem_destroy(sem);
-	}
-	semfs_semarray_setsize(semfs->semfs_sems, 0);
+  num = semfs_semarray_num(semfs->semfs_sems);
+  for (i = 0; i < num; i++) {
+    sem = semfs_semarray_get(semfs->semfs_sems, i);
+    semfs_sem_destroy(sem);
+  }
+  semfs_semarray_setsize(semfs->semfs_sems, 0);
 
-	num = semfs_direntryarray_num(semfs->semfs_dents);
-	for (i=0; i<num; i++) {
-		dent = semfs_direntryarray_get(semfs->semfs_dents, i);
-		semfs_direntry_destroy(dent);
-	}
-	semfs_direntryarray_setsize(semfs->semfs_dents, 0);
+  num = semfs_direntryarray_num(semfs->semfs_dents);
+  for (i = 0; i < num; i++) {
+    dent = semfs_direntryarray_get(semfs->semfs_dents, i);
+    semfs_direntry_destroy(dent);
+  }
+  semfs_direntryarray_setsize(semfs->semfs_dents, 0);
 
-	semfs_direntryarray_destroy(semfs->semfs_dents);
-	lock_destroy(semfs->semfs_dirlock);
-	semfs_semarray_destroy(semfs->semfs_sems);
-	vnodearray_destroy(semfs->semfs_vnodes);
-	lock_destroy(semfs->semfs_tablelock);
-	kfree(semfs);
+  semfs_direntryarray_destroy(semfs->semfs_dents);
+  lock_destroy(semfs->semfs_dirlock);
+  semfs_semarray_destroy(semfs->semfs_sems);
+  vnodearray_destroy(semfs->semfs_vnodes);
+  lock_destroy(semfs->semfs_tablelock);
+  kfree(semfs);
 }
 
 /*
  * Unmount routine. XXX: Since semfs is attached at boot and can't be
  * remounted, maybe unmounting it shouldn't be allowed.
  */
-static
-int
-semfs_unmount(struct fs *fs)
-{
-	struct semfs *semfs = fs->fs_data;
+static int semfs_unmount(struct fs *fs) {
+  struct semfs *semfs = fs->fs_data;
 
-	lock_acquire(semfs->semfs_tablelock);
-	if (vnodearray_num(semfs->semfs_vnodes) > 0) {
-		lock_release(semfs->semfs_tablelock);
-		return EBUSY;
-	}
+  lock_acquire(semfs->semfs_tablelock);
+  if (vnodearray_num(semfs->semfs_vnodes) > 0) {
+    lock_release(semfs->semfs_tablelock);
+    return EBUSY;
+  }
 
-	lock_release(semfs->semfs_tablelock);
-	semfs_destroy(semfs);
+  lock_release(semfs->semfs_tablelock);
+  semfs_destroy(semfs);
 
-	return 0;
+  return 0;
 }
 
 /*
  * Operations table.
  */
 static const struct fs_ops semfs_fsops = {
-	.fsop_sync = semfs_sync,
-	.fsop_getvolname = semfs_getvolname,
-	.fsop_getroot = semfs_getroot,
-	.fsop_unmount = semfs_unmount,
+    .fsop_sync = semfs_sync,
+    .fsop_getvolname = semfs_getvolname,
+    .fsop_getroot = semfs_getroot,
+    .fsop_unmount = semfs_unmount,
 };
 
 /*
  * Constructor for struct semfs.
  */
-static
-struct semfs *
-semfs_create(void)
-{
-	struct semfs *semfs;
+static struct semfs *semfs_create(void) {
+  struct semfs *semfs;
 
-	semfs = kmalloc(sizeof(*semfs));
-	if (semfs == NULL) {
-		goto fail_total;
-	}
+  semfs = kmalloc(sizeof(*semfs));
+  if (semfs == NULL) {
+    goto fail_total;
+  }
 
-	semfs->semfs_tablelock = lock_create("semfs_table");
-	if (semfs->semfs_tablelock == NULL) {
-		goto fail_semfs;
-	}
-	semfs->semfs_vnodes = vnodearray_create();
-	if (semfs->semfs_vnodes == NULL) {
-		goto fail_tablelock;
-	}
-	semfs->semfs_sems = semfs_semarray_create();
-	if (semfs->semfs_sems == NULL) {
-		goto fail_vnodes;
-	}
+  semfs->semfs_tablelock = lock_create("semfs_table");
+  if (semfs->semfs_tablelock == NULL) {
+    goto fail_semfs;
+  }
+  semfs->semfs_vnodes = vnodearray_create();
+  if (semfs->semfs_vnodes == NULL) {
+    goto fail_tablelock;
+  }
+  semfs->semfs_sems = semfs_semarray_create();
+  if (semfs->semfs_sems == NULL) {
+    goto fail_vnodes;
+  }
 
-	semfs->semfs_dirlock = lock_create("semfs_dir");
-	if (semfs->semfs_dirlock == NULL) {
-		goto fail_sems;
-	}
-	semfs->semfs_dents = semfs_direntryarray_create();
-	if (semfs->semfs_dents == NULL) {
-		goto fail_dirlock;
-	}
+  semfs->semfs_dirlock = lock_create("semfs_dir");
+  if (semfs->semfs_dirlock == NULL) {
+    goto fail_sems;
+  }
+  semfs->semfs_dents = semfs_direntryarray_create();
+  if (semfs->semfs_dents == NULL) {
+    goto fail_dirlock;
+  }
 
-	semfs->semfs_absfs.fs_data = semfs;
-	semfs->semfs_absfs.fs_ops = &semfs_fsops;
-	return semfs;
+  semfs->semfs_absfs.fs_data = semfs;
+  semfs->semfs_absfs.fs_ops = &semfs_fsops;
+  return semfs;
 
- fail_dirlock:
-	lock_destroy(semfs->semfs_dirlock);
- fail_sems:
-	semfs_semarray_destroy(semfs->semfs_sems);
- fail_vnodes:
-	vnodearray_destroy(semfs->semfs_vnodes);
- fail_tablelock:
-	lock_destroy(semfs->semfs_tablelock);
- fail_semfs:
-	kfree(semfs);
- fail_total:
-	return NULL;
+fail_dirlock:
+  lock_destroy(semfs->semfs_dirlock);
+fail_sems:
+  semfs_semarray_destroy(semfs->semfs_sems);
+fail_vnodes:
+  vnodearray_destroy(semfs->semfs_vnodes);
+fail_tablelock:
+  lock_destroy(semfs->semfs_tablelock);
+fail_semfs:
+  kfree(semfs);
+fail_total:
+  return NULL;
 }
 
 /*
  * Create the semfs. There is only one semfs and it's attached as
  * "sem:" during bootup.
  */
-void
-semfs_bootstrap(void)
-{
-	struct semfs *semfs;
-	int result;
+void semfs_bootstrap(void) {
+  struct semfs *semfs;
+  int result;
 
-	semfs = semfs_create();
-	if (semfs == NULL) {
-		panic("Out of memory creating semfs\n");
-	}
-	result = vfs_addfs("sem", &semfs->semfs_absfs);
-	if (result) {
-		panic("Attaching semfs: %s\n", strerror(result));
-	}
+  semfs = semfs_create();
+  if (semfs == NULL) {
+    panic("Out of memory creating semfs\n");
+  }
+  result = vfs_addfs("sem", &semfs->semfs_absfs);
+  if (result) {
+    panic("Attaching semfs: %s\n", strerror(result));
+  }
 }

kern/fs/semfs/semfs_obj.c

@@ -40,74 +40,69 @@
 /*
  * Constructor for semfs_sem.
  */
-struct semfs_sem *
-semfs_sem_create(const char *name)
-{
-	struct semfs_sem *sem;
-	char lockname[32];
-	char cvname[32];
+struct semfs_sem *semfs_sem_create(const char *name) {
+  struct semfs_sem *sem;
+  char lockname[32];
+  char cvname[32];
 
-	snprintf(lockname, sizeof(lockname), "sem:l.%s", name);
-	snprintf(cvname, sizeof(cvname), "sem:%s", name);
+  snprintf(lockname, sizeof(lockname), "sem:l.%s", name);
+  snprintf(cvname, sizeof(cvname), "sem:%s", name);
 
-	sem = kmalloc(sizeof(*sem));
-	if (sem == NULL) {
-		goto fail_return;
-	}
-	sem->sems_lock = lock_create(lockname);
-	if (sem->sems_lock == NULL) {
-		goto fail_sem;
-	}
-	sem->sems_cv = cv_create(cvname);
-	if (sem->sems_cv == NULL) {
-		goto fail_lock;
-	}
-	sem->sems_count = 0;
-	sem->sems_hasvnode = false;
-	sem->sems_linked = false;
-	return sem;
+  sem = kmalloc(sizeof(*sem));
+  if (sem == NULL) {
+    goto fail_return;
+  }
+  sem->sems_lock = lock_create(lockname);
+  if (sem->sems_lock == NULL) {
+    goto fail_sem;
+  }
+  sem->sems_cv = cv_create(cvname);
+  if (sem->sems_cv == NULL) {
+    goto fail_lock;
+  }
+  sem->sems_count = 0;
+  sem->sems_hasvnode = false;
+  sem->sems_linked = false;
+  return sem;
 
- fail_lock:
-	lock_destroy(sem->sems_lock);
- fail_sem:
-	kfree(sem);
- fail_return:
-	return NULL;
+fail_lock:
+  lock_destroy(sem->sems_lock);
+fail_sem:
+  kfree(sem);
+fail_return:
+  return NULL;
 }
 
 /*
  * Destructor for semfs_sem.
  */
-void
-semfs_sem_destroy(struct semfs_sem *sem)
-{
-	cv_destroy(sem->sems_cv);
-	lock_destroy(sem->sems_lock);
-	kfree(sem);
+void semfs_sem_destroy(struct semfs_sem *sem) {
+  cv_destroy(sem->sems_cv);
+  lock_destroy(sem->sems_lock);
+  kfree(sem);
 }
 
 /*
  * Helper to insert a semfs_sem into the semaphore table.
  */
-int
-semfs_sem_insert(struct semfs *semfs, struct semfs_sem *sem, unsigned *ret)
-{
-	unsigned i, num;
+int semfs_sem_insert(struct semfs *semfs, struct semfs_sem *sem,
+                     unsigned *ret) {
+  unsigned i, num;
 
-	KASSERT(lock_do_i_hold(semfs->semfs_tablelock));
-	num = semfs_semarray_num(semfs->semfs_sems);
-	if (num == SEMFS_ROOTDIR) {
-		/* Too many */
-		return ENOSPC;
-	}
-	for (i=0; i<num; i++) {
-		if (semfs_semarray_get(semfs->semfs_sems, i) == NULL) {
-			semfs_semarray_set(semfs->semfs_sems, i, sem);
-			*ret = i;
-			return 0;
-		}
-	}
-	return semfs_semarray_add(semfs->semfs_sems, sem, ret);
+  KASSERT(lock_do_i_hold(semfs->semfs_tablelock));
+  num = semfs_semarray_num(semfs->semfs_sems);
+  if (num == SEMFS_ROOTDIR) {
+    /* Too many */
+    return ENOSPC;
+  }
+  for (i = 0; i < num; i++) {
+    if (semfs_semarray_get(semfs->semfs_sems, i) == NULL) {
+      semfs_semarray_set(semfs->semfs_sems, i, sem);
+      *ret = i;
+      return 0;
+    }
+  }
+  return semfs_semarray_add(semfs->semfs_sems, sem, ret);
 }
 
 ////////////////////////////////////////////////////////////
@@ -116,30 +111,27 @@ semfs_sem_insert(struct semfs *semfs, struct semfs_sem *sem, unsigned *ret)
 /*
  * Constructor for semfs_direntry.
  */
-struct semfs_direntry *
-semfs_direntry_create(const char *name, unsigned semnum)
-{
-	struct semfs_direntry *dent;
+struct semfs_direntry *semfs_direntry_create(const char *name,
+                                             unsigned semnum) {
+  struct semfs_direntry *dent;
 
-	dent = kmalloc(sizeof(*dent));
-	if (dent == NULL) {
-		return NULL;
-	}
-	dent->semd_name = kstrdup(name);
-	if (dent->semd_name == NULL) {
-		kfree(dent);
-		return NULL;
-	}
-	dent->semd_semnum = semnum;
-	return dent;
+  dent = kmalloc(sizeof(*dent));
+  if (dent == NULL) {
+    return NULL;
+  }
+  dent->semd_name = kstrdup(name);
+  if (dent->semd_name == NULL) {
+    kfree(dent);
+    return NULL;
+  }
+  dent->semd_semnum = semnum;
+  return dent;
 }
 
 /*
  * Destructor for semfs_direntry.
  */
-void
-semfs_direntry_destroy(struct semfs_direntry *dent)
-{
-	kfree(dent->semd_name);
-	kfree(dent);
+void semfs_direntry_destroy(struct semfs_direntry *dent) {
+  kfree(dent->semd_name);
+  kfree(dent);
 }