diff options
author | Phillip Lougher <phillip@lougher.demon.co.uk> | 2010-05-16 23:06:56 -0400 |
---|---|---|
committer | Phillip Lougher <phillip@lougher.demon.co.uk> | 2010-05-17 14:54:06 -0400 |
commit | 67f66cc6c728de183d9d43c243cb163c1ebd8e04 (patch) | |
tree | bd175ed5f66594ad76d099461560c3fe8a01181c /fs/squashfs/super.c | |
parent | f41d207cbedecd82f797adcce83890aa96f1c9e9 (diff) |
squashfs: add new extended inode types
Add new extended inode types that store the xattr_id field.
Also add the necessary code changes to make xattrs visibile.
Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
Diffstat (limited to 'fs/squashfs/super.c')
-rw-r--r-- | fs/squashfs/super.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/squashfs/super.c b/fs/squashfs/super.c index c4dfc393fa52..b6425ac1c2ae 100644 --- a/fs/squashfs/super.c +++ b/fs/squashfs/super.c | |||
@@ -140,13 +140,6 @@ static int squashfs_fill_super(struct super_block *sb, void *data, int silent) | |||
140 | if (msblk->decompressor == NULL) | 140 | if (msblk->decompressor == NULL) |
141 | goto failed_mount; | 141 | goto failed_mount; |
142 | 142 | ||
143 | /* | ||
144 | * Check if there's xattrs in the filesystem. These are not | ||
145 | * supported in this version, so warn that they will be ignored. | ||
146 | */ | ||
147 | if (le64_to_cpu(sblk->xattr_id_table_start) != SQUASHFS_INVALID_BLK) | ||
148 | ERROR("Xattrs in filesystem, these will be ignored\n"); | ||
149 | |||
150 | /* Check the filesystem does not extend beyond the end of the | 143 | /* Check the filesystem does not extend beyond the end of the |
151 | block device */ | 144 | block device */ |
152 | msblk->bytes_used = le64_to_cpu(sblk->bytes_used); | 145 | msblk->bytes_used = le64_to_cpu(sblk->bytes_used); |
@@ -268,6 +261,7 @@ allocate_lookup_table: | |||
268 | sb->s_export_op = &squashfs_export_ops; | 261 | sb->s_export_op = &squashfs_export_ops; |
269 | 262 | ||
270 | allocate_xattr_table: | 263 | allocate_xattr_table: |
264 | sb->s_xattr = squashfs_xattr_handlers; | ||
271 | xattr_id_table_start = le64_to_cpu(sblk->xattr_id_table_start); | 265 | xattr_id_table_start = le64_to_cpu(sblk->xattr_id_table_start); |
272 | if (xattr_id_table_start == SQUASHFS_INVALID_BLK) | 266 | if (xattr_id_table_start == SQUASHFS_INVALID_BLK) |
273 | goto allocate_root; | 267 | goto allocate_root; |