LU-1735 ptlrpc: only set jobid if not already set

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

diff --git a/lustre/obdclass/class_obd.c b/lustre/obdclass/class_obd.c
index e2a0521..6689678 100644 (file)
--- a/lustre/obdclass/class_obd.c
+++ b/lustre/obdclass/class_obd.c
@@ -138,8 +138,9 @@ int lustre_get_jobid(char *jobid)
 #ifdef __KERNEL__
        ret = cfs_get_environ(obd_jobid_var, jobid, &jobid_len);
        if (ret) {
-               CDEBUG((ret != -ENOENT && ret != -EINVAL) ? D_ERROR : D_INFO,
-                      "Get jobid for (%s) failed(%d).\n", obd_jobid_var, ret);
+               CDEBUG((ret != -ENOENT && ret != -EINVAL && ret != -EDEADLK) ?
+                      D_ERROR : D_INFO, "Get jobid for (%s) failed: rc = %d\n",
+                      obd_jobid_var, ret);
        }
 #endif
        RETURN(ret);