[Ocfs-tools-commits]
jlbec commits r142 - in trunk/ocfs2/libocfs2: . include
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Sun Jul 4 16:39:47 CDT 2004
Author: jlbec
Date: 2004-07-04 15:39:45 -0500 (Sun, 04 Jul 2004)
New Revision: 142
Removed:
trunk/ocfs2/libocfs2/include/memory.h
trunk/ocfs2/libocfs2/include/unix_io.h
Modified:
trunk/ocfs2/libocfs2/Makefile
trunk/ocfs2/libocfs2/include/ocfs2.h
Log:
o Move unix_io.h and memory.h into ocfs2.h
Modified: trunk/ocfs2/libocfs2/Makefile
===================================================================
--- trunk/ocfs2/libocfs2/Makefile 2004-07-04 20:05:34 UTC (rev 141)
+++ trunk/ocfs2/libocfs2/Makefile 2004-07-04 20:39:45 UTC (rev 142)
@@ -88,10 +88,8 @@
include/ocfs2_fs.h \
include/ocfs2_disk_dlm.h \
include/ocfs1_fs_compat.h \
- include/memory.h \
- include/unix_io.h \
include/byteorder.h \
- include/ocfs2.h \
+ include/ocfs2.h \
include/dir_iterate.h
HFILES_GEN = \
Deleted: trunk/ocfs2/libocfs2/include/memory.h
===================================================================
--- trunk/ocfs2/libocfs2/include/memory.h 2004-07-04 20:05:34 UTC (rev 141)
+++ trunk/ocfs2/libocfs2/include/memory.h 2004-07-04 20:39:45 UTC (rev 142)
@@ -1,40 +0,0 @@
-/* -*- mode: c; c-basic-offset: 8; -*-
- * vim: noexpandtab sw=8 ts=8 sts=0:
- *
- * memory.h
- *
- * Memory 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 _MEMORY_H
-#define _MEMORY_H
-
-errcode_t ocfs2_malloc(unsigned long size, void *ptr);
-errcode_t ocfs2_malloc0(unsigned long size, void *ptr);
-errcode_t ocfs2_free(void *ptr);
-errcode_t ocfs2_realloc(unsigned long size, void *ptr);
-errcode_t ocfs2_realloc0(unsigned long size, void *ptr,
- unsigned long old_size);
-errcode_t ocfs2_malloc_blocks(io_channel *channel, int num_blocks,
- void *ptr);
-errcode_t ocfs2_malloc_block(io_channel *channel, void *ptr);
-
-#endif /* _MEMORY_H */
Modified: trunk/ocfs2/libocfs2/include/ocfs2.h
===================================================================
--- trunk/ocfs2/libocfs2/include/ocfs2.h 2004-07-04 20:05:34 UTC (rev 141)
+++ trunk/ocfs2/libocfs2/include/ocfs2.h 2004-07-04 20:39:45 UTC (rev 142)
@@ -42,8 +42,6 @@
#include <et/com_err.h>
-#include "unix_io.h"
-#include "memory.h"
#include "byteorder.h"
#if OCFS2_FLAT_INCLUDES
@@ -130,6 +128,7 @@
typedef struct _ocfs2_filesys ocfs2_filesys;
+typedef struct _io_channel io_channel;
struct _ocfs2_filesys {
char *fs_devname;
@@ -151,6 +150,27 @@
};
+
+errcode_t ocfs2_malloc(unsigned long size, void *ptr);
+errcode_t ocfs2_malloc0(unsigned long size, void *ptr);
+errcode_t ocfs2_free(void *ptr);
+errcode_t ocfs2_realloc(unsigned long size, void *ptr);
+errcode_t ocfs2_realloc0(unsigned long size, void *ptr,
+ unsigned long old_size);
+errcode_t ocfs2_malloc_blocks(io_channel *channel, int num_blocks,
+ void *ptr);
+errcode_t ocfs2_malloc_block(io_channel *channel, void *ptr);
+
+errcode_t io_open(const char *name, int flags, io_channel **channel);
+errcode_t io_close(io_channel *channel);
+int io_get_error(io_channel *channel);
+errcode_t io_set_blksize(io_channel *channel, int blksize);
+int io_get_blksize(io_channel *channel);
+errcode_t io_read_block(io_channel *channel, int64_t blkno, int count,
+ char *data);
+errcode_t io_write_block(io_channel *channel, int64_t blkno, int count,
+ const char *data);
+
errcode_t ocfs2_open(const char *name, int flags,
unsigned int superblock, unsigned int blksize,
ocfs2_filesys **ret_fs);
Deleted: trunk/ocfs2/libocfs2/include/unix_io.h
===================================================================
--- trunk/ocfs2/libocfs2/include/unix_io.h 2004-07-04 20:05:34 UTC (rev 141)
+++ trunk/ocfs2/libocfs2/include/unix_io.h 2004-07-04 20:39:45 UTC (rev 142)
@@ -1,41 +0,0 @@
-/* -*- mode: c; c-basic-offset: 8; -*-
- * vim: noexpandtab sw=8 ts=8 sts=0:
- *
- * unix_io.h
- *
- * I/O 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 _UNIX_IO_H
-#define _UNIX_IO_H
-
-typedef struct _io_channel io_channel;
-
-errcode_t io_open(const char *name, int flags, io_channel **channel);
-errcode_t io_close(io_channel *channel);
-int io_get_error(io_channel *channel);
-errcode_t io_set_blksize(io_channel *channel, int blksize);
-int io_get_blksize(io_channel *channel);
-errcode_t io_read_block(io_channel *channel, int64_t blkno, int count,
- char *data);
-errcode_t io_write_block(io_channel *channel, int64_t blkno, int count,
- const char *data);
-#endif /* _UNIX_IO_H */
More information about the Ocfs-tools-commits
mailing list