X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_identity.c;h=e8ec709c39092fbee075f4edaaeca52a04adbfc1;hp=85d782b5655cd717069b34a4e3ef20c22106d02b;hb=d1b47781a3acd449473884f42e71ece2a7789670;hpb=d10200a80770f0029d1d665af954187b9ad883df diff --git a/lustre/mdt/mdt_identity.c b/lustre/mdt/mdt_identity.c index 85d782b..e8ec709 100644 --- a/lustre/mdt/mdt_identity.c +++ b/lustre/mdt/mdt_identity.c @@ -102,7 +102,7 @@ static int mdt_identity_do_upcall(struct upcall_cache *cache, [1] = "PATH=/sbin:/usr/sbin", [2] = NULL }; - struct timeval start, end; + ktime_t start, end; int rc; ENTRY; @@ -120,22 +120,20 @@ static int mdt_identity_do_upcall(struct upcall_cache *cache, argv[0] = cache->uc_upcall; snprintf(keystr, sizeof(keystr), "%llu", entry->ue_key); - do_gettimeofday(&start); + start = ktime_get(); rc = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_EXEC); - do_gettimeofday(&end); + end = ktime_get(); if (rc < 0) { - CERROR("%s: error invoking upcall %s %s %s: rc %d; " - "check /proc/fs/lustre/mdt/%s/identity_upcall, " - "time %ldus\n", - cache->uc_name, argv[0], argv[1], argv[2], rc, - cache->uc_name, cfs_timeval_sub(&end, &start, NULL)); - } else { - CDEBUG(D_HA, "%s: invoked upcall %s %s %s, time %ldus\n", - cache->uc_name, argv[0], argv[1], argv[2], - cfs_timeval_sub(&end, &start, NULL)); - rc = 0; - } - EXIT; + CERROR("%s: error invoking upcall %s %s %s: rc %d; check /proc/fs/lustre/mdt/%s/identity_upcall, time %ldus\n", + cache->uc_name, argv[0], argv[1], argv[2], rc, + cache->uc_name, (long)ktime_us_delta(end, start)); + } else { + CDEBUG(D_HA, "%s: invoked upcall %s %s %s, time %ldus\n", + cache->uc_name, argv[0], argv[1], argv[2], + (long)ktime_us_delta(end, start)); + rc = 0; + } + EXIT; out: up_read(&cache->uc_upcall_rwsem); return rc;