Merge commit 'c104f1fa1ecf4ee0fc06e31b1f77630b2551be81' into stable/for-linus-3.4

[~andy/linux] / fs / squashfs / squashfs_fs.h

diff --git a/fs/squashfs/squashfs_fs.h b/fs/squashfs/squashfs_fs.h
index e8e14645de9a8107f6aa573e7392e7f95fae53bb..9e2349d07cb1c98334fd19ffbeb5441361f65edf 100644 (file)
--- a/fs/squashfs/squashfs_fs.h
+++ b/fs/squashfs/squashfs_fs.h
@@ -30,11 +30,6 @@
 
 /* size of metadata (inode and directory) blocks */
 #define SQUASHFS_METADATA_SIZE         8192
-#define SQUASHFS_METADATA_LOG          13
-
-/* default size of data blocks */
-#define SQUASHFS_FILE_SIZE             131072
-#define SQUASHFS_FILE_LOG              17
 
 /* default size of block device I/O */
 #ifdef CONFIG_SQUASHFS_4K_DEVBLK_SIZE
@@ -46,12 +41,12 @@
 #define SQUASHFS_FILE_MAX_SIZE         1048576
 #define SQUASHFS_FILE_MAX_LOG          20
 
-/* Max number of uids and gids */
-#define SQUASHFS_IDS                   65536
-
 /* Max length of filename (not 255) */
 #define SQUASHFS_NAME_LEN              256
 
+/* Max value for directory header count*/
+#define SQUASHFS_DIR_COUNT             256
+
 #define SQUASHFS_INVALID_FRAG          (0xffffffffU)
 #define SQUASHFS_INVALID_XATTR         (0xffffffffU)
 #define SQUASHFS_INVALID_BLK           (-1LL)
@@ -142,9 +137,6 @@
 #define SQUASHFS_MKINODE(A, B)         ((long long)(((long long) (A)\
                                        << 16) + (B)))
 
-/* Translate between VFS mode and squashfs mode */
-#define SQUASHFS_MODE(A)               ((A) & 0xfff)
-
 /* fragment and fragment table defines */
 #define SQUASHFS_FRAGMENT_BYTES(A)     \
                                ((A) * sizeof(struct squashfs_fragment_entry))
@@ -215,11 +207,6 @@
 /* cached data constants for filesystem */
 #define SQUASHFS_CACHED_BLKS           8
 
-#define SQUASHFS_MAX_FILE_SIZE_LOG     64
-
-#define SQUASHFS_MAX_FILE_SIZE         (1LL << \
-                                       (SQUASHFS_MAX_FILE_SIZE_LOG - 2))
-
 /* meta index cache */
 #define SQUASHFS_META_INDEXES  (SQUASHFS_METADATA_SIZE / sizeof(unsigned int))
 #define SQUASHFS_META_ENTRIES  127