Changeset 1c0263c in rtems


Ignore:
Timestamp:
May 15, 2012, 8:38:23 AM (7 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Children:
89e4dcf
Parents:
a7d1992c (diff), 0a95800a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'upstream'

Location:
cpukit
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • cpukit/libcsupport/include/rtems/libio.h

    ra7d1992c r1c0263c  
    14401440  bool                                   mounted;
    14411441  bool                                   writeable;
    1442   rtems_filesystem_limits_and_options_t  pathconf_limits_and_options;
     1442  const rtems_filesystem_limits_and_options_t *pathconf_limits_and_options;
    14431443
    14441444  /*
  • cpukit/libcsupport/src/fpathconf.c

    ra7d1992c r1c0263c  
    2727  long                                    return_value;
    2828  rtems_libio_t                          *iop;
    29   rtems_filesystem_limits_and_options_t *the_limits;
     29  const rtems_filesystem_limits_and_options_t *the_limits;
    3030
    3131  rtems_libio_check_fd(fd);
     
    3737   */
    3838
    39   the_limits = &iop->pathinfo.mt_entry->pathconf_limits_and_options;
     39  the_limits = iop->pathinfo.mt_entry->pathconf_limits_and_options;
    4040
    4141  switch ( name ) {
  • cpukit/libcsupport/src/mount.c

    ra7d1992c r1c0263c  
    8484    mt_entry->mounted = true;
    8585    mt_entry->mt_fs_root = mt_fs_root;
    86     mt_entry->pathconf_limits_and_options = rtems_filesystem_default_pathconf;
     86    mt_entry->pathconf_limits_and_options = &rtems_filesystem_default_pathconf;
    8787
    8888    mt_fs_root->location.mt_entry = mt_entry;
  • cpukit/libfs/src/imfs/imfs_initsupp.c

    ra7d1992c r1c0263c  
    8181      mt_entry->fs_info = fs_info;
    8282      mt_entry->ops = op_table;
    83       mt_entry->pathconf_limits_and_options = IMFS_LIMITS_AND_OPTIONS;
     83      mt_entry->pathconf_limits_and_options = &IMFS_LIMITS_AND_OPTIONS;
    8484      mt_entry->mt_fs_root->location.node_access = root_node;
    8585      IMFS_Set_handlers( &mt_entry->mt_fs_root->location );
  • cpukit/libfs/src/nfsclient/src/nfs.c

    ra7d1992c r1c0263c  
    623623/* These are (except for MAXNAMLEN/MAXPATHLEN) copied from IMFS */
    624624
    625 static rtems_filesystem_limits_and_options_t
     625static const rtems_filesystem_limits_and_options_t
    626626nfs_limits_and_options = {
    627627   5,                           /* link_max */
     
    17561756        mt_entry->ops = &nfs_fs_ops;
    17571757        mt_entry->mt_fs_root->location.handlers  = &nfs_dir_file_handlers;
    1758         mt_entry->pathconf_limits_and_options = nfs_limits_and_options;
     1758        mt_entry->pathconf_limits_and_options = &nfs_limits_and_options;
    17591759
    17601760        LOCK(nfsGlob.llock);
  • cpukit/libnetworking/lib/ftpfs.c

    ra7d1992c r1c0263c  
    5252#include <rtems.h>
    5353#include <rtems/ftpfs.h>
    54 #include <rtems/imfs.h>
    5554#include <rtems/libio_.h>
    5655#include <rtems/rtems_bsdnet.h>
     
    12001199  e->mt_fs_root->location.node_access = NULL;
    12011200
    1202   /* Just use the limits from IMFS */
    1203   e->pathconf_limits_and_options = IMFS_LIMITS_AND_OPTIONS;
    1204 
    12051201  return 0;
    12061202}
Note: See TracChangeset for help on using the changeset viewer.