Changeset 3345b86 in mainline


Ignore:
Timestamp:
2017-05-10T17:42:12Z (7 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
fcb0d76
Parents:
f066a87
Message:

Libext4 went the wrong direction with filename prefixing.

Location:
uspace
Files:
3 edited
24 moved

Legend:

Unmodified
Added
Removed

  • uspace/lib/ext4/Makefile

    rf066a87 r3345b86  
    2929USPACE_PREFIX = ../..
    3030LIBRARY = libext4
    31 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBCRYPTO_PREFIX)
     31EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBCRYPTO_PREFIX) -Iinclude
    3232
    3333SOURCES = \
    34         libext4_balloc.c \
    35         libext4_bitmap.c \
    36         libext4_block_group.c \
    37         libext4_directory.c \
    38         libext4_directory_index.c \
    39         libext4_extent.c \
    40         libext4_filesystem.c \
    41         libext4_hash.c \
    42         libext4_ialloc.c \
    43         libext4_inode.c \
    44         libext4_superblock.c
     34        src/balloc.c \
     35        src/bitmap.c \
     36        src/block_group.c \
     37        src/directory.c \
     38        src/directory_index.c \
     39        src/extent.c \
     40        src/filesystem.c \
     41        src/hash.c \
     42        src/ialloc.c \
     43        src/inode.c \
     44        src/superblock.c
    4545
    4646include $(USPACE_PREFIX)/Makefile.common

  • uspace/lib/ext4/include/ext4/balloc.h

    rf066a87 r3345b86  
    3535
    3636#include <sys/types.h>
    37 #include "libext4_types.h"
     37#include "types.h"
    3838
    3939extern int ext4_balloc_free_block(ext4_inode_ref_t *, uint32_t);

  • uspace/lib/ext4/include/ext4/block_group.h

    rf066a87 r3345b86  
    3737#include <block.h>
    3838#include <sys/types.h>
    39 #include "libext4_types.h"
     39#include "types.h"
    4040
    4141extern uint64_t ext4_block_group_get_block_bitmap(ext4_block_group_t *,

  • uspace/lib/ext4/include/ext4/directory.h

    rf066a87 r3345b86  
    3535#define LIBEXT4_LIBEXT4_DIRECTORY_H_
    3636
    37 #include "libext4_types.h"
     37#include "ext4/types.h"
    3838
    3939extern uint32_t ext4_directory_entry_ll_get_inode(ext4_directory_entry_ll_t *);

  • uspace/lib/ext4/include/ext4/directory_index.h

    rf066a87 r3345b86  
    3434#define LIBEXT4_LIBEXT4_DIRECTORY_INDEX_H_
    3535
    36 #include "libext4_types.h"
     36#include "ext4/types.h"
    3737
    3838extern uint8_t ext4_directory_dx_root_info_get_hash_version(

  • uspace/lib/ext4/include/ext4/extent.h

    rf066a87 r3345b86  
    3434#define LIBEXT4_LIBEXT4_EXTENT_H_
    3535
    36 #include "libext4_types.h"
     36#include "ext4/types.h"
    3737
    3838extern uint32_t ext4_extent_get_first_block(ext4_extent_t *);

  • uspace/lib/ext4/include/ext4/filesystem.h

    rf066a87 r3345b86  
    3636
    3737#include <block.h>
    38 #include "libext4_types.h"
     38#include "ext4/types.h"
    3939
    4040extern int ext4_filesystem_init(ext4_filesystem_t *, service_id_t,

  • uspace/lib/ext4/include/ext4/hash.h

    rf066a87 r3345b86  
    3535
    3636#include <sys/types.h>
    37 #include "libext4_types.h"
     37#include "ext4/types.h"
    3838
    3939extern int ext4_hash_string(ext4_hash_info_t *, int, const char *);

  • uspace/lib/ext4/include/ext4/ialloc.h

    rf066a87 r3345b86  
    3434#define LIBEXT4_LIBEXT4_IALLOC_H_
    3535
    36 #include "libext4_types.h"
     36#include "ext4/types.h"
    3737
    3838extern int ext4_ialloc_free_inode(ext4_filesystem_t *, uint32_t, bool);

  • uspace/lib/ext4/include/ext4/inode.h

    rf066a87 r3345b86  
    3737#include <block.h>
    3838#include <sys/types.h>
    39 #include "libext4_types.h"
     39#include "ext4/types.h"
    4040
    4141extern uint32_t ext4_inode_get_mode(ext4_superblock_t *, ext4_inode_t *);

  • uspace/lib/ext4/include/ext4/libext4.h

    rf066a87 r3345b86  
    3434#define LIBEXT4_LIBEXT4_H_
    3535
    36 #include "libext4_balloc.h"
    37 #include "libext4_bitmap.h"
    38 #include "libext4_block_group.h"
    39 #include "libext4_directory.h"
    40 #include "libext4_directory_index.h"
    41 #include "libext4_extent.h"
    42 #include "libext4_filesystem.h"
    43 #include "libext4_hash.h"
    44 #include "libext4_ialloc.h"
    45 #include "libext4_inode.h"
    46 #include "libext4_superblock.h"
    47 #include "libext4_types.h"
     36#include "ext4/balloc.h"
     37#include "ext4/bitmap.h"
     38#include "ext4/block_group.h"
     39#include "ext4/directory.h"
     40#include "ext4/directory_index.h"
     41#include "ext4/extent.h"
     42#include "ext4/filesystem.h"
     43#include "ext4/hash.h"
     44#include "ext4/ialloc.h"
     45#include "ext4/inode.h"
     46#include "ext4/superblock.h"
     47#include "ext4/types.h"
    4848
    4949#include <stdio.h>

  • uspace/lib/ext4/include/ext4/superblock.h

    rf066a87 r3345b86  
    3737#include <block.h>
    3838#include <sys/types.h>
    39 #include "libext4_types.h"
     39#include "ext4/types.h"
    4040
    4141extern uint32_t ext4_superblock_get_inodes_count(ext4_superblock_t *);

  • uspace/lib/ext4/src/balloc.c

    rf066a87 r3345b86  
    3737#include <errno.h>
    3838#include <sys/types.h>
    39 #include "libext4.h"
     39#include "ext4/libext4.h"
    4040
    4141/** Free block.

  • uspace/lib/ext4/src/bitmap.c

    rf066a87 r3345b86  
    3838#include <block.h>
    3939#include <sys/types.h>
    40 #include "libext4.h"
     40#include "ext4/libext4.h"
    4141
    4242/** Set bit in bitmap to 0 (free).

  • uspace/lib/ext4/src/block_group.c

    rf066a87 r3345b86  
    3737
    3838#include <byteorder.h>
    39 #include "libext4.h"
     39#include "ext4/libext4.h"
    4040
    4141/** Get address of block with data block bitmap.

  • uspace/lib/ext4/src/directory.c

    rf066a87 r3345b86  
    3939#include <errno.h>
    4040#include <malloc.h>
    41 #include "libext4.h"
     41#include "ext4/libext4.h"
    4242
    4343/** Get i-node number from directory entry.

  • uspace/lib/ext4/src/directory_index.c

    rf066a87 r3345b86  
    3939#include <malloc.h>
    4040#include <sort.h>
    41 #include "libext4.h"
     41#include "ext4/libext4.h"
    4242
    4343/** Type entry to pass to sorting algorithm.

  • uspace/lib/ext4/src/extent.c

    rf066a87 r3345b86  
    3838#include <errno.h>
    3939#include <malloc.h>
    40 #include "libext4.h"
     40#include "ext4/libext4.h"
    4141
    4242/** Get logical number of the block covered by extent.

  • uspace/lib/ext4/src/filesystem.c

    rf066a87 r3345b86  
    4242#include <align.h>
    4343#include <crypto.h>
    44 #include "libext4.h"
     44#include "ext4/libext4.h"
    4545
    4646/** Initialize filesystem and read all needed data.

  • uspace/lib/ext4/src/hash.c

    rf066a87 r3345b86  
    3535 */
    3636
    37 #include "libext4.h"
     37#include "ext4/libext4.h"
    3838#include <errno.h>
    3939

  • uspace/lib/ext4/src/ialloc.c

    rf066a87 r3345b86  
    3737#include <errno.h>
    3838#include <time.h>
    39 #include "libext4.h"
     39#include "ext4/libext4.h"
    4040
    4141

  • uspace/lib/ext4/src/inode.c

    rf066a87 r3345b86  
    3939#include <errno.h>
    4040#include <block.h>
    41 #include "libext4.h"
     41#include "ext4/libext4.h"
    4242
    4343/** Compute number of bits for block count.

  • uspace/lib/ext4/src/superblock.c

    rf066a87 r3345b86  
    4141#include <block.h>
    4242#include <malloc.h>
    43 #include "libext4.h"
     43#include "ext4/libext4.h"
    4444
    4545/** Get number of i-nodes in the whole filesystem.

  • uspace/srv/fs/ext4fs/Makefile

    rf066a87 r3345b86  
    3030LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBFS_PREFIX)/libfs.a \
    3131    $(LIBEXT4_PREFIX)/libext4.a $(LIBCRYPTO_PREFIX)/libcrypto.a
    32 EXTRA_CFLAGS += -I$(LIBBLOCK_PREFIX) -I$(LIBFS_PREFIX) -I$(LIBEXT4_PREFIX) -I$(LIBCRYPTO_PREFIX)
     32EXTRA_CFLAGS += -I$(LIBBLOCK_PREFIX) -I$(LIBFS_PREFIX) -I$(LIBEXT4_PREFIX)/include -I$(LIBCRYPTO_PREFIX)
    3333BINARY = ext4fs
    3434STATIC_NEEDED = y

  • uspace/srv/fs/ext4fs/ext4fs_ops.c

    rf066a87 r3345b86  
    3737
    3838#include <errno.h>
     39#include <ext4/libext4.h>
    3940#include <fibril_synch.h>
    40 #include <libext4.h>
    4141#include <libfs.h>
    4242#include <macros.h>
Note: See TracChangeset for help on using the changeset viewer.