diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2012-06-28 21:34:28 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-06-28 21:34:28 -0700 |
| commit | 53f267c1e4c6c51819a355e163b4b6c3214a852e (patch) | |
| tree | 376ef236f9de744df4f56e8d13e82f869973a10f /core/include/fs.h | |
| parent | 9794e01d73e5cc2621f85d91b0577e33df9920fb (diff) | |
| parent | 15cbfdfd390402057d237664ac087140608bf80b (diff) | |
| download | syslinux-53f267c1e4c6c51819a355e163b4b6c3214a852e.tar.gz | |
Merge remote-tracking branch 'origin/master' into elflink
Conflicts:
core/fs/lib/searchconfig.c
Get the reverse pathname lookup fixes from the master branch.
Diffstat (limited to 'core/include/fs.h')
| -rw-r--r-- | core/include/fs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/include/fs.h b/core/include/fs.h index 08ac7385..26b99c2d 100644 --- a/core/include/fs.h +++ b/core/include/fs.h @@ -98,6 +98,7 @@ struct extent { struct inode { struct fs_info *fs; /* The filesystem this inode is associated with */ struct inode *parent; /* Parent directory, if any */ + const char *name; /* Name, valid for generic path search only */ int refcnt; int mode; /* FILE , DIR or SYMLINK */ uint32_t size; |