Changeset fd2b1634 in rtems


Ignore:
Timestamp:
Jul 15, 2010, 8:10:48 AM (9 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
4.11, master
Children:
de39b51
Parents:
106d8f5
Message:

2010-07-16 Sebastian Huber <sebastian.huber@…>

  • libcsupport/include/rtems/libio.h: Removed file_info and handlers fields in rtems_libio_t.
  • libcsupport/src/close.c, libcsupport/src/fcntl.c, libcsupport/src/fdatasync.c, libcsupport/src/fstat.c, libcsupport/src/fsync.c, libcsupport/src/ftruncate.c, libcsupport/src/getdents.c, libcsupport/src/ioctl.c, libcsupport/src/libio_sockets.c, libcsupport/src/lseek.c, libcsupport/src/open.c, libcsupport/src/read.c, libcsupport/src/readv.c, libcsupport/src/write.c, libcsupport/src/writev.c, libfs/src/devfs/devclose.c, libfs/src/devfs/devioctl.c, libfs/src/devfs/devopen.c, libfs/src/devfs/devread.c, libfs/src/devfs/devwrite.c libfs/src/dosfs/msdos_dir.c libfs/src/dosfs/msdos_file.c libfs/src/imfs/deviceio.c libfs/src/imfs/imfs_directory.c libfs/src/imfs/imfs_fifo.c libfs/src/imfs/memfile.c libfs/src/nfsclient/src/nfs.c libfs/src/rfs/rtems-rfs-rtems-file.c libfs/src/rfs/rtems-rfs-rtems.h libnetworking/lib/ftpfs.c: Reflect changes above.
Location:
cpukit
Files:
32 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    r106d8f5 rfd2b1634  
     12010-07-16      Sebastian Huber <sebastian.huber@embedded-brains.de>
     2
     3        * libcsupport/include/rtems/libio.h: Removed file_info and handlers
     4        fields in rtems_libio_t.
     5        * libcsupport/src/close.c, libcsupport/src/fcntl.c,
     6        libcsupport/src/fdatasync.c, libcsupport/src/fstat.c,
     7        libcsupport/src/fsync.c, libcsupport/src/ftruncate.c,
     8        libcsupport/src/getdents.c, libcsupport/src/ioctl.c,
     9        libcsupport/src/libio_sockets.c, libcsupport/src/lseek.c,
     10        libcsupport/src/open.c, libcsupport/src/read.c,
     11        libcsupport/src/readv.c, libcsupport/src/write.c,
     12        libcsupport/src/writev.c, libfs/src/devfs/devclose.c,
     13        libfs/src/devfs/devioctl.c, libfs/src/devfs/devopen.c,
     14        libfs/src/devfs/devread.c, libfs/src/devfs/devwrite.c
     15        libfs/src/dosfs/msdos_dir.c libfs/src/dosfs/msdos_file.c
     16        libfs/src/imfs/deviceio.c libfs/src/imfs/imfs_directory.c
     17        libfs/src/imfs/imfs_fifo.c libfs/src/imfs/memfile.c
     18        libfs/src/nfsclient/src/nfs.c libfs/src/rfs/rtems-rfs-rtems-file.c
     19        libfs/src/rfs/rtems-rfs-rtems.h libnetworking/lib/ftpfs.c: Reflect
     20        changes above.
     21
    1222010-07-16      Sebastian Huber <sebastian.huber@embedded-brains.de>
    223
  • cpukit/libcsupport/include/rtems/libio.h

    r106d8f5 rfd2b1634  
    11201120  uint32_t                                data0;     /* private to "driver" */
    11211121  void                                   *data1;     /* ... */
    1122   void                                   *file_info; /* used by file handlers */
    1123   const rtems_filesystem_file_handlers_r *handlers;  /* type specific handlers */
    11241122};
    11251123
  • cpukit/libcsupport/src/close.c

    r106d8f5 rfd2b1634  
    3030
    3131  rc = RTEMS_SUCCESSFUL;
    32   rc = (*iop->handlers->close_h)( iop );
     32  rc = (*iop->pathinfo.handlers->close_h)( iop );
    3333
    3434  rtems_filesystem_freenode( &iop->pathinfo );
  • cpukit/libcsupport/src/fcntl.c

    r106d8f5 rfd2b1634  
    6363      }
    6464
    65       diop->handlers   = iop->handlers;
    66       diop->file_info  = iop->file_info;
    6765      diop->flags      = iop->flags;
    6866      diop->pathinfo   = iop->pathinfo;
     
    141139
    142140  if (ret >= 0) {
    143     int err = (*iop->handlers->fcntl_h)( cmd, iop );
     141    int err = (*iop->pathinfo.handlers->fcntl_h)( cmd, iop );
    144142    if (err) {
    145143      errno = err;
  • cpukit/libcsupport/src/fdatasync.c

    r106d8f5 rfd2b1634  
    3636   */
    3737
    38   return (*iop->handlers->fdatasync_h)( iop );
     38  return (*iop->pathinfo.handlers->fdatasync_h)( iop );
    3939}
  • cpukit/libcsupport/src/fstat.c

    r106d8f5 rfd2b1634  
    5151  memset( sbuf, 0, sizeof(struct stat) );
    5252
    53   return (*iop->handlers->fstat_h)( &iop->pathinfo, sbuf );
     53  return (*iop->pathinfo.handlers->fstat_h)( &iop->pathinfo, sbuf );
    5454}
    5555
  • cpukit/libcsupport/src/fsync.c

    r106d8f5 rfd2b1634  
    3636   */
    3737
    38   return (*iop->handlers->fsync_h)( iop );
     38  return (*iop->pathinfo.handlers->fsync_h)( iop );
    3939}
  • cpukit/libcsupport/src/ftruncate.c

    r106d8f5 rfd2b1634  
    4848  rtems_libio_check_permissions( iop, LIBIO_FLAGS_WRITE );
    4949
    50   return (*iop->handlers->ftruncate_h)( iop, length );
     50  return (*iop->pathinfo.handlers->ftruncate_h)( iop, length );
    5151}
  • cpukit/libcsupport/src/getdents.c

    r106d8f5 rfd2b1634  
    5252   *  of the read attempt.
    5353   */
    54   return (*iop->handlers->read_h)( iop, dd_buf, dd_len  );
     54  return (*iop->pathinfo.handlers->read_h)( iop, dd_buf, dd_len  );
    5555}
  • cpukit/libcsupport/src/ioctl.c

    r106d8f5 rfd2b1634  
    4848   *  Now process the ioctl().
    4949   */
    50   rc = (*iop->handlers->ioctl_h)( iop, command, buffer );
     50  rc = (*iop->pathinfo.handlers->ioctl_h)( iop, command, buffer );
    5151
    5252  return rc;
  • cpukit/libcsupport/src/libio_sockets.c

    r106d8f5 rfd2b1634  
    1717#endif
    1818
    19 #include <rtems/libio_.h>             /* libio_.h pulls in rtems */
    20 #include <rtems.h>
    21 
    22 #include <errno.h>
     19#include <rtems/libio_.h>
    2320#include <rtems/seterr.h>
    2421
     
    7168  iop->data0 = fd;
    7269  iop->data1 = so;
    73   iop->handlers = h;
    74   iop->pathinfo.handlers = rtems_filesystem_root.handlers;
    75   iop->pathinfo.ops = rtems_filesystem_root.ops;
     70  iop->pathinfo.handlers = h;
     71  iop->pathinfo.ops = &rtems_filesystem_operations_default;
    7672  return fd;
    7773}
  • cpukit/libcsupport/src/lseek.c

    r106d8f5 rfd2b1634  
    6262   */
    6363
    64   status = (*iop->handlers->lseek_h)( iop, offset, whence );
     64  status = (*iop->pathinfo.handlers->lseek_h)( iop, offset, whence );
    6565  if ( status == (off_t) -1 )
    6666    iop->offset = old_offset;
  • cpukit/libcsupport/src/open.c

    r106d8f5 rfd2b1634  
    155155   *  returned by successful path evaluation.
    156156   */
    157   iop->handlers   = loc.handlers;
    158   iop->file_info  = loc.node_access;
    159157  iop->flags     |= rtems_libio_fcntl_flags( flags );
    160158  iop->pathinfo   = loc;
    161159
    162   rc = (*iop->handlers->open_h)( iop, pathname, flags, mode );
     160  rc = (*iop->pathinfo.handlers->open_h)( iop, pathname, flags, mode );
    163161  if ( rc ) {
    164162    rc = errno;
  • cpukit/libcsupport/src/read.c

    r106d8f5 rfd2b1634  
    4141   *  Now process the read().
    4242   */
    43   rc = (*iop->handlers->read_h)( iop, buffer, count );
     43  rc = (*iop->pathinfo.handlers->read_h)( iop, buffer, count );
    4444
    4545  if ( rc > 0 )
  • cpukit/libcsupport/src/readv.c

    r106d8f5 rfd2b1634  
    9898   */
    9999  for ( total=0, v=0 ; v < iovcnt ; v++ ) {
    100     bytes = (*iop->handlers->read_h)( iop, iov[v].iov_base, iov[v].iov_len );
     100    bytes = (*iop->pathinfo.handlers->read_h)(
     101      iop,
     102      iov[v].iov_base,
     103      iov[v].iov_len
     104    );
    101105
    102106    if ( bytes < 0 )
  • cpukit/libcsupport/src/write.c

    r106d8f5 rfd2b1634  
    4848   *  Now process the write() request.
    4949   */
    50   rc = (*iop->handlers->write_h)( iop, buffer, count );
     50  rc = (*iop->pathinfo.handlers->write_h)( iop, buffer, count );
    5151
    5252  if ( rc > 0 )
  • cpukit/libcsupport/src/writev.c

    r106d8f5 rfd2b1634  
    105105      continue;
    106106
    107     bytes = (*iop->handlers->write_h)( iop, iov[v].iov_base, iov[v].iov_len );
     107    bytes = (*iop->pathinfo.handlers->write_h)(
     108      iop,
     109      iov[v].iov_base,
     110      iov[v].iov_len
     111    );
    108112
    109113    if ( bytes < 0 )
  • cpukit/libfs/src/devfs/devclose.c

    r106d8f5 rfd2b1634  
    2424  rtems_device_name_t           *np;
    2525
    26   np         = (rtems_device_name_t *)iop->file_info;
     26  np         = (rtems_device_name_t *)iop->pathinfo.node_access;
    2727
    2828  args.iop   = iop;
  • cpukit/libfs/src/devfs/devioctl.c

    r106d8f5 rfd2b1634  
    2626  rtems_device_name_t      *np;
    2727
    28   np           = (rtems_device_name_t *)iop->file_info;
     28  np           = (rtems_device_name_t *)iop->pathinfo.node_access;
    2929
    3030  args.iop     = iop;
  • cpukit/libfs/src/devfs/devopen.c

    r106d8f5 rfd2b1634  
    2727  rtems_device_name_t           *np;
    2828
    29   np         = (rtems_device_name_t *)iop->file_info;
     29  np         = (rtems_device_name_t *)iop->pathinfo.node_access;
    3030
    3131  args.iop   = iop;
  • cpukit/libfs/src/devfs/devread.c

    r106d8f5 rfd2b1634  
    2626  rtems_device_name_t     *np;
    2727
    28   np               = (rtems_device_name_t *)iop->file_info;
     28  np               = (rtems_device_name_t *)iop->pathinfo.node_access;
    2929
    3030  args.iop         = iop;
  • cpukit/libfs/src/devfs/devwrite.c

    r106d8f5 rfd2b1634  
    2626  rtems_device_name_t    *np;
    2727
    28   np           = (rtems_device_name_t *)iop->file_info;
     28  np           = (rtems_device_name_t *)iop->pathinfo.node_access;
    2929
    3030  args.iop         = iop;
  • cpukit/libfs/src/dosfs/msdos_dir.c

    r106d8f5 rfd2b1634  
    5252    rtems_status_code  sc = RTEMS_SUCCESSFUL;
    5353    msdos_fs_info_t   *fs_info = iop->pathinfo.mt_entry->fs_info;
    54     fat_file_fd_t     *fat_fd = iop->file_info;
     54    fat_file_fd_t     *fat_fd = iop->pathinfo.node_access;
    5555
    5656    sc = rtems_semaphore_obtain(fs_info->vol_sema, RTEMS_WAIT,
     
    8787    rtems_status_code  sc = RTEMS_SUCCESSFUL;
    8888    msdos_fs_info_t   *fs_info = iop->pathinfo.mt_entry->fs_info;
    89     fat_file_fd_t     *fat_fd = iop->file_info;
     89    fat_file_fd_t     *fat_fd = iop->pathinfo.node_access;
    9090
    9191    sc = rtems_semaphore_obtain(fs_info->vol_sema, RTEMS_WAIT,
     
    202202    rtems_status_code  sc = RTEMS_SUCCESSFUL;
    203203    msdos_fs_info_t   *fs_info = iop->pathinfo.mt_entry->fs_info;
    204     fat_file_fd_t     *fat_fd = iop->file_info;
     204    fat_file_fd_t     *fat_fd = iop->pathinfo.node_access;
    205205    fat_file_fd_t     *tmp_fat_fd = NULL;
    206206    struct dirent      tmp_dirent;
     
    592592    int                rc = RC_OK;
    593593    rtems_status_code  sc = RTEMS_SUCCESSFUL;
    594     fat_file_fd_t     *fat_fd = iop->file_info;
     594    fat_file_fd_t     *fat_fd = iop->pathinfo.node_access;
    595595    msdos_fs_info_t   *fs_info = iop->pathinfo.mt_entry->fs_info;
    596596
  • cpukit/libfs/src/dosfs/msdos_file.c

    r106d8f5 rfd2b1634  
    4848    rtems_status_code  sc = RTEMS_SUCCESSFUL;
    4949    msdos_fs_info_t   *fs_info = iop->pathinfo.mt_entry->fs_info;
    50     fat_file_fd_t     *fat_fd = iop->file_info;
     50    fat_file_fd_t     *fat_fd = iop->pathinfo.node_access;
    5151
    5252    sc = rtems_semaphore_obtain(fs_info->vol_sema, RTEMS_WAIT,
     
    8989    rtems_status_code  sc = RTEMS_SUCCESSFUL;
    9090    msdos_fs_info_t   *fs_info = iop->pathinfo.mt_entry->fs_info;
    91     fat_file_fd_t     *fat_fd = iop->file_info;
     91    fat_file_fd_t     *fat_fd = iop->pathinfo.node_access;
    9292
    9393    sc = rtems_semaphore_obtain(fs_info->vol_sema, RTEMS_WAIT,
     
    149149    rtems_status_code  sc = RTEMS_SUCCESSFUL;
    150150    msdos_fs_info_t   *fs_info = iop->pathinfo.mt_entry->fs_info;
    151     fat_file_fd_t     *fat_fd = iop->file_info;
     151    fat_file_fd_t     *fat_fd = iop->pathinfo.node_access;
    152152
    153153    sc = rtems_semaphore_obtain(fs_info->vol_sema, RTEMS_WAIT,
     
    182182    rtems_status_code  sc = RTEMS_SUCCESSFUL;
    183183    msdos_fs_info_t   *fs_info = iop->pathinfo.mt_entry->fs_info;
    184     fat_file_fd_t     *fat_fd = iop->file_info;
     184    fat_file_fd_t     *fat_fd = iop->pathinfo.node_access;
    185185
    186186    sc = rtems_semaphore_obtain(fs_info->vol_sema, RTEMS_WAIT,
     
    229229    rtems_status_code  sc = RTEMS_SUCCESSFUL;
    230230    msdos_fs_info_t   *fs_info = iop->pathinfo.mt_entry->fs_info;
    231     fat_file_fd_t     *fat_fd = iop->file_info;
     231    fat_file_fd_t     *fat_fd = iop->pathinfo.node_access;
    232232    uint32_t           real_size = 0;
    233233
     
    307307    rtems_status_code  sc = RTEMS_SUCCESSFUL;
    308308    msdos_fs_info_t   *fs_info = iop->pathinfo.mt_entry->fs_info;
    309     fat_file_fd_t     *fat_fd = iop->file_info;
     309    fat_file_fd_t     *fat_fd = iop->pathinfo.node_access;
    310310
    311311    if (length >= fat_fd->fat_file_size)
     
    350350    int                rc = RC_OK;
    351351    rtems_status_code  sc = RTEMS_SUCCESSFUL;
    352     fat_file_fd_t     *fat_fd = iop->file_info;
     352    fat_file_fd_t     *fat_fd = iop->pathinfo.node_access;
    353353    msdos_fs_info_t   *fs_info = iop->pathinfo.mt_entry->fs_info;
    354354
     
    410410    int                rc = RC_OK;
    411411    rtems_status_code  sc = RTEMS_SUCCESSFUL;
    412     fat_file_fd_t     *fat_fd = iop->file_info;
     412    fat_file_fd_t     *fat_fd = iop->pathinfo.node_access;
    413413    msdos_fs_info_t   *fs_info = iop->pathinfo.mt_entry->fs_info;
    414414
  • cpukit/libfs/src/imfs/deviceio.c

    r106d8f5 rfd2b1634  
    4242  IMFS_jnode_t                  *the_jnode;
    4343
    44   the_jnode  = iop->file_info;
     44  the_jnode  = iop->pathinfo.node_access;
    4545
    4646  args.iop   = iop;
     
    7171  IMFS_jnode_t                  *the_jnode;
    7272
    73   the_jnode = iop->file_info;
     73  the_jnode = iop->pathinfo.node_access;
    7474
    7575  args.iop   = iop;
     
    104104  IMFS_jnode_t           *the_jnode;
    105105
    106   the_jnode = iop->file_info;
     106  the_jnode = iop->pathinfo.node_access;
    107107
    108108  args.iop         = iop;
     
    141141  IMFS_jnode_t           *the_jnode;
    142142
    143   the_jnode = iop->file_info;
     143  the_jnode = iop->pathinfo.node_access;
    144144
    145145  args.iop         = iop;
     
    182182  args.buffer  = buffer;
    183183
    184   the_jnode = iop->file_info;
     184  the_jnode = iop->pathinfo.node_access;
    185185
    186186  status = rtems_io_control(
  • cpukit/libfs/src/imfs/imfs_directory.c

    r106d8f5 rfd2b1634  
    4848
    4949  /* Is the node a directory ? */
    50   the_jnode = (IMFS_jnode_t *) iop->file_info;
     50  the_jnode = (IMFS_jnode_t *) iop->pathinfo.node_access;
    5151
    5252  if ( the_jnode->type != IMFS_DIRECTORY )
     
    9191   struct dirent        tmp_dirent;
    9292
    93    the_jnode = (IMFS_jnode_t *)iop->file_info;
     93   the_jnode = (IMFS_jnode_t *)iop->pathinfo.node_access;
    9494   the_chain = &the_jnode->info.directory.Entries;
    9595
  • cpukit/libfs/src/imfs/imfs_fifo.c

    r106d8f5 rfd2b1634  
    2323#define JNODE2PIPE(_jnode)  ( (_jnode)->info.fifo.pipe )
    2424
    25 #define LIBIO2PIPE(_iop)  ( JNODE2PIPE((IMFS_jnode_t *)(_iop)->file_info) )
     25#define LIBIO2PIPE(_iop)  ( JNODE2PIPE((IMFS_jnode_t *)(_iop)->pathinfo.node_access) )
    2626
    2727/* Set errno and return -1 if error, else return _err */
     
    4040)
    4141{
    42   IMFS_jnode_t *jnode = iop->file_info;
     42  IMFS_jnode_t *jnode = iop->pathinfo.node_access;
    4343
    4444  int err = fifo_open(&JNODE2PIPE(jnode), iop);
     
    5050)
    5151{
    52   IMFS_jnode_t *jnode = iop->file_info;
     52  IMFS_jnode_t *jnode = iop->pathinfo.node_access;
    5353
    5454  int err = pipe_release(&JNODE2PIPE(jnode), iop);
     
    6868)
    6969{
    70   IMFS_jnode_t *jnode = iop->file_info;
     70  IMFS_jnode_t *jnode = iop->pathinfo.node_access;
    7171
    7272  int err = pipe_read(JNODE2PIPE(jnode), buffer, count, iop);
     
    8383)
    8484{
    85   IMFS_jnode_t *jnode = iop->file_info;
     85  IMFS_jnode_t *jnode = iop->pathinfo.node_access;
    8686
    8787  int err = pipe_write(JNODE2PIPE(jnode), buffer, count, iop);
  • cpukit/libfs/src/imfs/memfile.c

    r106d8f5 rfd2b1634  
    9999  IMFS_jnode_t  *the_jnode;
    100100
    101   the_jnode = iop->file_info;
     101  the_jnode = iop->pathinfo.node_access;
    102102
    103103  /*
     
    138138  IMFS_jnode_t   *the_jnode;
    139139
    140   the_jnode = iop->file_info;
     140  the_jnode = iop->pathinfo.node_access;
    141141
    142142  if (iop->flags & LIBIO_FLAGS_APPEND)
     
    162162  IMFS_jnode_t   *the_jnode;
    163163
    164   the_jnode = iop->file_info;
     164  the_jnode = iop->pathinfo.node_access;
    165165
    166166  return IMFS_memfile_read( the_jnode, iop->offset, buffer, count );
     
    182182  ssize_t         status;
    183183
    184   the_jnode = iop->file_info;
     184  the_jnode = iop->pathinfo.node_access;
    185185
    186186  status = IMFS_memfile_write( the_jnode, iop->offset, buffer, count );
     
    206206  IMFS_jnode_t   *the_jnode;
    207207
    208   the_jnode = iop->file_info;
     208  the_jnode = iop->pathinfo.node_access;
    209209
    210210  return 0;
     
    225225  IMFS_jnode_t   *the_jnode;
    226226
    227   the_jnode = iop->file_info;
     227  the_jnode = iop->pathinfo.node_access;
    228228
    229229  if (the_jnode->type == IMFS_LINEAR_FILE) {
     
    259259  IMFS_jnode_t   *the_jnode;
    260260
    261   the_jnode = iop->file_info;
     261  the_jnode = iop->pathinfo.node_access;
    262262
    263263  /*
  • cpukit/libfs/src/nfsclient/src/nfs.c

    r106d8f5 rfd2b1634  
    25162516 *****************************************/
    25172517
    2518 
    2519 #if 0
    2520 /* from rtems/libio.h for convenience */
    2521 struct rtems_libio_tt {
    2522                 rtems_driver_name_t              *driver;
    2523                 off_t                             size;      /* size of file */
    2524                 off_t                             offset;    /* current offset into file */
    2525                 uint32_t                          flags;
    2526                 rtems_filesystem_location_info_t  pathinfo;
    2527                 Objects_Id                        sem;
    2528                 uint32_t                          data0;     /* private to "driver" */
    2529                 void                             *data1;     /* ... */
    2530                 void                             *file_info; /* used by file handlers */
    2531                 rtems_filesystem_file_handlers_r *handlers;  /* type specific handlers */
    2532 };
    2533 #endif
    2534 
    25352518/* stateless NFS protocol makes this trivial */
    25362519static int nfs_file_open(
     
    25412524)
    25422525{
    2543         iop->file_info = 0;
    25442526        return 0;
    25452527}
     
    25482530 * remember the last 'read' position, i.e.
    25492531 * the server 'cookie'. We do manage this information
    2550  * attached to the iop->file_info.
     2532 * attached to the pathinfo.node_access_2.
    25512533 */
    25522534static int nfs_dir_open(
     
    25612543
    25622544        /* create a readdirargs object and copy the file handle;
    2563          * attach to the file_info.
     2545         * attach to the pathinfo.node_access_2
    25642546         */
    25652547
    25662548        di = (DirInfo) malloc(sizeof(*di));
    2567         iop->file_info = di;
     2549        iop->pathinfo.node_access_2 = di;
    25682550
    25692551        if ( !di  ) {
     
    25992581)
    26002582{
    2601         free(iop->file_info);
    2602         iop->file_info = 0;
     2583        free(iop->pathinfo.node_access_2);
     2584        iop->pathinfo.node_access_2 = 0;
    26032585        return 0;
    26042586}
     
    26572639)
    26582640{
    2659 DirInfo                 di     = iop->file_info;
     2641DirInfo                 di     = iop->pathinfo.node_access_2;
    26602642RpcUdpServer    server = ((Nfs)iop->pathinfo.mt_entry->fs_info)->server;
    26612643
     
    28152797)
    28162798{
    2817 DirInfo di = iop->file_info;
     2799DirInfo di = iop->pathinfo.node_access_2;
    28182800
    28192801        /* we don't support anything other than
  • cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c

    r106d8f5 rfd2b1634  
    7171    printf("rtems-rfs: file-open: handle:%p\n", file);
    7272 
    73   iop->file_info = file;
     73  iop->pathinfo.node_access = file;
    7474 
    7575  rtems_rfs_rtems_unlock (fs);
     
    8787rtems_rfs_rtems_file_close (rtems_libio_t* iop)
    8888{
    89   rtems_rfs_file_handle* file = iop->file_info;
     89  rtems_rfs_file_handle* file = iop->pathinfo.node_access;
    9090  rtems_rfs_file_system* fs = rtems_rfs_file_fs (file);
    9191  int                    rc;
     
    117117                           size_t         count)
    118118{
    119   rtems_rfs_file_handle* file = iop->file_info;
     119  rtems_rfs_file_handle* file = iop->pathinfo.node_access;
    120120  rtems_rfs_pos          pos;
    121121  uint8_t*               data = buffer;
     
    182182                            size_t         count)
    183183{
    184   rtems_rfs_file_handle* file = iop->file_info;
     184  rtems_rfs_file_handle* file = iop->pathinfo.node_access;
    185185  rtems_rfs_pos          pos;
    186186  const uint8_t*         data = buffer;
     
    272272                            int            whence)
    273273{
    274   rtems_rfs_file_handle* file = iop->file_info;
     274  rtems_rfs_file_handle* file = iop->pathinfo.node_access;
    275275  rtems_rfs_pos          pos;
    276276  int                    rc;
     
    306306                                rtems_off64_t  length)
    307307{
    308   rtems_rfs_file_handle* file = iop->file_info;
     308  rtems_rfs_file_handle* file = iop->pathinfo.node_access;
    309309  int                    rc;
    310310
  • cpukit/libfs/src/rfs/rtems-rfs-rtems.h

    r106d8f5 rfd2b1634  
    195195 */
    196196#define rtems_rfs_rtems_get_iop_ino(_iop) \
    197   ((intptr_t)(_iop)->file_info)
     197  ((intptr_t)(_iop)->pathinfo.node_access)
    198198
    199199/**
  • cpukit/libnetworking/lib/ftpfs.c

    r106d8f5 rfd2b1634  
    959959    : "RETR ";
    960960  uint32_t client_address = 0;
    961   char *location = iop->file_info;
     961  char *location = iop->pathinfo.node_access;
    962962
    963963  /* Invalidate data handle */
     
    983983       * option settings.
    984984       */
    985       iop->handlers = &rtems_ftpfs_root_handlers;
     985      iop->pathinfo.handlers = &rtems_ftpfs_root_handlers;
    986986
    987987      return 0;
     
    11671167   * The caller of this routine has striped off the mount prefix from the path.
    11681168   * We need to store this path here or otherwise we would have to do this job
    1169    * again.  The path is used in rtems_ftpfs_open() via iop->file_info.
     1169   * again.  The path is used in rtems_ftpfs_open() via iop->pathinfo.node_access.
    11701170   */
    11711171  char *pathname_dup = malloc(pathnamelen + 1);
Note: See TracChangeset for help on using the changeset viewer.