LU-5648 ofd: In destroy orphan case always let MDS know last id

[fs/lustre-release.git] / libcfs / libcfs / tracefile.c

diff --git a/libcfs/libcfs/tracefile.c b/libcfs/libcfs/tracefile.c
index e24f66b..2114063 100644 (file)
--- a/libcfs/libcfs/tracefile.c
+++ b/libcfs/libcfs/tracefile.c
@@ -55,7 +55,7 @@ static struct tracefiled_ctl trace_tctl;
 struct mutex cfs_trace_thread_mutex;
 static int thread_running = 0;
 
-atomic_t cfs_tage_allocated = ATOMIC_INIT(0);
+static atomic_t cfs_tage_allocated = ATOMIC_INIT(0);
 
 static void put_pages_on_tcd_daemon_list(struct page_collection *pc,
                                        struct cfs_trace_cpu_data *tcd);
@@ -66,7 +66,7 @@ cfs_tage_from_list(struct list_head *list)
        return list_entry(list, struct cfs_trace_page, linkage);
 }
 
-static struct cfs_trace_page *cfs_tage_alloc(int gfp)
+static struct cfs_trace_page *cfs_tage_alloc(gfp_t gfp)
 {
        struct page            *page;
        struct cfs_trace_page *tage;
@@ -114,7 +114,7 @@ static void cfs_tage_to_tail(struct cfs_trace_page *tage,
        list_move_tail(&tage->linkage, queue);
 }
 
-int cfs_trace_refill_stock(struct cfs_trace_cpu_data *tcd, int gfp,
+int cfs_trace_refill_stock(struct cfs_trace_cpu_data *tcd, gfp_t gfp,
                           struct list_head *stock)
 {
        int i;
@@ -270,7 +270,6 @@ int libcfs_debug_vmsg2(struct libcfs_debug_msg_data *msgdata,
         int                        needed = 85; /* average message length */
         int                        max_nob;
         va_list                    ap;
-        int                        depth;
         int                        i;
         int                        remain;
         int                        mask = msgdata->msg_mask;
@@ -299,8 +298,7 @@ int libcfs_debug_vmsg2(struct libcfs_debug_msg_data *msgdata,
                 goto console;
         }
 
-        depth = __current_nesting_level();
-        known_size = strlen(file) + 1 + depth;
+       known_size = strlen(file) + 1;
         if (msgdata->msg_fn)
                 known_size += strlen(msgdata->msg_fn) + 1;
 
@@ -371,12 +369,6 @@ int libcfs_debug_vmsg2(struct libcfs_debug_msg_data *msgdata,
                 debug_buf += sizeof(header);
         }
 
-        /* indent message according to the nesting level */
-        while (depth-- > 0) {
-                *(debug_buf++) = '.';
-                ++ tage->used;
-        }
-
         strcpy(debug_buf, file);
         tage->used += strlen(file) + 1;
         debug_buf += strlen(file) + 1;
@@ -527,7 +519,7 @@ static void collect_pages_on_all_cpus(struct page_collection *pc)
        struct cfs_trace_cpu_data *tcd;
        int i, cpu;
 
-       cfs_for_each_possible_cpu(cpu) {
+       for_each_possible_cpu(cpu) {
                cfs_tcd_for_each_type_lock(tcd, i, cpu) {
                        list_splice_init(&tcd->tcd_pages, &pc->pc_pages);
                        tcd->tcd_cur_pages = 0;
@@ -558,7 +550,7 @@ static void put_pages_back_on_all_cpus(struct page_collection *pc)
         struct cfs_trace_page *tmp;
         int i, cpu;
 
-        cfs_for_each_possible_cpu(cpu) {
+       for_each_possible_cpu(cpu) {
                 cfs_tcd_for_each_type_lock(tcd, i, cpu) {
                         cur_head = tcd->tcd_pages.next;
 
@@ -622,7 +614,7 @@ static void put_pages_on_daemon_list(struct page_collection *pc)
         struct cfs_trace_cpu_data *tcd;
         int i, cpu;
 
-        cfs_for_each_possible_cpu(cpu) {
+       for_each_possible_cpu(cpu) {
                 cfs_tcd_for_each_type_lock(tcd, i, cpu)
                         put_pages_on_tcd_daemon_list(pc, tcd);
         }
@@ -713,7 +705,7 @@ int cfs_tracefile_dump_all_pages(char *filename)
                 cfs_tage_free(tage);
         }
        MMSPACE_CLOSE;
-       rc = filp_fsync(filp);
+       rc = ll_vfs_fsync_range(filp, 0, LLONG_MAX, 1);
        if (rc)
                printk(KERN_ERR "sync returns %d\n", rc);
 close:
@@ -741,15 +733,14 @@ void cfs_trace_flush_pages(void)
 }
 
 int cfs_trace_copyin_string(char *knl_buffer, int knl_buffer_nob,
-                            const char *usr_buffer, int usr_buffer_nob)
+                           const char __user *usr_buffer, int usr_buffer_nob)
 {
         int    nob;
 
         if (usr_buffer_nob > knl_buffer_nob)
                 return -EOVERFLOW;
 
-       if (copy_from_user((void *)knl_buffer,
-                           (void *)usr_buffer, usr_buffer_nob))
+       if (copy_from_user(knl_buffer, usr_buffer, usr_buffer_nob))
                 return -EFAULT;
 
         nob = strnlen(knl_buffer, usr_buffer_nob);
@@ -768,7 +759,7 @@ int cfs_trace_copyin_string(char *knl_buffer, int knl_buffer_nob,
 }
 EXPORT_SYMBOL(cfs_trace_copyin_string);
 
-int cfs_trace_copyout_string(char *usr_buffer, int usr_buffer_nob,
+int cfs_trace_copyout_string(char __user *usr_buffer, int usr_buffer_nob,
                              const char *knl_buffer, char *append)
 {
         /* NB if 'append' != NULL, it's a single character to append to the
@@ -810,7 +801,7 @@ void cfs_trace_free_string_buffer(char *str, int nob)
        kfree(str);
 }
 
-int cfs_trace_dump_debug_buffer_usrstr(void *usr_str, int usr_str_nob)
+int cfs_trace_dump_debug_buffer_usrstr(void __user *usr_str, int usr_str_nob)
 {
         char         *str;
         int           rc;
@@ -824,12 +815,10 @@ int cfs_trace_dump_debug_buffer_usrstr(void *usr_str, int usr_str_nob)
         if (rc != 0)
                 goto out;
 
-#if !defined(__WINNT__)
         if (str[0] != '/') {
                 rc = -EINVAL;
                 goto out;
         }
-#endif
         rc = cfs_tracefile_dump_all_pages(str);
 out:
         cfs_trace_free_string_buffer(str, usr_str_nob + 1);
@@ -857,10 +846,8 @@ int cfs_trace_daemon_command(char *str)
 
         } else if (strlen(str) >= sizeof(cfs_tracefile)) {
                 rc = -ENAMETOOLONG;
-#ifndef __WINNT__
         } else if (str[0] != '/') {
                 rc = -EINVAL;
-#endif
         } else {
                strcpy(cfs_tracefile, str);
 
@@ -876,7 +863,7 @@ int cfs_trace_daemon_command(char *str)
         return rc;
 }
 
-int cfs_trace_daemon_command_usrstr(void *usr_str, int usr_str_nob)
+int cfs_trace_daemon_command_usrstr(void __user *usr_str, int usr_str_nob)
 {
         char *str;
         int   rc;
@@ -929,7 +916,7 @@ int cfs_trace_set_debug_mb(int mb)
        return 0;
 }
 
-int cfs_trace_set_debug_mb_usrstr(void *usr_str, int usr_str_nob)
+int cfs_trace_set_debug_mb_usrstr(void __user *usr_str, int usr_str_nob)
 {
         char     str[32];
         int      rc;
@@ -1022,6 +1009,7 @@ static int tracefiled(void *arg)
                                       "but wrote %d\n", tage->used, rc);
                                put_pages_back(&pc);
                                __LASSERT(list_empty(&pc.pc_pages));
+                               break;
                        }
                 }
                MMSPACE_CLOSE;
@@ -1147,7 +1135,7 @@ static void trace_cleanup_on_all_cpus(void)
        struct cfs_trace_page *tmp;
        int i, cpu;
 
-       cfs_for_each_possible_cpu(cpu) {
+       for_each_possible_cpu(cpu) {
                cfs_tcd_for_each_type_lock(tcd, i, cpu) {
                        tcd->tcd_shutting_down = 1;