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/namei.c | |
| parent | f45471cbda9df24f990154a963741c9bd4c0b0aa (diff) | |
| parent | 899f4530334da9292556e1f8f5791468e0136ff1 (diff) | |
| download | blackbird-op-linux-63a6440326e4cd01d6a663069208a0e68e9b833f.tar.gz blackbird-op-linux-63a6440326e4cd01d6a663069208a0e68e9b833f.zip | |
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/namei.c')
| -rw-r--r-- | fs/squashfs/namei.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/squashfs/namei.c b/fs/squashfs/namei.c index 5266bd8ad932..7a9464d08cf6 100644 --- a/fs/squashfs/namei.c +++ b/fs/squashfs/namei.c @@ -57,11 +57,13 @@ #include <linux/slab.h> #include <linux/string.h> #include <linux/dcache.h> +#include <linux/xattr.h> #include "squashfs_fs.h" #include "squashfs_fs_sb.h" #include "squashfs_fs_i.h" #include "squashfs.h" +#include "xattr.h" /* * Lookup name in the directory index, returning the location of the metadata @@ -237,5 +239,7 @@ failed: const struct inode_operations squashfs_dir_inode_ops = { - .lookup = squashfs_lookup + .lookup = squashfs_lookup, + .getxattr = generic_getxattr, + .listxattr = squashfs_listxattr }; |
