X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Fobdclass%2Fclass_obd.c;h=cf38cde7b1656b66fc2df0939e174bcec8832160;hb=8eca92b365fd3efd1541a48b1bb239926838d947;hp=7ffdf21609b5d9e03b2d18e6ce9285868076f2cc;hpb=2104ed0f0da3651f0cb4ab0c78a1037891d7cb4f;p=fs%2Flustre-release.git

diff --git a/lustre/obdclass/class_obd.c b/lustre/obdclass/class_obd.c
index 7ffdf21..cf38cde 100644
--- a/lustre/obdclass/class_obd.c
+++ b/lustre/obdclass/class_obd.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
  */
@@ -130,29 +126,29 @@ char obd_jobid_node[LUSTRE_JOBID_SIZE + 1];
 int lustre_get_jobid(char *jobid)
 {
 	int jobid_len = LUSTRE_JOBID_SIZE;
+	char tmp_jobid[LUSTRE_JOBID_SIZE] = { 0 };
 	int rc = 0;
 	ENTRY;
 
-	memset(jobid, 0, LUSTRE_JOBID_SIZE);
 	/* Jobstats isn't enabled */
 	if (strcmp(obd_jobid_var, JOBSTATS_DISABLE) == 0)
-		RETURN(0);
+		GOTO(out, rc = 0);
 
 	/* Whole node dedicated to single job */
 	if (strcmp(obd_jobid_var, JOBSTATS_NODELOCAL) == 0) {
-		memcpy(jobid, obd_jobid_node, LUSTRE_JOBID_SIZE);
-		RETURN(0);
+		memcpy(tmp_jobid, obd_jobid_node, LUSTRE_JOBID_SIZE);
+		GOTO(out, rc = 0);
 	}
 
 	/* Use process name + fsuid as jobid */
 	if (strcmp(obd_jobid_var, JOBSTATS_PROCNAME_UID) == 0) {
-		snprintf(jobid, LUSTRE_JOBID_SIZE, "%s.%u",
+		snprintf(tmp_jobid, LUSTRE_JOBID_SIZE, "%s.%u",
 			 current_comm(),
 			 from_kuid(&init_user_ns, current_fsuid()));
-		RETURN(0);
+		GOTO(out, rc = 0);
 	}
 
-	rc = cfs_get_environ(obd_jobid_var, jobid, &jobid_len);
+	rc = cfs_get_environ(obd_jobid_var, tmp_jobid, &jobid_len);
 	if (rc) {
 		if (rc == -EOVERFLOW) {
 			/* For the PBS_JOBID and LOADL_STEP_ID keys (which are
@@ -176,7 +172,16 @@ int lustre_get_jobid(char *jobid)
 			       obd_jobid_var, rc);
 		}
 	}
-	RETURN(rc);
+
+out:
+	if (rc != 0)
+		RETURN(rc);
+
+	/* Only replace the job ID if it changed. */
+	if (strcmp(jobid, tmp_jobid) != 0)
+		memcpy(jobid, tmp_jobid, jobid_len);
+
+	RETURN(0);
 }
 EXPORT_SYMBOL(lustre_get_jobid);