diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-26 08:57:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-26 08:57:20 -0700 |
| commit | 63a6440326e4cd01d6a663069208a0e68e9b833f (patch) | |
| tree | ad3fa7a941d3eb59c4f584486cabc60247df9bdf /fs/squashfs/squashfs_fs_i.h | |
| parent | f45471cbda9df24f990154a963741c9bd4c0b0aa (diff) | |
| parent | 899f4530334da9292556e1f8f5791468e0136ff1 (diff) | |
| download | linux-63a6440326e4cd01d6a663069208a0e68e9b833f.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus:
squashfs: update documentation to include description of xattr layout
squashfs: fix name reading in squashfs_xattr_get
squashfs: constify xattr handlers
squashfs: xattr fix sparse warnings
squashfs: xattr_lookup sparse fix
squashfs: add xattr support configure option
squashfs: add new extended inode types
squashfs: add support for xattr reading
squashfs: add xattr id support
Diffstat (limited to 'fs/squashfs/squashfs_fs_i.h')
| -rw-r--r-- | fs/squashfs/squashfs_fs_i.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/squashfs/squashfs_fs_i.h b/fs/squashfs/squashfs_fs_i.h index fbfca30c0c68..d3e3a37f28a1 100644 --- a/fs/squashfs/squashfs_fs_i.h +++ b/fs/squashfs/squashfs_fs_i.h @@ -26,6 +26,9 @@ struct squashfs_inode_info { u64 start; int offset; + u64 xattr; + unsigned int xattr_size; + int xattr_count; union { struct { u64 fragment_block; |