[Ocfs-tools-commits] jlbec commits r141 - in trunk/ocfs2/libocfs2: . include

svn-commits at oss.oracle.com svn-commits at oss.oracle.com
Sun Jul 4 16:05:36 CDT 2004


Author: jlbec
Date: 2004-07-04 15:05:34 -0500 (Sun, 04 Jul 2004)
New Revision: 141

Added:
   trunk/ocfs2/libocfs2/include/ocfs2.h
Removed:
   trunk/ocfs2/libocfs2/include/filesys.h
Modified:
   trunk/ocfs2/libocfs2/Makefile
   trunk/ocfs2/libocfs2/closefs.c
   trunk/ocfs2/libocfs2/dir_iterate.c
   trunk/ocfs2/libocfs2/dirblock.c
   trunk/ocfs2/libocfs2/extents.c
   trunk/ocfs2/libocfs2/freefs.c
   trunk/ocfs2/libocfs2/inode.c
   trunk/ocfs2/libocfs2/link.c
   trunk/ocfs2/libocfs2/lookup.c
   trunk/ocfs2/libocfs2/memory.c
   trunk/ocfs2/libocfs2/mkjournal.c
   trunk/ocfs2/libocfs2/openfs.c
   trunk/ocfs2/libocfs2/sysfile.c
   trunk/ocfs2/libocfs2/unix_io.c
   trunk/ocfs2/libocfs2/unlink.c
Log:

o Now that everything is mostly in one header, call it ocfs2.h.



Modified: trunk/ocfs2/libocfs2/Makefile
===================================================================
--- trunk/ocfs2/libocfs2/Makefile	2004-07-04 19:55:42 UTC (rev 140)
+++ trunk/ocfs2/libocfs2/Makefile	2004-07-04 20:05:34 UTC (rev 141)
@@ -91,7 +91,7 @@
 	include/memory.h		\
 	include/unix_io.h		\
 	include/byteorder.h		\
-	include/filesys.h		\
+	include/ocfs2.h		\
 	include/dir_iterate.h
 
 HFILES_GEN =		\

Modified: trunk/ocfs2/libocfs2/closefs.c
===================================================================
--- trunk/ocfs2/libocfs2/closefs.c	2004-07-04 19:55:42 UTC (rev 140)
+++ trunk/ocfs2/libocfs2/closefs.c	2004-07-04 20:05:34 UTC (rev 141)
@@ -30,7 +30,7 @@
 #define _XOPEN_SOURCE 600  /* Triggers XOPEN2K in features.h */
 #define _LARGEFILE64_SOURCE
 
-#include "filesys.h"
+#include "ocfs2.h"
 
 
 errcode_t ocfs2_flush(ocfs2_filesys *fs)

Modified: trunk/ocfs2/libocfs2/dir_iterate.c
===================================================================
--- trunk/ocfs2/libocfs2/dir_iterate.c	2004-07-04 19:55:42 UTC (rev 140)
+++ trunk/ocfs2/libocfs2/dir_iterate.c	2004-07-04 20:05:34 UTC (rev 141)
@@ -30,7 +30,7 @@
 #define _XOPEN_SOURCE 600 /* Triggers magic in features.h */
 #define _LARGEFILE64_SOURCE
 
-#include "filesys.h"
+#include "ocfs2.h"
 
 #include "dir_iterate.h"
 

Modified: trunk/ocfs2/libocfs2/dirblock.c
===================================================================
--- trunk/ocfs2/libocfs2/dirblock.c	2004-07-04 19:55:42 UTC (rev 140)
+++ trunk/ocfs2/libocfs2/dirblock.c	2004-07-04 20:05:34 UTC (rev 141)
@@ -32,7 +32,7 @@
 
 #include <string.h>
 
-#include "filesys.h"
+#include "ocfs2.h"
 
 
 errcode_t ocfs2_read_dir_block(ocfs2_filesys *fs, uint64_t block,

Modified: trunk/ocfs2/libocfs2/extents.c
===================================================================
--- trunk/ocfs2/libocfs2/extents.c	2004-07-04 19:55:42 UTC (rev 140)
+++ trunk/ocfs2/libocfs2/extents.c	2004-07-04 20:05:34 UTC (rev 141)
@@ -33,7 +33,7 @@
 
 #include <string.h>
 
-#include "filesys.h"
+#include "ocfs2.h"
 
 
 errcode_t ocfs2_read_extent_block(ocfs2_filesys *fs, uint64_t blkno,

Modified: trunk/ocfs2/libocfs2/freefs.c
===================================================================
--- trunk/ocfs2/libocfs2/freefs.c	2004-07-04 19:55:42 UTC (rev 140)
+++ trunk/ocfs2/libocfs2/freefs.c	2004-07-04 20:05:34 UTC (rev 141)
@@ -32,7 +32,7 @@
 
 #include <stdlib.h>
 
-#include "filesys.h"
+#include "ocfs2.h"
 
 
 void ocfs2_freefs(ocfs2_filesys *fs)

Deleted: trunk/ocfs2/libocfs2/include/filesys.h
===================================================================
--- trunk/ocfs2/libocfs2/include/filesys.h	2004-07-04 19:55:42 UTC (rev 140)
+++ trunk/ocfs2/libocfs2/include/filesys.h	2004-07-04 20:05:34 UTC (rev 141)
@@ -1,237 +0,0 @@
-/* -*- mode: c; c-basic-offset: 8; -*-
- * vim: noexpandtab sw=8 ts=8 sts=0:
- *
- * filesys.h
- *
- * Filesystem object routines for the OCFS2 userspace library.
- *
- * Copyright (C) 2004 Oracle.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License, version 2,  as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 021110-1307, USA.
- *
- * Authors: Joel Becker
- */
-
-#ifndef _FILESYS_H
-#define _FILESYS_H
-
-#ifndef _XOPEN_SOURCE
-# define _XOPEN_SOURCE 600
-#endif
-#ifndef _LARGEFILE64_SOURCE
-# define _LARGEFILE64_SOURCE
-#endif
-
-#include <stdio.h>
-#include <stdint.h>
-#include <sys/stat.h>
-
-#include <linux/types.h>
-
-#include <et/com_err.h>
-
-#include "unix_io.h"
-#include "memory.h"
-#include "byteorder.h"
-
-#if OCFS2_FLAT_INCLUDES
-#include "ocfs2_err.h"
-
-#include "ocfs2_fs.h"
-#else
-#include <ocfs2/ocfs2_err.h>
-
-#include <ocfs2/ocfs2_fs.h>
-#endif
-
-#define OCFS2_LIB_FEATURE_INCOMPAT_SUPP		OCFS2_FEATURE_INCOMPAT_SUPP
-#define OCFS2_LIB_FEATURE_RO_COMPAT_SUPP	OCFS2_FEATURE_RO_COMPAT_SUPP
-
-/* Flags for the ocfs2_filesys structure */
-#define OCFS2_FLAG_RO		0x00
-#define OCFS2_FLAG_RW		0x01
-#define OCFS2_FLAG_CHANGED	0x02
-#define OCFS2_FLAG_DIRTY	0x04
-#define OCFS2_FLAG_SWAP_BYTES	0x08
-
-/* Return flags for the extent iterator functions */
-#define OCFS2_EXTENT_CHANGED	0x01
-#define OCFS2_EXTENT_ABORT	0x02
-#define OCFS2_EXTENT_ERROR	0x04
-
-/*
- * Extent iterate flags
- *
- * OCFS2_EXTENT_FLAG_APPEND indicates that the iterator function should
- * be called on extents past the leaf next_free_rec.  This is used by
- * ocfs2_expand_dir() to add a new extent to a directory (via
- * OCFS2_BLOCK_FLAG_APPEND and the block iteration functions).
- *
- * OCFS2_EXTENT_FLAG_DEPTH_TRAVERSE indicates that the iterator
- * function for tree_depth > 0 records (ocfs2_extent_blocks, iow)
- * should be called after all of the extents contained in the
- * extent_block are processed.  This is useful if you are going to be
- * deallocating extents.
- *
- * OCFS2_EXTENT_FLAG_DATA_ONLY indicates that the iterator function
- * should be called for data extents (depth == 0) only.
- */
-#define OCFS2_EXTENT_FLAG_APPEND		0x01
-#define OCFS2_EXTENT_FLAG_DEPTH_TRAVERSE	0x02
-#define OCFS2_EXTENT_FLAG_DATA_ONLY		0x04
-
-
-/* Return flags for the block iterator functions */
-#define OCFS2_BLOCK_CHANGED	0x01
-#define OCFS2_BLOCK_ABORT	0x02
-#define OCFS2_BLOCK_ERROR	0x03
-
-/*
- * Block iterate flags
- *
- * In OCFS2, block iteration runs through the blocks contained in an
- * inode's data extents.  As such, "DATA_ONLY" and "DEPTH_TRAVERSE"
- * can't really apply.
- * 
- * OCFS2_BLOCK_FLAG_APPEND is as OCFS2_EXTENT_FLAG_APPEND, except on a
- * blocksize basis.  This may mean that the underlying extent already
- * contains the space for a new block, and i_size is updated
- * accordingly.
- */
-#define OCFS2_BLOCK_FLAG_APPEND		0x01
-
-
-/* Return flags for the directory iterator functions */
-#define OCFS2_DIRENT_CHANGED	1
-#define OCFS2_DIRENT_ABORT	2
-#define OCFS2_DIRENT_ERROR	3
-
-/* Directory iterator flags */
-#define OCFS2_DIRENT_FLAG_INCLUDE_EMPTY		1
-#define OCFS2_DIRENT_FLAG_INCLUDE_REMOVED	2
-
-/* Directory constants */
-#define OCFS2_DIRENT_DOT_FILE		1
-#define OCFS2_DIRENT_DOT_DOT_FILE	2
-#define OCFS2_DIRENT_OTHER_FILE		3
-#define OCFS2_DIRENT_DELETED_FILE	4
-
-
-typedef struct _ocfs2_filesys ocfs2_filesys;
-
-struct _ocfs2_filesys {
-	char *fs_devname;
-	uint32_t fs_flags;
-	io_channel *fs_io;
-	ocfs2_dinode *fs_super;
-	ocfs2_dinode *fs_orig_super;
-	unsigned int fs_blocksize;
-	unsigned int fs_clustersize;
-	uint32_t fs_clusters;
-	uint64_t fs_blocks;
-	uint32_t fs_umask;
-	uint64_t fs_root_blkno;
-	uint64_t fs_sysdir_blkno;
-	uint64_t fs_bm_blkno;
-
-	/* Reserved for the use of the calling application. */
-	void *fs_private;
-};
-
-
-errcode_t ocfs2_open(const char *name, int flags,
-		     unsigned int superblock, unsigned int blksize,
-		     ocfs2_filesys **ret_fs);
-errcode_t ocfs2_flush(ocfs2_filesys *fs);
-errcode_t ocfs2_close(ocfs2_filesys *fs);
-void ocfs2_freefs(ocfs2_filesys *fs);
-
-errcode_t ocfs2_read_inode(ocfs2_filesys *fs, uint64_t blkno,
-			   char *inode_buf);
-errcode_t ocfs2_write_inode(ocfs2_filesys *fs, uint64_t blkno,
-			    char *inode_buf);
-errcode_t ocfs2_check_directory(ocfs2_filesys *fs, uint64_t dir);
-
-errcode_t ocfs2_create_journal_superblock(ocfs2_filesys *fs,
-					  uint32_t size, int flags,
-					  char **ret_jsb);
-
-errcode_t ocfs2_read_extent_block(ocfs2_filesys *fs, uint64_t blkno,
-       				  char *eb_buf);
-errcode_t ocfs2_write_extent_block(ocfs2_filesys *fs, uint64_t blkno,
-       				   char *eb_buf);
-errcode_t ocfs2_extent_iterate(ocfs2_filesys *fs,
-			       uint64_t blkno,
-			       int flags,
-			       char *block_buf,
-			       int (*func)(ocfs2_filesys *fs,
-					   ocfs2_extent_rec *rec,
-					   int tree_depth,
-					   uint32_t ccount,
-					   uint64_t ref_blkno,
-					   int ref_recno,
-					   void *priv_data),
-			       void *priv_data);
-errcode_t ocfs2_block_iterate(ocfs2_filesys *fs,
-			      uint64_t blkno,
-			      int flags,
-			      int (*func)(ocfs2_filesys *fs,
-					  uint64_t blkno,
-					  uint64_t bcount,
-					  void *priv_data),
-			      void *priv_data);
-
-errcode_t ocfs2_read_dir_block(ocfs2_filesys *fs, uint64_t block,
-			       void *buf);
-errcode_t ocfs2_write_dir_block(ocfs2_filesys *fs, uint64_t block,
-				void *buf);
-
-errcode_t ocfs2_dir_iterate2(ocfs2_filesys *fs,
-			     uint64_t dir,
-			     int flags,
-			     char *block_buf,
-			     int (*func)(uint64_t	dir,
-					 int		entry,
-					 struct ocfs2_dir_entry *dirent,
-					 int	offset,
-					 int	blocksize,
-					 char	*buf,
-					 void	*priv_data),
-			     void *priv_data);
-extern errcode_t ocfs2_dir_iterate(ocfs2_filesys *fs, 
-				   uint64_t dir,
-				   int flags,
-				   char *block_buf,
-				   int (*func)(struct ocfs2_dir_entry *dirent,
-					       int	offset,
-					       int	blocksize,
-					       char	*buf,
-					       void	*priv_data),
-				   void *priv_data);
-
-errcode_t ocfs2_lookup(ocfs2_filesys *fs, uint64_t dir,
-		       const char *name, int namelen, char *buf,
-		       uint64_t *inode);
-
-errcode_t ocfs2_lookup_system_inode(ocfs2_filesys *fs, int type,
-				    int node_num, uint64_t *blkno);
-
-errcode_t ocfs2_link(ocfs2_filesys *fs, uint64_t dir, const char *name,
-		     uint64_t ino, int flags);
-
-errcode_t ocfs2_unlink(ocfs2_filesys *fs, uint64_t dir,
-		       const char *name, uint64_t ino, int flags);
-#endif  /* _FILESYS_H */
-

Copied: trunk/ocfs2/libocfs2/include/ocfs2.h (from rev 140, trunk/ocfs2/libocfs2/include/filesys.h)

Modified: trunk/ocfs2/libocfs2/inode.c
===================================================================
--- trunk/ocfs2/libocfs2/inode.c	2004-07-04 19:55:42 UTC (rev 140)
+++ trunk/ocfs2/libocfs2/inode.c	2004-07-04 20:05:34 UTC (rev 141)
@@ -32,7 +32,7 @@
 
 #include <string.h>
 
-#include "filesys.h"
+#include "ocfs2.h"
 
 
 errcode_t ocfs2_check_directory(ocfs2_filesys *fs, uint64_t dir)

Modified: trunk/ocfs2/libocfs2/link.c
===================================================================
--- trunk/ocfs2/libocfs2/link.c	2004-07-04 19:55:42 UTC (rev 140)
+++ trunk/ocfs2/libocfs2/link.c	2004-07-04 20:05:34 UTC (rev 141)
@@ -32,7 +32,7 @@
 
 #include <string.h>
 
-#include "filesys.h"
+#include "ocfs2.h"
 
 
 struct link_struct  {

Modified: trunk/ocfs2/libocfs2/lookup.c
===================================================================
--- trunk/ocfs2/libocfs2/lookup.c	2004-07-04 19:55:42 UTC (rev 140)
+++ trunk/ocfs2/libocfs2/lookup.c	2004-07-04 20:05:34 UTC (rev 141)
@@ -32,7 +32,7 @@
 
 #include <string.h>
 
-#include "filesys.h"
+#include "ocfs2.h"
 
 
 struct lookup_struct  {

Modified: trunk/ocfs2/libocfs2/memory.c
===================================================================
--- trunk/ocfs2/libocfs2/memory.c	2004-07-04 19:55:42 UTC (rev 140)
+++ trunk/ocfs2/libocfs2/memory.c	2004-07-04 20:05:34 UTC (rev 141)
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include "filesys.h"
+#include "ocfs2.h"
 
 errcode_t ocfs2_malloc(unsigned long size, void *ptr)
 {

Modified: trunk/ocfs2/libocfs2/mkjournal.c
===================================================================
--- trunk/ocfs2/libocfs2/mkjournal.c	2004-07-04 19:55:42 UTC (rev 140)
+++ trunk/ocfs2/libocfs2/mkjournal.c	2004-07-04 20:05:34 UTC (rev 141)
@@ -32,7 +32,7 @@
 
 #include <string.h>
 
-#include "filesys.h"
+#include "ocfs2.h"
 
 /* jfs_compat.h defines these */
 #undef cpu_to_be32

Modified: trunk/ocfs2/libocfs2/openfs.c
===================================================================
--- trunk/ocfs2/libocfs2/openfs.c	2004-07-04 19:55:42 UTC (rev 140)
+++ trunk/ocfs2/libocfs2/openfs.c	2004-07-04 20:05:34 UTC (rev 141)
@@ -37,7 +37,7 @@
 # define ULLONG_MAX 18446744073709551615ULL
 #endif
 
-#include "filesys.h"
+#include "ocfs2.h"
 
 #include "ocfs1_fs_compat.h"
 

Modified: trunk/ocfs2/libocfs2/sysfile.c
===================================================================
--- trunk/ocfs2/libocfs2/sysfile.c	2004-07-04 19:55:42 UTC (rev 140)
+++ trunk/ocfs2/libocfs2/sysfile.c	2004-07-04 20:05:34 UTC (rev 141)
@@ -29,7 +29,7 @@
 
 #include <string.h>
 
-#include "filesys.h"
+#include "ocfs2.h"
 
 errcode_t ocfs2_lookup_system_inode(ocfs2_filesys *fs, int type,
 				    int node_num, uint64_t *blkno)

Modified: trunk/ocfs2/libocfs2/unix_io.c
===================================================================
--- trunk/ocfs2/libocfs2/unix_io.c	2004-07-04 19:55:42 UTC (rev 140)
+++ trunk/ocfs2/libocfs2/unix_io.c	2004-07-04 20:05:34 UTC (rev 141)
@@ -42,7 +42,7 @@
 #include <sys/utsname.h>
 #endif
 
-#include "filesys.h"
+#include "ocfs2.h"
 
 
 struct _io_channel {

Modified: trunk/ocfs2/libocfs2/unlink.c
===================================================================
--- trunk/ocfs2/libocfs2/unlink.c	2004-07-04 19:55:42 UTC (rev 140)
+++ trunk/ocfs2/libocfs2/unlink.c	2004-07-04 20:05:34 UTC (rev 141)
@@ -33,7 +33,7 @@
 
 #include <string.h>
 
-#include "filesys.h"
+#include "ocfs2.h"
 
 
 struct link_struct  {



More information about the Ocfs-tools-commits mailing list