v2.4.13.1 -> v2.4.13.2

  - Alan Cox: more merging
  - Alexander Viro: block device module race fixes
  - Richard Henderson: mmap for 32-bit alpha personality
  - Jeff Garzik: 8139 and natsemi update

5 files changed, 18 insertions, 2 deletions

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 103a8176c462..33f3bb92af40 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -793,6 +793,7 @@ struct block_device_operations {
 	int (*ioctl) (struct inode *, struct file *, unsigned, unsigned long);
 	int (*check_media_change) (kdev_t);
 	int (*revalidate) (kdev_t);
+	struct module *owner;
 };
 
 /*
diff --git a/include/linux/iso_fs.h b/include/linux/iso_fs.h
index 7f9014588c9b..55be4e5903fd 100644
--- a/include/linux/iso_fs.h
+++ b/include/linux/iso_fs.h
@@ -136,7 +136,7 @@ struct iso_path_table{
 	char extent[4];		/* 731 */
 	char  parent[2];	/* 721 */
 	char name[0];
-};
+} __attribute__((packed));
 
 /* high sierra is identical to iso, except that the date is only 6 bytes, and
    there is an extra reserved byte after the flags */
@@ -153,7 +153,7 @@ struct iso_directory_record {
 	char volume_sequence_number	[ISODCL (29, 32)]; /* 723 */
 	unsigned char name_len		[ISODCL (33, 33)]; /* 711 */
 	char name			[0];
-};
+} __attribute__((packed));
 
 #define ISOFS_BLOCK_BITS 11
 #define ISOFS_BLOCK_SIZE 2048
@@ -207,6 +207,8 @@ static inline int isonum_733(char *p)
 }
 extern int iso_date(char *, int);
 
+struct inode;		/* To make gcc happy */
+
 extern int parse_rock_ridge_inode(struct iso_directory_record *, struct inode *);
 extern int get_rock_ridge_filename(struct iso_directory_record *, char *, struct inode *);
 extern int isofs_name_translate(struct iso_directory_record *, char *, struct inode *);
@@ -218,6 +220,7 @@ int get_acorn_filename(struct iso_directory_record *, char *, struct inode *);
 
 extern struct dentry *isofs_lookup(struct inode *, struct dentry *);
 extern struct buffer_head *isofs_bread(struct inode *, unsigned int, unsigned int);
+extern int isofs_get_blocks(struct inode *, long, struct buffer_head **, unsigned long);
 
 extern struct inode_operations isofs_dir_inode_operations;
 extern struct file_operations isofs_dir_operations;
diff --git a/include/linux/iso_fs_i.h b/include/linux/iso_fs_i.h
index 02f17e071a2d..4759a5488788 100644
--- a/include/linux/iso_fs_i.h
+++ b/include/linux/iso_fs_i.h
@@ -1,12 +1,19 @@
 #ifndef _ISO_FS_I
 #define _ISO_FS_I
 
+enum isofs_file_format {
+	isofs_file_normal = 0,
+	isofs_file_sparse = 1,
+	isofs_file_compressed = 2,
+};
+	
 /*
  * iso fs inode data in memory
  */
 struct iso_inode_info {
 	unsigned int i_first_extent;
 	unsigned char i_file_format;
+	unsigned char i_format_parm[3];
 	unsigned long i_next_section_ino;
 	off_t i_section_size;
 };
diff --git a/include/linux/iso_fs_sb.h b/include/linux/iso_fs_sb.h
index 1f1100bbbc57..043b97b55b8d 100644
--- a/include/linux/iso_fs_sb.h
+++ b/include/linux/iso_fs_sb.h
@@ -23,6 +23,8 @@ struct isofs_sb_info {
 	unsigned char s_unhide;
 	unsigned char s_nosuid;
 	unsigned char s_nodev;
+	unsigned char s_nocompress;
+
 	mode_t s_mode;
 	gid_t s_gid;
 	uid_t s_uid;
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 145a20ad94cf..d3d966ef6c21 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -285,6 +285,8 @@
 #define PCI_DEVICE_ID_NS_87415		0x0002
 #define PCI_DEVICE_ID_NS_87560_LIO	0x000e
 #define PCI_DEVICE_ID_NS_87560_USB	0x0012
+#define PCI_DEVICE_ID_NS_83815		0x0020
+#define PCI_DEVICE_ID_NS_83820		0x0022
 #define PCI_DEVICE_ID_NS_87410		0xd001
 
 #define PCI_VENDOR_ID_TSENG		0x100c
@@ -1386,6 +1388,7 @@
 
 #define PCI_VENDOR_ID_NETGEAR		0x1385
 #define PCI_DEVICE_ID_NETGEAR_GA620	0x620a
+#define PCI_DEVICE_ID_NETGEAR_GA622	0x622a
 
 #define PCI_VENDOR_ID_APPLICOM		0x1389
 #define PCI_DEVICE_ID_APPLICOM_PCIGENERIC 0x0001