1997-04-26 17:21:57 +04:00
|
|
|
/*
|
|
|
|
* inline.c --- Includes the inlined functions defined in the header
|
|
|
|
* files as standalone functions, in case the application program
|
|
|
|
* is compiled with inlining turned off.
|
2008-08-28 07:07:54 +04:00
|
|
|
*
|
1997-04-29 20:17:09 +04:00
|
|
|
* Copyright (C) 1993, 1994 Theodore Ts'o.
|
|
|
|
*
|
|
|
|
* %Begin-Header%
|
2010-05-18 05:31:56 +04:00
|
|
|
* This file may be redistributed under the terms of the GNU Library
|
|
|
|
* General Public License, version 2.
|
1997-04-29 20:17:09 +04:00
|
|
|
* %End-Header%
|
1997-04-26 17:21:57 +04:00
|
|
|
*/
|
|
|
|
|
2012-05-28 18:54:08 +04:00
|
|
|
#ifndef _XOPEN_SOURCE
|
|
|
|
#define _XOPEN_SOURCE 600 /* for posix_memalign() */
|
|
|
|
#endif
|
1997-04-26 17:21:57 +04:00
|
|
|
|
2011-09-19 01:34:37 +04:00
|
|
|
#include "config.h"
|
1997-04-26 17:21:57 +04:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
1997-08-11 03:07:40 +04:00
|
|
|
#if HAVE_UNISTD_H
|
1997-04-26 17:21:57 +04:00
|
|
|
#include <unistd.h>
|
1997-08-11 03:07:40 +04:00
|
|
|
#endif
|
1997-04-26 17:21:57 +04:00
|
|
|
#include <fcntl.h>
|
|
|
|
#include <time.h>
|
1997-10-20 03:00:21 +04:00
|
|
|
#if HAVE_SYS_STAT_H
|
1997-04-26 17:21:57 +04:00
|
|
|
#include <sys/stat.h>
|
1997-10-20 03:00:21 +04:00
|
|
|
#endif
|
|
|
|
#if HAVE_SYS_TYPES_H
|
1997-04-26 17:21:57 +04:00
|
|
|
#include <sys/types.h>
|
1997-10-20 03:00:21 +04:00
|
|
|
#endif
|
2012-03-27 02:37:28 +04:00
|
|
|
#if HAVE_MALLOC_H
|
|
|
|
#include <malloc.h>
|
|
|
|
#endif
|
1997-04-26 17:21:57 +04:00
|
|
|
|
Many files:
inode.c (ext2fs_open_inode_scan): Initialize the group variables
so that we don't need to call get_next_blockgroup() the first
time around. Saves a bit of time, and prevents us from
needing to assign -1 to current_group (which is an unsigned
value).
icount.c (insert_icount_el): Cast the estimated number of inodes
from a float to an ino_t.
alloc.c, alloc_tables.c, badlbocks.c, bb_compat.c, bb_inode.c,
bitmaps.c, bitops.c, block.c, bmap.c, bmove.c, brel_ma.c,
check_desc.c, closefs.c, cmp_bitmaps.c, dblist.c,
dblist_dir.c, dir_iterate.c, dirblock.c, dupfs.c, expanddir.c,
ext2fs.h, fileio.c, freefs.c, get_pathname.c, getsize.c,
icount.c, initialize.c, inline.c, inode.c, irel_ma.c,
ismounted.c, link.c, lookup.c, mkdir.c, namei.c, native.c,
newdir.c, openfs.c, read_bb.c, read_bb_file.c, rs_bitmap.c,
rw_bitmaps.c, swapfs.c, test_io.c, tst_badblocks.c,
tst_getsize.c, tst_iscan.c, unix_io.c, unlink.c, valid_blk.c,
version.c: If EXT2_FLAT_INCLUDES is defined, then assume all
of the ext2-specific header files are in a flat directory.
block.c, bmove.c, dirblock.c, fileio.c: Explicitly cast
all assignments from void * to be compatible with C++.
closefs.c (ext2fs_flush): Add a call to io_channel_flush() to
make sure the contents of the disk are flushed to disk.
dblist.c (ext2fs_add_dir_block): Change new to be new_entry to
avoid C++ namespace clash.
bitmaps.c (ext2fs_copy_bitmap): Change new to be new_map to
avoid C++ namespace clash.
ext2fs.h, bb_inode.c, block.c, bmove.c, brel.h, brel_ma.c,
irel.h, irel_ma.c, dblist.c, dblist_dir.c, dir_iterate.c,
ext2fsP.h, expanddir.c, get_pathname.c, inode.c, link.c,
unlink.c: Change private to be priv_data (to avoid C++
namespace clash)
1998-01-19 17:47:53 +03:00
|
|
|
#include "ext2_fs.h"
|
1997-04-26 17:21:57 +04:00
|
|
|
#define INCLUDE_INLINE_FUNCS
|
|
|
|
#include "ext2fs.h"
|
|
|
|
|
2011-10-17 05:50:26 +04:00
|
|
|
/*
|
|
|
|
* We used to define this as an inline, but since we are now using
|
|
|
|
* autoconf-defined #ifdef's, we need to export this as a
|
|
|
|
* library-provided function exclusively.
|
|
|
|
*/
|
|
|
|
errcode_t ext2fs_get_memalign(unsigned long size,
|
|
|
|
unsigned long align, void *ptr)
|
|
|
|
{
|
|
|
|
errcode_t retval;
|
2012-03-27 02:37:28 +04:00
|
|
|
void **p = ptr;
|
2011-10-17 05:50:26 +04:00
|
|
|
|
2012-05-02 22:21:28 +04:00
|
|
|
if (align < 8)
|
2011-10-17 05:50:26 +04:00
|
|
|
align = 8;
|
|
|
|
#ifdef HAVE_POSIX_MEMALIGN
|
2012-03-27 02:37:28 +04:00
|
|
|
retval = posix_memalign(p, align, size);
|
2011-10-17 05:50:26 +04:00
|
|
|
if (retval) {
|
|
|
|
if (retval == ENOMEM)
|
|
|
|
return EXT2_ET_NO_MEMORY;
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
#ifdef HAVE_MEMALIGN
|
2012-03-27 02:37:28 +04:00
|
|
|
*p = memalign(align, size);
|
|
|
|
if (*p == NULL) {
|
2011-10-17 05:50:26 +04:00
|
|
|
if (errno)
|
|
|
|
return errno;
|
|
|
|
else
|
|
|
|
return EXT2_ET_NO_MEMORY;
|
|
|
|
}
|
|
|
|
#else
|
2012-05-02 22:21:28 +04:00
|
|
|
#ifdef HAVE_VALLOC
|
|
|
|
if (align > sizeof(long long))
|
|
|
|
*p = valloc(size);
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
*p = malloc(size);
|
|
|
|
if ((unsigned long) *p & (align - 1)) {
|
|
|
|
free(*p);
|
|
|
|
*p = 0;
|
|
|
|
}
|
|
|
|
if (*p == 0)
|
|
|
|
return EXT2_ET_NO_MEMORY;
|
2011-10-17 05:50:26 +04:00
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-05-02 22:21:28 +04:00
|
|
|
#ifdef DEBUG
|
|
|
|
static int isaligned(void *ptr, unsigned long align)
|
|
|
|
{
|
|
|
|
return (((unsigned long) ptr & (align - 1)) == 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static errcode_t test_memalign(unsigned long align)
|
|
|
|
{
|
|
|
|
void *ptr = 0;
|
|
|
|
errcode_t retval;
|
|
|
|
|
|
|
|
retval = ext2fs_get_memalign(32, align, &ptr);
|
|
|
|
if (!retval && !isaligned(ptr, align))
|
|
|
|
retval = EINVAL;
|
|
|
|
free(ptr);
|
|
|
|
printf("tst_memliagn(%lu): %s\n", align,
|
|
|
|
retval ? error_message(retval) : "OK");
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
int main(int argc, char **argv)
|
|
|
|
{
|
|
|
|
int err = 0;
|
|
|
|
|
|
|
|
if (test_memalign(4))
|
|
|
|
err++;
|
|
|
|
if (test_memalign(32))
|
|
|
|
err++;
|
|
|
|
if (test_memalign(1024))
|
|
|
|
err++;
|
|
|
|
if (test_memalign(4096))
|
|
|
|
err++;
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
#endif
|