diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 04:27:35 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 04:27:35 +0400 |
| commit | bc9bc72e2f9bb07384c00604d1a40d0b5f62be6c (patch) | |
| tree | 99fc71a5d5889445fb39279d7ff3f0d66c1cca0d /fs/squashfs/xattr.h | |
| parent | 968d803c98410910fbadca031b6a873d4bc12dd5 (diff) | |
| parent | d7f2ff6718efa155fd92e481a5960496d084c63f (diff) | |
| download | linux-bc9bc72e2f9bb07384c00604d1a40d0b5f62be6c.tar.xz | |
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 email address
Squashfs: add extra sanity checks at mount time
Squashfs: add sanity checks to fragment reading at mount time
Squashfs: add sanity checks to lookup table reading at mount time
Squashfs: add sanity checks to id reading at mount time
Squashfs: add sanity checks to xattr reading at mount time
Squashfs: reverse order of filesystem table reading
Squashfs: move table allocation into squashfs_read_table()
Diffstat (limited to 'fs/squashfs/xattr.h')
| -rw-r--r-- | fs/squashfs/xattr.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/squashfs/xattr.h b/fs/squashfs/xattr.h index b634efce4bde..c83f5d9ec125 100644 --- a/fs/squashfs/xattr.h +++ b/fs/squashfs/xattr.h @@ -2,7 +2,7 @@ * Squashfs - a compressed read only filesystem for Linux * * Copyright (c) 2010 - * Phillip Lougher <phillip@lougher.demon.co.uk> + * Phillip Lougher <phillip@squashfs.org.uk> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -31,6 +31,7 @@ static inline __le64 *squashfs_read_xattr_id_table(struct super_block *sb, u64 start, u64 *xattr_table_start, int *xattr_ids) { ERROR("Xattrs in filesystem, these will be ignored\n"); + *xattr_table_start = start; return ERR_PTR(-ENOTSUPP); } |