LU-1346 libcfs: replace libcfs wrappers with kernel API

[fs/lustre-release.git] / lustre / llite / lproc_llite.c

diff --git a/lustre/llite/lproc_llite.c b/lustre/llite/lproc_llite.c
index 4a96147..c10ecb3 100644 (file)
--- a/lustre/llite/lproc_llite.c
+++ b/lustre/llite/lproc_llite.c
@@ -234,17 +234,17 @@ static int ll_rd_site_stats(char *page, char **start, off_t off,
 static int ll_rd_max_readahead_mb(char *page, char **start, off_t off,
                                    int count, int *eof, void *data)
 {
-        struct super_block *sb = data;
-        struct ll_sb_info *sbi = ll_s2sbi(sb);
-        long pages_number;
-        int mult;
+       struct super_block *sb = data;
+       struct ll_sb_info *sbi = ll_s2sbi(sb);
+       long pages_number;
+       int mult;
 
-        cfs_spin_lock(&sbi->ll_lock);
-        pages_number = sbi->ll_ra_info.ra_max_pages;
-        cfs_spin_unlock(&sbi->ll_lock);
+       spin_lock(&sbi->ll_lock);
+       pages_number = sbi->ll_ra_info.ra_max_pages;
+       spin_unlock(&sbi->ll_lock);
 
-        mult = 1 << (20 - PAGE_CACHE_SHIFT);
-        return lprocfs_read_frac_helper(page, count, pages_number, mult);
+       mult = 1 << (20 - PAGE_CACHE_SHIFT);
+       return lprocfs_read_frac_helper(page, count, pages_number, mult);
 }
 
 static int ll_wr_max_readahead_mb(struct file *file, const char *buffer,
@@ -265,27 +265,27 @@ static int ll_wr_max_readahead_mb(struct file *file, const char *buffer,
                 return -ERANGE;
         }
 
-        cfs_spin_lock(&sbi->ll_lock);
-        sbi->ll_ra_info.ra_max_pages = pages_number;
-        cfs_spin_unlock(&sbi->ll_lock);
+       spin_lock(&sbi->ll_lock);
+       sbi->ll_ra_info.ra_max_pages = pages_number;
+       spin_unlock(&sbi->ll_lock);
 
-        return count;
+       return count;
 }
 
 static int ll_rd_max_readahead_per_file_mb(char *page, char **start, off_t off,
                                            int count, int *eof, void *data)
 {
-        struct super_block *sb = data;
-        struct ll_sb_info *sbi = ll_s2sbi(sb);
-        long pages_number;
-        int mult;
+       struct super_block *sb = data;
+       struct ll_sb_info *sbi = ll_s2sbi(sb);
+       long pages_number;
+       int mult;
 
-        cfs_spin_lock(&sbi->ll_lock);
-        pages_number = sbi->ll_ra_info.ra_max_pages_per_file;
-        cfs_spin_unlock(&sbi->ll_lock);
+       spin_lock(&sbi->ll_lock);
+       pages_number = sbi->ll_ra_info.ra_max_pages_per_file;
+       spin_unlock(&sbi->ll_lock);
 
-        mult = 1 << (20 - CFS_PAGE_SHIFT);
-        return lprocfs_read_frac_helper(page, count, pages_number, mult);
+       mult = 1 << (20 - CFS_PAGE_SHIFT);
+       return lprocfs_read_frac_helper(page, count, pages_number, mult);
 }
 
 static int ll_wr_max_readahead_per_file_mb(struct file *file, const char *buffer,
@@ -308,27 +308,27 @@ static int ll_wr_max_readahead_per_file_mb(struct file *file, const char *buffer
                 return -ERANGE;
         }
 
-        cfs_spin_lock(&sbi->ll_lock);
-        sbi->ll_ra_info.ra_max_pages_per_file = pages_number;
-        cfs_spin_unlock(&sbi->ll_lock);
+       spin_lock(&sbi->ll_lock);
+       sbi->ll_ra_info.ra_max_pages_per_file = pages_number;
+       spin_unlock(&sbi->ll_lock);
 
-        return count;
+       return count;
 }
 
 static int ll_rd_max_read_ahead_whole_mb(char *page, char **start, off_t off,
                                          int count, int *eof, void *data)
 {
-        struct super_block *sb = data;
-        struct ll_sb_info *sbi = ll_s2sbi(sb);
-        long pages_number;
-        int mult;
+       struct super_block *sb = data;
+       struct ll_sb_info *sbi = ll_s2sbi(sb);
+       long pages_number;
+       int mult;
 
-        cfs_spin_lock(&sbi->ll_lock);
-        pages_number = sbi->ll_ra_info.ra_max_read_ahead_whole_pages;
-        cfs_spin_unlock(&sbi->ll_lock);
+       spin_lock(&sbi->ll_lock);
+       pages_number = sbi->ll_ra_info.ra_max_read_ahead_whole_pages;
+       spin_unlock(&sbi->ll_lock);
 
-        mult = 1 << (20 - CFS_PAGE_SHIFT);
-        return lprocfs_read_frac_helper(page, count, pages_number, mult);
+       mult = 1 << (20 - CFS_PAGE_SHIFT);
+       return lprocfs_read_frac_helper(page, count, pages_number, mult);
 }
 
 static int ll_wr_max_read_ahead_whole_mb(struct file *file, const char *buffer,
@@ -353,11 +353,11 @@ static int ll_wr_max_read_ahead_whole_mb(struct file *file, const char *buffer,
                 return -ERANGE;
         }
 
-        cfs_spin_lock(&sbi->ll_lock);
-        sbi->ll_ra_info.ra_max_read_ahead_whole_pages = pages_number;
-        cfs_spin_unlock(&sbi->ll_lock);
+       spin_lock(&sbi->ll_lock);
+       sbi->ll_ra_info.ra_max_read_ahead_whole_pages = pages_number;
+       spin_unlock(&sbi->ll_lock);
 
-        return count;
+       return count;
 }
 
 static int ll_rd_max_cached_mb(char *page, char **start, off_t off,
@@ -413,9 +413,9 @@ static int ll_wr_max_cached_mb(struct file *file, const char *buffer,
        if (sbi->ll_dt_exp == NULL)
                RETURN(-ENODEV);
 
-       cfs_spin_lock(&sbi->ll_lock);
+       spin_lock(&sbi->ll_lock);
        diff = pages_number - cache->ccc_lru_max;
-       cfs_spin_unlock(&sbi->ll_lock);
+       spin_unlock(&sbi->ll_lock);
 
        /* easy - add more LRU slots. */
        if (diff >= 0) {
@@ -459,9 +459,9 @@ static int ll_wr_max_cached_mb(struct file *file, const char *buffer,
 
 out:
        if (rc >= 0) {
-               cfs_spin_lock(&sbi->ll_lock);
+               spin_lock(&sbi->ll_lock);
                cache->ccc_lru_max = pages_number;
-               cfs_spin_unlock(&sbi->ll_lock);
+               spin_unlock(&sbi->ll_lock);
                rc = count;
        } else {
                cfs_atomic_add(nrpages, &cache->ccc_lru_left);
@@ -1052,16 +1052,16 @@ static int ll_rw_extents_stats_pp_seq_show(struct seq_file *seq, void *v)
         seq_printf(seq, "%13s   %14s %4s %4s  | %14s %4s %4s\n",
                    "extents", "calls", "%", "cum%",
                    "calls", "%", "cum%");
-        cfs_spin_lock(&sbi->ll_pp_extent_lock);
-        for(k = 0; k < LL_PROCESS_HIST_MAX; k++) {
-                if(io_extents->pp_extents[k].pid != 0) {
-                        seq_printf(seq, "\nPID: %d\n",
-                                   io_extents->pp_extents[k].pid);
-                        ll_display_extents_info(io_extents, seq, k);
-                }
-        }
-        cfs_spin_unlock(&sbi->ll_pp_extent_lock);
-        return 0;
+       spin_lock(&sbi->ll_pp_extent_lock);
+       for (k = 0; k < LL_PROCESS_HIST_MAX; k++) {
+               if (io_extents->pp_extents[k].pid != 0) {
+                       seq_printf(seq, "\nPID: %d\n",
+                                  io_extents->pp_extents[k].pid);
+                       ll_display_extents_info(io_extents, seq, k);
+               }
+       }
+       spin_unlock(&sbi->ll_pp_extent_lock);
+       return 0;
 }
 
 static ssize_t ll_rw_extents_stats_pp_seq_write(struct file *file,
@@ -1084,14 +1084,14 @@ static ssize_t ll_rw_extents_stats_pp_seq_write(struct file *file,
         else
                 sbi->ll_rw_stats_on = 1;
 
-        cfs_spin_lock(&sbi->ll_pp_extent_lock);
-        for(i = 0; i < LL_PROCESS_HIST_MAX; i++) {
-                io_extents->pp_extents[i].pid = 0;
-                lprocfs_oh_clear(&io_extents->pp_extents[i].pp_r_hist);
-                lprocfs_oh_clear(&io_extents->pp_extents[i].pp_w_hist);
-        }
-        cfs_spin_unlock(&sbi->ll_pp_extent_lock);
-        return len;
+       spin_lock(&sbi->ll_pp_extent_lock);
+       for (i = 0; i < LL_PROCESS_HIST_MAX; i++) {
+               io_extents->pp_extents[i].pid = 0;
+               lprocfs_oh_clear(&io_extents->pp_extents[i].pp_r_hist);
+               lprocfs_oh_clear(&io_extents->pp_extents[i].pp_w_hist);
+       }
+       spin_unlock(&sbi->ll_pp_extent_lock);
+       return len;
 }
 
 LPROC_SEQ_FOPS(ll_rw_extents_stats_pp);
@@ -1117,11 +1117,11 @@ static int ll_rw_extents_stats_seq_show(struct seq_file *seq, void *v)
         seq_printf(seq, "%13s   %14s %4s %4s  | %14s %4s %4s\n",
                    "extents", "calls", "%", "cum%",
                    "calls", "%", "cum%");
-        cfs_spin_lock(&sbi->ll_lock);
-        ll_display_extents_info(io_extents, seq, LL_PROCESS_HIST_MAX);
-        cfs_spin_unlock(&sbi->ll_lock);
+       spin_lock(&sbi->ll_lock);
+       ll_display_extents_info(io_extents, seq, LL_PROCESS_HIST_MAX);
+       spin_unlock(&sbi->ll_lock);
 
-        return 0;
+       return 0;
 }
 
 static ssize_t ll_rw_extents_stats_seq_write(struct file *file, const char *buf,
@@ -1142,16 +1142,15 @@ static ssize_t ll_rw_extents_stats_seq_write(struct file *file, const char *buf,
                 sbi->ll_rw_stats_on = 0;
         else
                 sbi->ll_rw_stats_on = 1;
-        cfs_spin_lock(&sbi->ll_pp_extent_lock);
-        for(i = 0; i <= LL_PROCESS_HIST_MAX; i++)
-        {
-                io_extents->pp_extents[i].pid = 0;
-                lprocfs_oh_clear(&io_extents->pp_extents[i].pp_r_hist);
-                lprocfs_oh_clear(&io_extents->pp_extents[i].pp_w_hist);
-        }
-        cfs_spin_unlock(&sbi->ll_pp_extent_lock);
+       spin_lock(&sbi->ll_pp_extent_lock);
+       for (i = 0; i <= LL_PROCESS_HIST_MAX; i++) {
+               io_extents->pp_extents[i].pid = 0;
+               lprocfs_oh_clear(&io_extents->pp_extents[i].pp_r_hist);
+               lprocfs_oh_clear(&io_extents->pp_extents[i].pp_w_hist);
+       }
+       spin_unlock(&sbi->ll_pp_extent_lock);
 
-        return len;
+       return len;
 }
 
 LPROC_SEQ_FOPS(ll_rw_extents_stats);
@@ -1172,7 +1171,7 @@ void ll_rw_stats_tally(struct ll_sb_info *sbi, pid_t pid,
         process = sbi->ll_rw_process_info;
         offset = sbi->ll_rw_offset_info;
 
-        cfs_spin_lock(&sbi->ll_pp_extent_lock);
+       spin_lock(&sbi->ll_pp_extent_lock);
         /* Extent statistics */
         for(i = 0; i < LL_PROCESS_HIST_MAX; i++) {
                 if(io_extents->pp_extents[i].pid == pid) {
@@ -1200,9 +1199,9 @@ void ll_rw_stats_tally(struct ll_sb_info *sbi, pid_t pid,
                 io_extents->pp_extents[cur].pp_w_hist.oh_buckets[i]++;
                 io_extents->pp_extents[LL_PROCESS_HIST_MAX].pp_w_hist.oh_buckets[i]++;
         }
-        cfs_spin_unlock(&sbi->ll_pp_extent_lock);
+       spin_unlock(&sbi->ll_pp_extent_lock);
 
-        cfs_spin_lock(&sbi->ll_process_lock);
+       spin_lock(&sbi->ll_process_lock);
         /* Offset statistics */
         for (i = 0; i < LL_PROCESS_HIST_MAX; i++) {
                 if (process[i].rw_pid == pid) {
@@ -1213,7 +1212,7 @@ void ll_rw_stats_tally(struct ll_sb_info *sbi, pid_t pid,
                                 process[i].rw_largest_extent = count;
                                 process[i].rw_offset = 0;
                                 process[i].rw_last_file = file;
-                                cfs_spin_unlock(&sbi->ll_process_lock);
+                               spin_unlock(&sbi->ll_process_lock);
                                 return;
                         }
                         if (process[i].rw_last_file_pos != pos) {
@@ -1243,7 +1242,7 @@ void ll_rw_stats_tally(struct ll_sb_info *sbi, pid_t pid,
                         if(process[i].rw_largest_extent < count)
                                 process[i].rw_largest_extent = count;
                         process[i].rw_last_file_pos = pos + count;
-                        cfs_spin_unlock(&sbi->ll_process_lock);
+                       spin_unlock(&sbi->ll_process_lock);
                         return;
                 }
         }
@@ -1256,7 +1255,7 @@ void ll_rw_stats_tally(struct ll_sb_info *sbi, pid_t pid,
         process[*process_count].rw_largest_extent = count;
         process[*process_count].rw_offset = 0;
         process[*process_count].rw_last_file = file;
-        cfs_spin_unlock(&sbi->ll_process_lock);
+       spin_unlock(&sbi->ll_process_lock);
 }
 
 static int ll_rw_offset_stats_seq_show(struct seq_file *seq, void *v)
@@ -1275,7 +1274,7 @@ static int ll_rw_offset_stats_seq_show(struct seq_file *seq, void *v)
                                 "then 0 or \"[D/d]isabled\" to deactivate\n");
                 return 0;
         }
-        cfs_spin_lock(&sbi->ll_process_lock);
+       spin_lock(&sbi->ll_process_lock);
 
         seq_printf(seq, "snapshot_time:         %lu.%lu (secs.usecs)\n",
                    now.tv_sec, now.tv_usec);
@@ -1306,9 +1305,9 @@ static int ll_rw_offset_stats_seq_show(struct seq_file *seq, void *v)
                                    (unsigned long)process[i].rw_largest_extent,
                                    process[i].rw_offset);
         }
-        cfs_spin_unlock(&sbi->ll_process_lock);
+       spin_unlock(&sbi->ll_process_lock);
 
-        return 0;
+       return 0;
 }
 
 static ssize_t ll_rw_offset_stats_seq_write(struct file *file, const char *buf,
@@ -1331,16 +1330,16 @@ static ssize_t ll_rw_offset_stats_seq_write(struct file *file, const char *buf,
         else
                 sbi->ll_rw_stats_on = 1;
 
-        cfs_spin_lock(&sbi->ll_process_lock);
-        sbi->ll_offset_process_count = 0;
-        sbi->ll_rw_offset_entry_count = 0;
-        memset(process_info, 0, sizeof(struct ll_rw_process_info) *
-               LL_PROCESS_HIST_MAX);
-        memset(offset_info, 0, sizeof(struct ll_rw_process_info) *
-               LL_OFFSET_HIST_MAX);
-        cfs_spin_unlock(&sbi->ll_process_lock);
+       spin_lock(&sbi->ll_process_lock);
+       sbi->ll_offset_process_count = 0;
+       sbi->ll_rw_offset_entry_count = 0;
+       memset(process_info, 0, sizeof(struct ll_rw_process_info) *
+              LL_PROCESS_HIST_MAX);
+       memset(offset_info, 0, sizeof(struct ll_rw_process_info) *
+              LL_OFFSET_HIST_MAX);
+       spin_unlock(&sbi->ll_process_lock);
 
-        return len;
+       return len;
 }
 
 LPROC_SEQ_FOPS(ll_rw_offset_stats);