Changeset 81dd2ed in mainline for uspace/lib/ext4

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/lib/ext4

Files:

• Makefile (modified) (2 diffs)
• include/ext4/ops.h (moved) (moved from uspace/srv/fs/ext4fs/ext4fs.h ) (1 diff)
• src/ops.c (moved) (moved from uspace/srv/fs/ext4fs/ext4fs_ops.c ) (2 diffs)

uspace/lib/ext4/Makefile

@@ -29 +29 @@
 USPACE_PREFIX = ../..
 LIBRARY = libext4
-EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBCRYPTO_PREFIX) -Iinclude
+EXTRA_CFLAGS = \
+    -I$(LIBBLOCK_PREFIX) \
+    -I$(LIBCRYPTO_PREFIX) \
+    -I$(LIBFS_PREFIX) \
+    -Iinclude
 
 SOURCES = \
@@ -42 +46 @@
         src/ialloc.c \
         src/inode.c \
+        src/ops.c \
         src/superblock.c
 

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

@@ -27 +27 @@
  */
 
-/** @addtogroup fs
+/** @addtogroup libext4
  * @{
  */
 
-#ifndef EXT4FS_EXT4FS_H_
-#define EXT4FS_EXT4FS_H_
+#ifndef LIBEXT4_OPS_H_
+#define LIBEXT4_OPS_H_
 
 #include <libfs.h>

uspace/lib/ext4/src/ops.c

@@ -28 +28 @@
  */
 
-/** @addtogroup fs
+/** @addtogroup libext4
  * @{
  */
 /**
  * @file  ext4fs_ops.c
- * @brief VFS operations for ext4 filesystem.
+ * @brief Operations for ext4 filesystem.
  */
 
@@ -45 +45 @@
 #include <adt/hash.h>
 #include <ipc/loc.h>
-#include "ext4fs.h"
-#include "../../vfs/vfs.h"
+#include "ext4/ops.h"
+//#include "../../vfs/vfs.h"
 
 #define EXT4FS_NODE(node) \