LU-8066 obd: Add debugfs root

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

diff --git a/lustre/obdclass/lustre_handles.c b/lustre/obdclass/lustre_handles.c
index f79404b..dcdc4fa 100644 (file)
--- a/lustre/obdclass/lustre_handles.c
+++ b/lustre/obdclass/lustre_handles.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -98,7 +94,7 @@ void class_handle_hash(struct portals_handle *h,
        h->h_in = 1;
        spin_unlock(&bucket->lock);
 
-       CDEBUG(D_INFO, "added object %p with handle "LPX64" to hash\n",
+       CDEBUG(D_INFO, "added object %p with handle %#llx to hash\n",
               h, h->h_cookie);
        EXIT;
 }
@@ -107,12 +103,12 @@ EXPORT_SYMBOL(class_handle_hash);
 static void class_handle_unhash_nolock(struct portals_handle *h)
 {
        if (list_empty(&h->h_link)) {
-                CERROR("removing an already-removed handle ("LPX64")\n",
+               CERROR("removing an already-removed handle (%#llx)\n",
                        h->h_cookie);
                 return;
         }
 
-        CDEBUG(D_INFO, "removing object %p with handle "LPX64" from hash\n",
+       CDEBUG(D_INFO, "removing object %p with handle %#llx from hash\n",
                h, h->h_cookie);
 
        spin_lock(&h->h_lock);
@@ -202,7 +198,7 @@ EXPORT_SYMBOL(class_handle_free_cb);
 int class_handle_init(void)
 {
         struct handle_bucket *bucket;
-        struct timeval tv;
+       struct timespec64 ts;
         int seed[2];
 
         LASSERT(handle_hash == NULL);
@@ -220,8 +216,8 @@ int class_handle_init(void)
 
        /** bug 21430: add randomness to the initial base */
        cfs_get_random_bytes(seed, sizeof(seed));
-       do_gettimeofday(&tv);
-       cfs_srand(tv.tv_sec ^ seed[0], tv.tv_usec ^ seed[1]);
+       ktime_get_ts64(&ts);
+       cfs_srand(ts.tv_sec ^ seed[0], ts.tv_nsec ^ seed[1]);
 
         cfs_get_random_bytes(&handle_base, sizeof(handle_base));
         LASSERT(handle_base != 0ULL);
@@ -239,7 +235,7 @@ static int cleanup_all_handles(void)
 
                spin_lock(&handle_hash[i].lock);
                list_for_each_entry_rcu(h, &(handle_hash[i].head), h_link) {
-                       CERROR("force clean handle "LPX64" addr %p ops %p\n",
+                       CERROR("force clean handle %#llx addr %p ops %p\n",
                               h->h_cookie, h, h->h_ops);
 
                        class_handle_unhash_nolock(h);