Changeset 81dd2ed in mainline


Ignore:
Timestamp:
2017-05-10T19:47:31Z (8 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
71fe4723
Parents:
fcb0d76
Message:

The division of ext4 into fs and lib is arbitrary, preventing improvement.

Location:
uspace
Files:
3 edited
2 moved

Legend:

Unmodified
Added
Removed

  • uspace/lib/ext4/Makefile

    rfcb0d76 r81dd2ed  
    2929USPACE_PREFIX = ../..
    3030LIBRARY = libext4
    31 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBCRYPTO_PREFIX) -Iinclude
     31EXTRA_CFLAGS = \
     32    -I$(LIBBLOCK_PREFIX) \
     33    -I$(LIBCRYPTO_PREFIX) \
     34    -I$(LIBFS_PREFIX) \
     35    -Iinclude
    3236
    3337SOURCES = \
    … …  
    4246        src/ialloc.c \
    4347        src/inode.c \
     48        src/ops.c \
    4449        src/superblock.c
    4550

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

    rfcb0d76 r81dd2ed  
    2727 */
    2828
    29 /** @addtogroup fs
     29/** @addtogroup libext4
    3030 * @{
    3131 */
    3232
    33 #ifndef EXT4FS_EXT4FS_H_
    34 #define EXT4FS_EXT4FS_H_
     33#ifndef LIBEXT4_OPS_H_
     34#define LIBEXT4_OPS_H_
    3535
    3636#include <libfs.h>

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

    rfcb0d76 r81dd2ed  
    2828 */
    2929
    30 /** @addtogroup fs
     30/** @addtogroup libext4
    3131 * @{
    3232 */
    3333/**
    3434 * @file  ext4fs_ops.c
    35  * @brief VFS operations for ext4 filesystem.
     35 * @brief Operations for ext4 filesystem.
    3636 */
    3737
    … …  
    4545#include <adt/hash.h>
    4646#include <ipc/loc.h>
    47 #include "ext4fs.h"
    48 #include "../../vfs/vfs.h"
     47#include "ext4/ops.h"
     48//#include "../../vfs/vfs.h"
    4949
    5050#define EXT4FS_NODE(node) \

  • uspace/srv/fs/ext4fs/Makefile

    rfcb0d76 r81dd2ed  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBFS_PREFIX)/libfs.a \
    31     $(LIBEXT4_PREFIX)/libext4.a $(LIBCRYPTO_PREFIX)/libcrypto.a
     30LIBS = \
     31    $(LIBEXT4_PREFIX)/libext4.a \
     32    $(LIBBLOCK_PREFIX)/libblock.a \
     33    $(LIBFS_PREFIX)/libfs.a \
     34    $(LIBCRYPTO_PREFIX)/libcrypto.a
     35
    3236EXTRA_CFLAGS += -I$(LIBBLOCK_PREFIX) -I$(LIBFS_PREFIX) -I$(LIBEXT4_PREFIX)/include -I$(LIBCRYPTO_PREFIX)
    3337BINARY = ext4fs
    … …  
    3539
    3640SOURCES = \
    37         ext4fs.c \
    38         ext4fs_ops.c
     41        ext4fs.c
    3942
    4043include $(USPACE_PREFIX)/Makefile.common

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

    rfcb0d76 r81dd2ed  
    4242#include <task.h>
    4343#include <ipc/services.h>
    44 #include "ext4fs.h"
     44#include "ext4/ops.h"
    4545#include "../../vfs/vfs.h"
    4646
Note: See TracChangeset for help on using the changeset viewer.