diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-11-27 18:38:18 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-11-27 20:03:08 +0000 |
| commit | f3cac0e6203c532efc97a6ae8955fc4b79a2b373 (patch) | |
| tree | 36d5b019aa7b4f76c7374ea2fe0a9a775b7883c2 /core/include/fs.h | |
| parent | 9f284ea6ad3215ab609b733424121fbfe7ab7edb (diff) | |
| parent | 75cf6cebf0ffdf75f359528b01fc9039062e7b34 (diff) | |
| download | syslinux-f3cac0e6203c532efc97a6ae8955fc4b79a2b373.tar.gz | |
Merge branch 'xfs-for-hpa' of git://zytor.com/users/pcacjr/syslinux into merge/elflink/xfs
Pull XFS filesystem driver from Paulo Alcantara,
* 'xfs-for-hpa' of git://zytor.com/users/pcacjr/syslinux: (60 commits)
xfs: Fix the way we check di_mode of an inode
xfs: Cleanup previous commit
xfs: Add xfs_readlink()
xfs: Cleanup and remove some trailing whitespaces
xfs: Add XFS_DINODE_FMT_BTREE support in xfs_next_extent()
xfs: Cleanup and remove some trailing whitespaces
xfs: Rework xfs_dir2_get_right_blk()
xfs: cleanup unused structure
xfs: Remove some trailing whitespaces
xfs: Add full B+tree search support in xfs_dir2_node_find_entry()
xfs: Add xfs_fmt_btree_find_entry()
xfs: Fix memory leak in xfs_dir2_node_find_entry() function
xfs: Cleanup xfs_readdir_dir2_leaf() function
xfs: Implement xfs_readdir_dir2_node() function
EXTLINUX: Add sanity check for XFS filesystems
xfs: Add xfs_fmt_local_readdir() function
xfs: Add xfs_fmt_local_find_entry() function
xfs: Move readdir functions to another source file
xfs: Remove trailing whitespace in xfs_dir2_isleaf() function
xfs: Move dir2 functions to another source file
...
Conflicts:
extlinux/main.c
Diffstat (limited to 'core/include/fs.h')
| -rw-r--r-- | core/include/fs.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/include/fs.h b/core/include/fs.h index 26b99c2d..fa5bbc2c 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 */ |