diff --git a/ChangeLog b/ChangeLog
index fbe0768e3c..bc25c68f44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2003-09-04  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/unix/sysv/linux/pathconf.c (__statfs_filesize_max):
+	Report correct value for vxfs.
+	* sysdeps/unix/sysv/linux/linux_fsinfo.h: Dfeine VXFS_SUPER_MAGIC.
+
 	* gmon/gmon.c: Use only not-cancelable syscalls to write profiling
 	data.
 
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 647a443392..54593f81e7 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-04  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/i386/not-cancel.h (fcntl_not_cancel): Define.
+
 2003-09-04  Jakub Jelinek  <jakub@redhat.com>
 
 	* unwind-forcedunwind.c: Move to...
diff --git a/sysdeps/unix/sysv/linux/linux_fsinfo.h b/sysdeps/unix/sysv/linux/linux_fsinfo.h
index d108753085..41dbbde55c 100644
--- a/sysdeps/unix/sysv/linux/linux_fsinfo.h
+++ b/sysdeps/unix/sysv/linux/linux_fsinfo.h
@@ -126,6 +126,9 @@
 /* Constants that identify the `xfs' filesystem.  */
 #define XFS_SUPER_MAGIC		0x58465342
 
+/* Constants that identify the `vxfs' filesystem.  */
+#define VXFS_SUPER_MAGIC	0xa501fcf5
+
 /* Maximum link counts.  */
 #define COH_LINK_MAX		10000
 #define EXT2_LINK_MAX		32000
diff --git a/sysdeps/unix/sysv/linux/pathconf.c b/sysdeps/unix/sysv/linux/pathconf.c
index d4159753a6..e12a08434a 100644
--- a/sysdeps/unix/sysv/linux/pathconf.c
+++ b/sysdeps/unix/sysv/linux/pathconf.c
@@ -130,6 +130,7 @@ __statfs_filesize_max (int result, const struct statfs *fsbuf)
     case NTFS_SUPER_MAGIC:
     case UDF_SUPER_MAGIC:
     case JFS_SUPER_MAGIC:
+    case VXFS_SUPER_MAGIC:
       return 64;
 
     case MSDOS_SUPER_MAGIC: