diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2012-05-04 11:04:04 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2012-05-04 11:04:04 +0200 |
commit | 7619a60e0e569c6e3cf9f647b7449df4647d873d (patch) | |
tree | f72fe9aa25c9fd53bf42b446ce6a0a35dce95719 /cpukit/libfs/src | |
parent | Merge branch 'upstream' (diff) | |
parent | Filesystem: Use proper parameter in NFS (diff) | |
download | rtems-7619a60e0e569c6e3cf9f647b7449df4647d873d.tar.bz2 |
Merge branch 'upstream'
Diffstat (limited to 'cpukit/libfs/src')
-rw-r--r-- | cpukit/libfs/src/imfs/imfs_fifo.c | 12 | ||||
-rw-r--r-- | cpukit/libfs/src/imfs/imfs_readlink.c | 2 | ||||
-rw-r--r-- | cpukit/libfs/src/nfsclient/Makefile.am | 4 | ||||
-rw-r--r-- | cpukit/libfs/src/nfsclient/src/nfs.c | 2 | ||||
-rw-r--r-- | cpukit/libfs/src/pipe/fifo.c | 14 | ||||
-rw-r--r-- | cpukit/libfs/src/pipe/pipe.h | 10 |
6 files changed, 3 insertions, 41 deletions
diff --git a/cpukit/libfs/src/imfs/imfs_fifo.c b/cpukit/libfs/src/imfs/imfs_fifo.c index 616025669a..ac77e41533 100644 --- a/cpukit/libfs/src/imfs/imfs_fifo.c +++ b/cpukit/libfs/src/imfs/imfs_fifo.c @@ -109,23 +109,13 @@ static int IMFS_fifo_ioctl( IMFS_FIFO_RETURN(err); } -static off_t IMFS_fifo_lseek( - rtems_libio_t *iop, - off_t offset, - int whence -) -{ - off_t err = pipe_lseek(LIBIO2PIPE(iop), offset, whence, iop); - IMFS_FIFO_RETURN(err); -} - static const rtems_filesystem_file_handlers_r IMFS_fifo_handlers = { IMFS_fifo_open, IMFS_fifo_close, IMFS_fifo_read, IMFS_fifo_write, IMFS_fifo_ioctl, - IMFS_fifo_lseek, + rtems_filesystem_default_lseek, IMFS_stat, rtems_filesystem_default_ftruncate, rtems_filesystem_default_fsync_or_fdatasync, diff --git a/cpukit/libfs/src/imfs/imfs_readlink.c b/cpukit/libfs/src/imfs/imfs_readlink.c index 6786806abd..e18e8cc593 100644 --- a/cpukit/libfs/src/imfs/imfs_readlink.c +++ b/cpukit/libfs/src/imfs/imfs_readlink.c @@ -31,7 +31,7 @@ ssize_t IMFS_readlink( node = loc->node_access; - IMFS_assert( node->type == IMFS_SYM_LINK ); + IMFS_assert( node->control.imfs_type == IMFS_SYM_LINK ); for( i=0; ((i<bufsize) && (node->info.sym_link.name[i] != '\0')); i++ ) buf[i] = node->info.sym_link.name[i]; diff --git a/cpukit/libfs/src/nfsclient/Makefile.am b/cpukit/libfs/src/nfsclient/Makefile.am index 98ba99286c..85f4a71756 100644 --- a/cpukit/libfs/src/nfsclient/Makefile.am +++ b/cpukit/libfs/src/nfsclient/Makefile.am @@ -1,7 +1,3 @@ -# -# $Id$ -# - include $(top_srcdir)/automake/compile.am #%dirutils.obj: %dirutils.o diff --git a/cpukit/libfs/src/nfsclient/src/nfs.c b/cpukit/libfs/src/nfsclient/src/nfs.c index 71d8c0d6c8..b3e24a95b6 100644 --- a/cpukit/libfs/src/nfsclient/src/nfs.c +++ b/cpukit/libfs/src/nfsclient/src/nfs.c @@ -1510,7 +1510,7 @@ char *dupname; &SERP_FILE(pNode), sizeof(SERP_FILE(pNode))); - SERP_ARGS(tNode).linkarg.to.name = (filename)name; + SERP_ARGS(tNode).linkarg.to.name = dupname; if ( nfscall(tNode->nfs->server, NFSPROC_LINK, diff --git a/cpukit/libfs/src/pipe/fifo.c b/cpukit/libfs/src/pipe/fifo.c index ca33f6aadb..1acb150632 100644 --- a/cpukit/libfs/src/pipe/fifo.c +++ b/cpukit/libfs/src/pipe/fifo.c @@ -643,17 +643,3 @@ int pipe_ioctl( return rv; } - -/* - * Interface to file system lseek. - */ -int pipe_lseek( - pipe_control_t *pipe, - off_t offset, - int whence, - rtems_libio_t *iop -) -{ - /* Seek on pipe is not supported */ - return -ESPIPE; -} diff --git a/cpukit/libfs/src/pipe/pipe.h b/cpukit/libfs/src/pipe/pipe.h index 97358eb61e..afdc965055 100644 --- a/cpukit/libfs/src/pipe/pipe.h +++ b/cpukit/libfs/src/pipe/pipe.h @@ -106,16 +106,6 @@ extern int pipe_ioctl( rtems_libio_t *iop ); -/* - * Interface to file system lseek. - */ -extern int pipe_lseek( - pipe_control_t *pipe, - off_t offset, - int whence, - rtems_libio_t *iop -); - #ifdef __cplusplus } #endif |