Apply editorial changes

Author: jserv

bitmap.h

@@ -2,10 +2,10 @@
 #define SIMPLEFS_BITMAP_H
 
 #include <linux/bitmap.h>
+
 #include "simplefs.h"
 
-/*
- * Return the first bit we found and clear the the following `len` consecutive
+/* Return the first bit we found and clear the the following 'len' consecutive
  * free bit(s) (set to 1) in a given in-memory bitmap spanning over multiple
  * blocks. Return 0 if no enough free bit(s) were found (we assume that the
  * first bit is never free because of the superblock and the root inode, thus
@@ -28,8 +28,7 @@ static inline uint32_t get_first_free_bits(unsigned long *freemap,
     return 0;
 }
 
-/*
- * Return an unused inode number and mark it used.
+/* Return an unused inode number and mark it used.
  * Return 0 if no free inode was found.
  */
 static inline uint32_t get_free_inode(struct simplefs_sb_info *sbi)
@@ -40,8 +39,7 @@ static inline uint32_t get_free_inode(struct simplefs_sb_info *sbi)
     return ret;
 }
 
-/*
- * Return `len` unused block(s) number and mark it used.
+/* Return 'len' unused block(s) number and mark it used.
  * Return 0 if no enough free block(s) were found.
  */
 static inline uint32_t get_free_blocks(struct simplefs_sb_info *sbi,
@@ -54,7 +52,7 @@ static inline uint32_t get_free_blocks(struct simplefs_sb_info *sbi,
 }
 
 
-/* Mark the `len` bit(s) from i-th bit in freemap as free (i.e. 1) */
+/* Mark the 'len' bit(s) from i-th bit in freemap as free (i.e. 1) */
 static inline int put_free_bits(unsigned long *freemap,
                                 unsigned long size,
                                 uint32_t i,

dir.c

@@ -7,8 +7,7 @@
 
 #include "simplefs.h"
 
-/*
- * Iterate over the files contained in dir and commit them in ctx.
+/* Iterate over the files contained in dir and commit them in ctx.
  * This function is called by the VFS while ctx->pos changes.
  * Return 0 on success.
  */
@@ -28,8 +27,7 @@ static int simplefs_iterate(struct file *dir, struct dir_context *ctx)
     if (!S_ISDIR(inode->i_mode))
         return -ENOTDIR;
 
-    /*
-     * Check that ctx->pos is not bigger than what we can handle (including
+    /* Check that ctx->pos is not bigger than what we can handle (including
      * . and ..)
      */
     if (ctx->pos > SIMPLEFS_MAX_SUBFILES + 2)
@@ -46,15 +44,14 @@ static int simplefs_iterate(struct file *dir, struct dir_context *ctx)
     eblock = (struct simplefs_file_ei_block *) bh->b_data;
 
     ei = (ctx->pos - 2) / SIMPLEFS_FILES_PER_EXT;
-    bi = (ctx->pos - 2) % SIMPLEFS_FILES_PER_EXT
-         / SIMPLEFS_FILES_PER_BLOCK;
+    bi = (ctx->pos - 2) % SIMPLEFS_FILES_PER_EXT / SIMPLEFS_FILES_PER_BLOCK;
     fi = (ctx->pos - 2) % SIMPLEFS_FILES_PER_BLOCK;
 
     /* Iterate over the index block and commit subfiles */
     for (; ei < SIMPLEFS_MAX_EXTENTS; ei++) {
-        if (eblock->extents[ei].ee_start == 0) {
+        if (eblock->extents[ei].ee_start == 0)
             break;
-        }
+
         /* Iterate over blocks in one extent */
         for (; bi < eblock->extents[ei].ee_len; bi++) {
             bh2 = sb_bread(sb, eblock->extents[ei].ee_start + bi);
@@ -63,14 +60,15 @@ static int simplefs_iterate(struct file *dir, struct dir_context *ctx)
                 goto release_bh;
             }
             dblock = (struct simplefs_dir_block *) bh2->b_data;
-            if (dblock->files[0].inode == 0) {
+            if (dblock->files[0].inode == 0)
                 break;
-            }
+
             /* Iterate every file in one block */
             for (; fi < SIMPLEFS_FILES_PER_BLOCK; fi++) {
                 f = &dblock->files[fi];
-                if (f->inode && !dir_emit(ctx, f->filename, SIMPLEFS_FILENAME_LEN,
-                               f->inode, DT_UNKNOWN))
+                if (f->inode &&
+                    !dir_emit(ctx, f->filename, SIMPLEFS_FILENAME_LEN, f->inode,
+                              DT_UNKNOWN))
                     break;
                 ctx->pos++;
             }

extent.c

@@ -3,8 +3,7 @@
 
 #include "simplefs.h"
 
-/*
- * Search the extent which contain the target block.
+/* Search the extent which contain the target block.
  * Return the first unused file index if not found.
  * Return -1 if it is out of range.
  * TODO: use binary search.
@@ -20,5 +19,6 @@ uint32_t simplefs_ext_search(struct simplefs_file_ei_block *index,
             (iblock >= block && iblock < block + len))
             return i;
     }
+
     return -1;
 }

file.c

@@ -9,8 +9,7 @@
 #include "bitmap.h"
 #include "simplefs.h"
 
-/*
- * Map the buffer_head passed in argument with the iblock-th block of the file
+/* Map the buffer_head passed in argument with the iblock-th block of the file
  * represented by inode. If the requested block is not allocated and create is
  * true,  allocate a new block on disk and map it.
  */
@@ -44,8 +43,7 @@ static int simplefs_file_get_block(struct inode *inode,
         goto brelse_index;
     }
 
-    /*
-     * Check if iblock is already allocated. If not and create is true,
+    /* Check if iblock is already allocated. If not and create is true,
      * allocate it. Else, get the physical block number.
      */
     if (index->extents[extent].ee_start == 0) {
@@ -56,6 +54,7 @@ static int simplefs_file_get_block(struct inode *inode,
             ret = -ENOSPC;
             goto brelse_index;
         }
+
         index->extents[extent].ee_start = bno;
         index->extents[extent].ee_len = 8;
         index->extents[extent].ee_block =
@@ -77,8 +76,7 @@ static int simplefs_file_get_block(struct inode *inode,
     return ret;
 }
 
-/*
- * Called by the page cache to read a page from the physical disk and map it in
+/* Called by the page cache to read a page from the physical disk and map it in
  * memory.
  */
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0)
@@ -93,17 +91,15 @@ static int simplefs_readpage(struct file *file, struct page *page)
 }
 #endif
 
-/*
- * Called by the page cache to write a dirty page to the physical disk (when
+/* Called by the page cache to write a dirty page to the physical disk (when
  * sync is called or when memory is needed).
  */
 static int simplefs_writepage(struct page *page, struct writeback_control *wbc)
 {
     return block_write_full_page(page, simplefs_file_get_block, wbc);
 }
 
-/*
- * Called by the VFS when a write() syscall occurs on file before writing the
+/* Called by the VFS when a write() syscall occurs on file before writing the
  * data in the page cache. This functions checks if the write will be able to
  * complete and allocates the necessary blocks through block_write_begin().
  */
@@ -131,6 +127,7 @@ static int simplefs_write_begin(struct file *file,
     /* Check if the write can be completed (enough space?) */
     if (pos + len > SIMPLEFS_MAX_FILESIZE)
         return -ENOSPC;
+
     nr_allocs = max(pos + len, file->f_inode->i_size) / SIMPLEFS_BLOCK_SIZE;
     if (nr_allocs > file->f_inode->i_blocks - 1)
         nr_allocs -= file->f_inode->i_blocks - 1;
@@ -139,7 +136,7 @@ static int simplefs_write_begin(struct file *file,
     if (nr_allocs > sbi->nr_free_blocks)
         return -ENOSPC;
 
-    /* prepare the write */
+        /* prepare the write */
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0)
     err = block_write_begin(mapping, pos, len, pagep, simplefs_file_get_block);
 #else
@@ -152,8 +149,7 @@ static int simplefs_write_begin(struct file *file,
     return err;
 }
 
-/*
- * Called by the VFS after writing data from a write() syscall to the page
+/* Called by the VFS after writing data from a write() syscall to the page
  * cache. This functions updates inode metadata and truncates the file if
  * necessary.
  */
@@ -216,6 +212,7 @@ static int simplefs_write_end(struct file *file,
         index = (struct simplefs_file_ei_block *) bh_index->b_data;
 
         first_ext = simplefs_ext_search(index, inode->i_blocks - 1);
+
         /* Reserve unused block in last extent */
         if (inode->i_blocks - 1 != index->extents[first_ext].ee_block)
             first_ext++;