mode_t whack-a-mole...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/drivers/staging/lustre/lustre/include/lprocfs_status.h b/drivers/staging/lustre/lustre/include/lprocfs_status.h
index e770d0260576a95af516511d90fdc62c94170c0b..55f182205d7850618bb8d9fd1a0f18cff0e7f6ee 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lprocfs_status.h
+++ b/drivers/staging/lustre/lustre/include/lprocfs_status.h
@@ -53,7 +53,7 @@ struct lprocfs_vars {
        /**
         * /proc file mode.
         */
-       mode_t                  proc_mode;
+       umode_t                 proc_mode;
 };
 
 struct lprocfs_static_vars {
@@ -600,11 +600,11 @@ extern int lprocfs_obd_setup(struct obd_device *obd, struct lprocfs_vars *list);
 extern int lprocfs_obd_cleanup(struct obd_device *obd);
 
 extern int lprocfs_seq_create(proc_dir_entry_t *parent, const char *name,
-                             mode_t mode,
+                             umode_t mode,
                              const struct file_operations *seq_fops,
                              void *data);
 extern int lprocfs_obd_seq_create(struct obd_device *dev, const char *name,
-                                 mode_t mode,
+                                 umode_t mode,
                                  const struct file_operations *seq_fops,
                                  void *data);
 

diff --git a/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c b/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
index 3b157f89c3008912d9c94248b0c030485c1aea1f..f7af3d6a4efcbf52f1cba02c6ad717c6efdbb879 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
+++ b/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
@@ -73,7 +73,7 @@ proc_dir_entry_t *lprocfs_add_simple(struct proc_dir_entry *root,
                                     struct file_operations *fops)
 {
        proc_dir_entry_t *proc;
-       mode_t mode = 0;
+       umode_t mode = 0;
 
        if (root == NULL || name == NULL || fops == NULL)
                return ERR_PTR(-EINVAL);
@@ -140,7 +140,7 @@ int lprocfs_add_vars(struct proc_dir_entry *root, struct lprocfs_vars *list,
 
        while (list->name != NULL) {
                struct proc_dir_entry *proc;
-               mode_t mode = 0;
+               umode_t mode = 0;
 
                if (list->proc_mode != 0000) {
                        mode = list->proc_mode;
@@ -1899,7 +1899,7 @@ EXPORT_SYMBOL(lprocfs_find_named_value);
 
 int lprocfs_seq_create(proc_dir_entry_t *parent,
                       const char *name,
-                      mode_t mode,
+                      umode_t mode,
                       const struct file_operations *seq_fops,
                       void *data)
 {
@@ -1919,7 +1919,7 @@ EXPORT_SYMBOL(lprocfs_seq_create);
 
 int lprocfs_obd_seq_create(struct obd_device *dev,
                           const char *name,
-                          mode_t mode,
+                          umode_t mode,
                           const struct file_operations *seq_fops,
                           void *data)
 {