Fix afs shutdown.

[paraslash.git] / osl_core.h

diff --git a/osl_core.h b/osl_core.h
index 599d22da6146c8cb88c5330a1a347c4b3b88c756..e042665ab9eda67e95f2c5773f11f1311f468805 100644 (file)
--- a/osl_core.h
+++ b/osl_core.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2008 Andre Noll <maan@systemlinux.org>

  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */


@@ -56,7 +56,7 @@ struct osl_table {
        unsigned num_rbtrees;
        /**
         * The number of the column that determines the name of the disk
        unsigned num_rbtrees;
        /**
         * The number of the column that determines the name of the disk

-        * storage objcts.
+        * storage objects.

         */
        unsigned disk_storage_name_column;
        /** The number of bytes of an index entry of a row. */
         */
        unsigned disk_storage_name_column;
        /** The number of bytes of an index entry of a row. */


@@ -95,7 +95,7 @@ int init_rbtrees(struct osl_table *t);
 enum map_table_flags {
        /**
         * Check whether the entries in the table index match the entries in
 enum map_table_flags {
        /**
         * Check whether the entries in the table index match the entries in

-        * the table desctiption.
+        * the table description.

         */
        MAP_TBL_FL_VERIFY_INDEX = 1,
        /** Do not complain even if the dirty flag is set. */
         */
        MAP_TBL_FL_VERIFY_INDEX = 1,
        /** Do not complain even if the dirty flag is set. */


@@ -113,7 +113,7 @@ int mark_row_invalid(struct osl_table *t, uint32_t row_num);
  * Get the description of a column by column number
  *
  * \param d Pointer to the table description.
  * Get the description of a column by column number
  *
  * \param d Pointer to the table description.

- * \param col_num The number of the column to get the desctiption for.
+ * \param col_num The number of the column to get the description for.

  *
  * \return The table description.
  *
  *
  * \return The table description.
  *


@@ -439,9 +439,9 @@ _static_inline_ struct osl_row *get_row_pointer(const struct rb_node *node,
  * \param obj the Object to compute the hash value from.
  * \param hash Result is returned here.
  */
  * \param obj the Object to compute the hash value from.
  * \param hash Result is returned here.
  */

-static inline void hash_object(const struct osl_object *obj, HASH_TYPE *hash)
+_static_inline_ void hash_object(const struct osl_object *obj, HASH_TYPE *hash)

 {
 {

-       return hash_function(obj->data, obj->size, hash);
+       hash_function(obj->data, obj->size, hash);

 }
 
 /**
 }
 
 /**


@@ -460,7 +460,7 @@ static inline void hash_object(const struct osl_object *obj, HASH_TYPE *hash)
  *
  * \sa struct osl_table:disk_storage_name_column.
  */
  *
  * \sa struct osl_table:disk_storage_name_column.
  */

-static inline char *disk_storage_name_of_hash(const struct osl_table *t, HASH_TYPE *hash)
+_static_inline_ char *disk_storage_name_of_hash(const struct osl_table *t, HASH_TYPE *hash)

 {
        char asc[2 * HASH_SIZE + 2];
 
 {
        char asc[2 * HASH_SIZE + 2];
 


@@ -476,14 +476,14 @@ static inline char *disk_storage_name_of_hash(const struct osl_table *t, HASH_TY
  * \param old_path The source path.
  * \param new_path The destination path.
  *
  * \param old_path The source path.
  * \param new_path The destination path.
  *

- * \return positive in success, \p -E_RENAME on errors.
+ * \return Standard.

  *
  * \sa rename(2).
  */
  *
  * \sa rename(2).
  */

-static inline int para_rename(const char *old_path, const char *new_path)
+_static_inline_ int para_rename(const char *old_path, const char *new_path)

 {
        if (rename(old_path, new_path) < 0)
 {
        if (rename(old_path, new_path) < 0)

-               return -E_RENAME;
+               return -ERRNO_TO_PARA_ERROR(errno);

        return 1;
 }
 
        return 1;
 }