Fix some statics and remove unused function

[yaffs2.git] / yaffs_guts.c

diff --git a/yaffs_guts.c b/yaffs_guts.c
index 6ad45fce6c1113d0ab8d926b40a3f68aee0f7475..6d9f608601f48d0e12fe35a1db630805a08d950d 100644 (file)
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -177,38 +177,14 @@ void yaffs_release_temp_buffer(struct yaffs_dev *dev, u8 *buffer)
 
        if (buffer) {
                /* assume it is an unmanaged one. */
-               yaffs_trace(YAFFS_TRACE_BUFFERS, "Releasing unmanaged temp buffer");
+               yaffs_trace(YAFFS_TRACE_BUFFERS,
+                       "Releasing unmanaged temp buffer");
                kfree(buffer);
                dev->unmanaged_buffer_deallocs++;
        }
 
 }
 
-/*
- * Determine if we have a managed buffer.
- */
-int yaffs_is_managed_tmp_buffer(struct yaffs_dev *dev, const u8 *buffer)
-{
-       int i;
-
-       for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-               if (dev->temp_buffer[i].buffer == buffer)
-                       return 1;
-       }
-
-       for (i = 0; i < dev->param.n_caches; i++) {
-               if (dev->cache[i].data == buffer)
-                       return 1;
-       }
-
-       if (buffer == dev->checkpt_buffer)
-               return 1;
-
-       yaffs_trace(YAFFS_TRACE_ALWAYS,
-         "yaffs: unmaged buffer detected.");
-       return 0;
-}
-
 /*
  * Functions for robustisizing TODO
  *
@@ -280,7 +256,8 @@ static void yaffs_handle_chunk_wr_error(struct yaffs_dev *dev, int nand_chunk,
 
 static inline int yaffs_hash_fn(int n)
 {
-       n = abs(n);
+       if (n < 0)
+               n = -n;
        return n % YAFFS_NOBJECT_BUCKETS;
 }
 
@@ -737,7 +714,7 @@ static void yaffs_deinit_tnodes_and_objs(struct yaffs_dev *dev)
        dev->n_tnodes = 0;
 }
 
-void yaffs_load_tnode_0(struct yaffs_dev *dev, struct yaffs_tnode *tn,
+static void yaffs_load_tnode_0(struct yaffs_dev *dev, struct yaffs_tnode *tn,
                        unsigned pos, unsigned val)
 {
        u32 *map = (u32 *) tn;
@@ -1924,7 +1901,7 @@ struct yaffs_obj *yaffs_find_by_number(struct yaffs_dev *dev, u32 number)
        return NULL;
 }
 
-struct yaffs_obj *yaffs_new_obj(struct yaffs_dev *dev, int number,
+static struct yaffs_obj *yaffs_new_obj(struct yaffs_dev *dev, int number,
                                enum yaffs_obj_type type)
 {
        struct yaffs_obj *the_obj = NULL;
@@ -2387,7 +2364,7 @@ void yaffs_block_became_dirty(struct yaffs_dev *dev, int block_no)
        bi->has_shrink_hdr = 0;
        bi->skip_erased_check = 1;      /* Clean, so no need to check */
        bi->gc_prioritise = 0;
-       bi->has_summary=0;
+       bi->has_summary = 0;
 
        yaffs_clear_chunk_bits(dev, block_no);
 
@@ -2502,7 +2479,7 @@ static inline int yaffs_gc_process_chunk(struct yaffs_dev *dev,
 
                        /* Update file size */
                        if (object->variant_type == YAFFS_OBJECT_TYPE_FILE) {
-                               yaffs_oh_size_load( oh,
+                               yaffs_oh_size_load(oh,
                                    object->variant.file_variant.file_size);
                                tags.extra_file_size =
                                    object->variant.file_variant.file_size;
@@ -3345,8 +3322,8 @@ int yaffs_update_oh(struct yaffs_obj *in, const YCHAR *name, int force,
                break;
        case YAFFS_OBJECT_TYPE_FILE:
                if (oh->parent_obj_id != YAFFS_OBJECTID_DELETED &&
-                    oh->parent_obj_id != YAFFS_OBJECTID_UNLINKED)
-                    file_size = in->variant.file_variant.file_size;
+                   oh->parent_obj_id != YAFFS_OBJECTID_UNLINKED)
+                       file_size = in->variant.file_variant.file_size;
                yaffs_oh_size_load(oh, file_size);
                break;
        case YAFFS_OBJECT_TYPE_HARDLINK:
@@ -3530,7 +3507,8 @@ int yaffs_do_file_wr(struct yaffs_obj *in, const u8 *buffer, loff_t offset,
        while (n > 0 && chunk_written >= 0) {
                yaffs_addr_to_chunk(dev, offset, &chunk, &start);
 
-               if (((loff_t)chunk) * dev->data_bytes_per_chunk + start != offset ||
+               if (((loff_t)chunk) *
+                   dev->data_bytes_per_chunk + start != offset ||
                    start >= dev->data_bytes_per_chunk) {
                        yaffs_trace(YAFFS_TRACE_ERROR,
                                "AddrToChunk of offset %lld gives chunk %d start %d",
@@ -3551,7 +3529,8 @@ int yaffs_do_file_wr(struct yaffs_obj *in, const u8 *buffer, loff_t offset,
                         * before.
                         */
 
-                       chunk_start = (((loff_t)(chunk - 1)) * dev->data_bytes_per_chunk);
+                       chunk_start = (((loff_t)(chunk - 1)) *
+                                       dev->data_bytes_per_chunk);
 
                        if (chunk_start > in->variant.file_variant.file_size)
                                n_bytes_read = 0;       /* Past end of file */
@@ -3698,7 +3677,7 @@ static void yaffs_prune_chunks(struct yaffs_obj *in, loff_t new_size)
        int last_del;
        int start_del;
 
-       if(old_size > 0)
+       if (old_size > 0)
                yaffs_addr_to_chunk(dev, old_size - 1, &last_del, &dummy);
        else
                last_del = 0;
@@ -3856,7 +3835,7 @@ static int yaffs_unlink_file_if_needed(struct yaffs_obj *in)
        return ret_val;
 }
 
-int yaffs_del_file(struct yaffs_obj *in)
+static int yaffs_del_file(struct yaffs_obj *in)
 {
        int ret_val = YAFFS_OK;
        int deleted;    /* Need to cache value on stack if in is freed */
@@ -4370,7 +4349,7 @@ struct yaffs_obj *yaffs_find_by_name(struct yaffs_obj *directory,
                         */
                        yaffs_get_obj_name(l, buffer,
                                YAFFS_MAX_NAME_LENGTH + 1);
-                       if (strncmp(name, buffer, YAFFS_MAX_NAME_LENGTH) == 0)
+                       if (!strncmp(name, buffer, YAFFS_MAX_NAME_LENGTH))
                                return l;
                }
        }
@@ -4830,7 +4809,7 @@ int yaffs_guts_initialise(struct yaffs_dev *dev)
        if (!init_failed && !yaffs_create_initial_dir(dev))
                init_failed = 1;
 
-       if(!init_failed && dev->param.is_yaffs2 &&
+       if (!init_failed && dev->param.is_yaffs2 &&
                !dev->param.disable_summary &&
                !yaffs_summary_init(dev))
                init_failed = 1;
@@ -5018,7 +4997,7 @@ loff_t yaffs_oh_to_size(struct yaffs_obj_hdr *oh)
 {
        loff_t retval;
 
-       if(~(oh->file_size_high))
+       if (~(oh->file_size_high))
                retval = (((loff_t) oh->file_size_high) << 32) |
                        (((loff_t) oh->file_size_low) & 0xFFFFFFFF);
        else