[PATCH] devfs patch for 2.5.8

- Updated fs/devfs/util.c to fix shift warning on 64 bit machines
  Thanks to Anton Blanchard <anton@samba.org>

- Updated README from master HTML file

diff --git a/Documentation/filesystems/devfs/ChangeLog b/Documentation/filesystems/devfs/ChangeLog
index 435a612320c627637ddd384a7ecb3b2d9f292d31..4c4ddd9d2758cd9844c1bcb6bc7e1d86757dbc84 100644 (file)
--- a/Documentation/filesystems/devfs/ChangeLog
+++ b/Documentation/filesystems/devfs/ChangeLog
@@ -1905,3 +1905,10 @@ Changes for patch v209
 - Fixed bitfield data type for <devfs_*alloc_devnum>
 
 - Made major bitfield type and initialiser 64 bit safe
+===============================================================================
+Changes for patch v210
+
+- Updated fs/devfs/util.c to fix shift warning on 64 bit machines
+  Thanks to Anton Blanchard <anton@samba.org>
+
+- Updated README from master HTML file

diff --git a/Documentation/filesystems/devfs/README b/Documentation/filesystems/devfs/README
index 062d2b2aea5f08ca6b4da537efffe39dc2e001ed..3c9d29861e281b3c5d194642fc099da9243d0837 100644 (file)
--- a/Documentation/filesystems/devfs/README
+++ b/Documentation/filesystems/devfs/README
@@ -3,7 +3,7 @@ Devfs (Device File System) FAQ
 
 Linux Devfs (Device File System) FAQ
 Richard Gooch
-4-APR-2002
+7-APR-2002
 
 
 Document languages:
@@ -1591,6 +1591,20 @@ mount -t none devfs /dev
 
 
 
+Mount by volume LABEL=<label> doesn't work with
+devfs
+
+Most probably you are not mounting devfs onto /dev. What
+happens is that if your kernel config has CONFIG_DEVFS_FS=y
+then the contents of /proc/partitions will have the devfs
+names (such as scsi/host0/bus0/target0/lun0/part1). The
+contents of /proc/partitions are used by mount(8) when
+mounting by volume label. If devfs is not mounted on /dev,
+then mount(8) will fail to find devices. The solution is to
+make sure that devfs is mounted on /dev. See above for how to
+do that.
+
+
 
 
 

diff --git a/fs/devfs/util.c b/fs/devfs/util.c
index 8b265e011e1ca961d8349fc8bddfbdc543e23d9c..f9c955f6b61c3ed5c49388a4f45547da44369ef1 100644 (file)
--- a/fs/devfs/util.c
+++ b/fs/devfs/util.c
@@ -54,6 +54,8 @@
     20020326   Richard Gooch <rgooch@atnf.csiro.au>
                Fixed bitfield data type for <devfs_*alloc_devnum>.
                Made major bitfield type and initialiser 64 bit safe.
+    20020413   Richard Gooch <rgooch@atnf.csiro.au>
+               Fixed shift warning on 64 bit machines.
 */
 #include <linux/module.h>
 #include <linux/init.h>
@@ -136,7 +138,7 @@ struct major_list
 #if BITS_PER_LONG == 32
 #  define INITIALISER64(low,high) (low), (high)
 #else
-#  define INITIALISER64(low,high) ( (high) << 32 | (low) )
+#  define INITIALISER64(low,high) ( (unsigned long) (high) << 32 | (low) )
 #endif
 
 /*  Block majors already assigned: