LU-3227 tests: fix for acl test

[fs/lustre-release.git] / lustre / obdclass / lprocfs_status.c

diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c
index 9527bb2..938cb7a 100644 (file)
--- a/lustre/obdclass/lprocfs_status.c
+++ b/lustre/obdclass/lprocfs_status.c
@@ -307,7 +307,7 @@ int lprocfs_evict_client_release(struct inode *inode, struct file *f)
 #define BUFLEN (UUID_MAX + 5)
 
 #ifndef HAVE_ONLY_PROCFS_SEQ
-int lprocfs_wr_evict_client(struct file *file, const char *buffer,
+int lprocfs_wr_evict_client(struct file *file, const char __user *buffer,
                            unsigned long count, void *data)
 {
        struct obd_device *obd = data;
@@ -1936,7 +1936,6 @@ lprocfs_seq_obd_setup(struct obd_device *obd)
        int rc = 0;
 
        LASSERT(obd != NULL);
-       LASSERT(obd->obd_vars != NULL);
        LASSERT(obd->obd_magic == OBD_DEVICE_MAGIC);
        LASSERT(obd->obd_type->typ_procroot != NULL);
 
@@ -3281,7 +3280,7 @@ void lprocfs_oh_tally_log2(struct obd_histogram *oh, unsigned int value)
        unsigned int val = 0;
 
        if (likely(value != 0))
-               val = min_t(unsigned int, __fls(value - 1), OBD_HIST_MAX);
+               val = min(fls(value - 1), OBD_HIST_MAX);
 
        lprocfs_oh_tally(oh, val);
 }
@@ -3329,7 +3328,7 @@ int lprocfs_recovery_status_seq_show(struct seq_file *m, void *data)
 
        LASSERT(obd != NULL);
 
-       seq_printf(m, "status: \n");
+       seq_printf(m, "status: ");
        if (obd->obd_max_recoverable_clients == 0) {
                seq_printf(m, "INACTIVE\n");
                goto out;