Merge to Fedora kernel-2.6.18-1.2257_FC5 patched with stable patch-2.6.18.5-vs2.0...

[linux-2.6.git] / fs / squashfs / squashfs.h

diff --git a/fs/squashfs/squashfs.h b/fs/squashfs/squashfs.h
index dcbef0d..8ce7730 100644 (file)
--- a/fs/squashfs/squashfs.h
+++ b/fs/squashfs/squashfs.h
@@ -31,7 +31,7 @@
 #define TRACE(s, args...)      {}
 #endif
 
-#define ERROR(s, args...)      printk(KERN_ERR "SQUASHFS error: "s, ## args)
+#define ERROR(s, args...)      printk(KERN_NOTICE "SQUASHFS error: "s, ## args)
 
 #define SERROR(s, args...)     do { \
                                if (!silent) \
@@ -49,7 +49,7 @@ static inline struct squashfs_inode_info *SQUASHFS_I(struct inode *inode)
 #define SQSH_EXTERN
 extern unsigned int squashfs_read_data(struct super_block *s, char *buffer,
                                long long index, unsigned int length,
-                               long long *next_index);
+                               long long *next_index, int srclength);
 extern int squashfs_get_cached_block(struct super_block *s, char *buffer,
                                long long block, unsigned int offset,
                                int length, long long *next_block,
@@ -59,6 +59,7 @@ extern void release_cached_fragment(struct squashfs_sb_info *msblk, struct
 extern struct squashfs_fragment_cache *get_cached_fragment(struct super_block
                                        *s, long long start_block,
                                        int length);
+extern struct inode *squashfs_iget(struct super_block *s, squashfs_inode_t inode, unsigned int inode_number);
 extern struct address_space_operations squashfs_symlink_aops;
 extern struct address_space_operations squashfs_aops;
 extern struct address_space_operations squashfs_aops_4K;