Sorry folks,
it seems I had inadvertently left out patches to 3 headers from the patch I
submitted.
Unfortunately, this broke 2.3.35-2 so I include the missing part here <:-o
Sorry. Won't happen again, I promise!
Merry Christmas everybody
Anders Larsen
--------------3598F780CD05F08A0FEDD7D3
Content-Type: text/plain; charset=us-ascii;
name="qnx4_patch-2.3.35-2"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="qnx4_patch-2.3.35-2"
diff -u --recursive v2.3.34/linux/include/linux/qnx4_fs_i.h linux/include/linux/qnx4_fs_i.h
--- v2.3.34/linux/include/linux/qnx4_fs_i.h Mon Aug 31 22:01:35 1998
+++ linux/include/linux/qnx4_fs_i.h Tue Dec 21 22:11:36 1999
@@ -4,9 +4,9 @@
* Function : qnx4 inode definitions
* Version : 1.0
* Last modified : 25-05-1998
- *
+ *
* History : 23-03-1998 created
- *
+ *
*/
#ifndef _QNX4_FS_I
#define _QNX4_FS_I
@@ -14,24 +14,24 @@
#include <linux/qnxtypes.h>
/*
- * qnx4 fs inode entry
+ * qnx4 fs inode entry
*/
struct qnx4_inode_info {
char i_reserved[16]; /* 16 */
- off_t i_size; /* 4 */
- _xtnt_t i_first_xtnt; /* 8 */
- long i_xblk; /* 4 */
+ qnx4_off_t i_size; /* 4 */
+ qnx4_xtnt_t i_first_xtnt; /* 8 */
+ unsigned long i_xblk; /* 4 */
time_t i_ftime; /* 4 */
time_t i_mtime; /* 4 */
time_t i_atime; /* 4 */
time_t i_ctime; /* 4 */
- _nxtnt_t i_num_xtnts; /* 2 */
+ qnx4_nxtnt_t i_num_xtnts; /* 2 */
mode_t i_mode; /* 2 */
- muid_t i_uid; /* 2 */
- mgid_t i_gid; /* 2 */
- nlink_t i_nlink; /* 2 */
+ qnx4_muid_t i_uid; /* 2 */
+ qnx4_mgid_t i_gid; /* 2 */
+ qnx4_nlink_t i_nlink; /* 2 */
char i_zero[4]; /* 4 */
- _ftype_t i_type; /* 1 */
+ qnx4_ftype_t i_type; /* 1 */
unsigned char i_status; /* 1 */
};
diff -u --recursive v2.3.34/linux/include/linux/qnxtypes.h linux/include/linux/qnxtypes.h
--- v2.3.34/linux/include/linux/qnxtypes.h Mon Aug 31 22:01:35 1998
+++ linux/include/linux/qnxtypes.h Mon Dec 20 14:26:26 1999
@@ -4,25 +4,25 @@
* Function : standard qnx types
* Version : 1.0
* Last modified : 22-03-1998
- *
+ *
* History : 22-03-1998 created
- *
+ *
*/
#ifndef _QNX4TYPES_H
#define _QNX4TYPES_H
-typedef unsigned short _nxtnt_t;
-typedef unsigned char _ftype_t;
+typedef unsigned short qnx4_nxtnt_t;
+typedef unsigned char qnx4_ftype_t;
typedef struct {
- long xtnt_blk;
+ unsigned long xtnt_blk;
long xtnt_size;
-} _xtnt_t;
+} qnx4_xtnt_t;
-typedef unsigned short muid_t;
-typedef unsigned short mgid_t;
-typedef unsigned long qnx_off_t;
-typedef unsigned short qnx_nlink_t;
+typedef unsigned short qnx4_muid_t;
+typedef unsigned short qnx4_mgid_t;
+typedef unsigned long qnx4_off_t;
+typedef unsigned short qnx4_nlink_t;
#endif
--------------3598F780CD05F08A0FEDD7D3--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/