diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-12-07 11:33:45 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-12-07 11:33:45 +0000 |
| commit | 10f6cf6eef0a7da7dad1933efdbfb101155792d0 (patch) | |
| tree | d8ee3bfc6e55e739e0f135cd6d945955c670dd46 /core/include/fs.h | |
| parent | 35928ee37da523e5f992cc462a4a4193d0bfaa4c (diff) | |
| parent | ddb10ce99c327888ade4d2ba3e4c50ad12aaa059 (diff) | |
| download | syslinux-10f6cf6eef0a7da7dad1933efdbfb101155792d0.tar.gz | |
Merge tag 'syslinux-5.00' into firmwaresyslinux-6.00-pre3
Conflicts:
Makefile
com32/elflink/ldlinux/Makefile
com32/lib/sys/module/elf_module.c
core/cleanup.c
core/comboot.inc
core/conio.c
core/fs/fs.c
core/init.c
core/mem/free.c
core/mem/malloc.c
core/timer.inc
diag/geodsp/Makefile
extlinux/main.c
mk/embedded.mk
modules/Makefile
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'core/include/fs.h')
| -rw-r--r-- | core/include/fs.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/include/fs.h b/core/include/fs.h index 4d6c18be..554dc97f 100644 --- a/core/include/fs.h +++ b/core/include/fs.h @@ -101,9 +101,9 @@ struct inode { const char *name; /* Name, valid for generic path search only */ int refcnt; int mode; /* FILE , DIR or SYMLINK */ - uint32_t size; - uint32_t blocks; /* How many blocks the file take */ - uint32_t ino; /* Inode number */ + uint64_t size; + uint64_t blocks; /* How many blocks the file take */ + uint64_t ino; /* Inode number */ uint32_t atime; /* Access time */ uint32_t mtime; /* Modify time */ uint32_t ctime; /* Create time */ @@ -182,7 +182,6 @@ static inline struct file *handle_to_file(uint16_t handle) return handle ? &files[handle-1] : NULL; } -#define PATH_DEFAULT "/boot/syslinux/:/boot/" extern char *PATH; /* fs.c */ |