Branch HEAD

b=12234
i=adilger
i=johann
correct the cast of 'index' in obd_device_list_seq_show()

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 3b33686..7332269 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -274,6 +274,14 @@ Bugzilla   : 12418
 Description: evictions taking too long
 Details    : allow llrd to evict clients directly on OSTs
 
 Description: evictions taking too long
 Details    : allow llrd to evict clients directly on OSTs
 

+Severity   : normal
+Frequency  : only on ppc
+Bugzilla   : 12234
+Description: /proc/fs/lustre/devices broken on ppc
+Details    : The patch as applied to 1.6.2 doesn't look correct for all arches.
+            We should make sure the type of 'index' is loff_t and then cast 
+            explicitly as needed below.  Do not assign an explicitly cast 
+            loff_t to an int.

 --------------------------------------------------------------------------------
 
 2007-08-10         Cluster File Systems, Inc. <info@clusterfs.com>
 --------------------------------------------------------------------------------
 
 2007-08-10         Cluster File Systems, Inc. <info@clusterfs.com>

diff --git a/lustre/obdclass/linux/linux-module.c b/lustre/obdclass/linux/linux-module.c
index 18d6271..6f69082 100644 (file)
--- a/lustre/obdclass/linux/linux-module.c
+++ b/lustre/obdclass/linux/linux-module.c
@@ -346,8 +346,8 @@ static void *obd_device_list_seq_next(struct seq_file *p, void *v, loff_t *pos)
 
 static int obd_device_list_seq_show(struct seq_file *p, void *v)
 {
 
 static int obd_device_list_seq_show(struct seq_file *p, void *v)
 {

-        int index = *(loff_t *)v;
-        struct obd_device *obd = class_num2obd(index);
+        loff_t index = *(loff_t *)v;
+        struct obd_device *obd = class_num2obd((int)index);

         char *status;
 
         if (obd == NULL)
         char *status;
 
         if (obd == NULL)