Date: Tue, 10 Dec 2013 19:04:44 -0500 (EST) From: Rick Macklem <rmacklem@uoguelph.ca> To: freebsd-current <freebsd-current@freebsd.org> Subject: svn merge to stable/10 has lotsa mergeinfo Message-ID: <2147336908.28920849.1386720284423.JavaMail.root@uoguelph.ca>
next in thread | raw e-mail | index | archive | help
Hi,
I just tried to MFC into stable/10 and it worked, but with
a lot of mergeinfo. I know diddly about svn, so is this ok?
Here's the "svn diff":
Index: sys
===================================================================
--- sys (revision 259205)
+++ sys (working copy)
Property changes on: sys
___________________________________________________________________
Added: svn:mergeinfo
Merged /head/sys:r256280,256291,256293-256294,256299,256302,256304,256308,256
321-256323,256325,256327-256328,256330-256331,256333-256335,256338,256341,256343
,256345,256347-256348,256350,256362,256365,256385,256389,256391,256423,256425,25
6440,256446,256450,256459,256467,256470,256477,256489,256498,256500-256502,25650
4,256533,256537,256540-256541,256544,256546,256548-256549,256551-256553,256555-2
56557,256570,256645-256646,256670,256682,256687,256689,256694,256709,256711,2567
13-256714,256716,256743-256744,256746,256750,256752-256753,256767,256769-256771,
256773,256775-256779,256788,256813,256827-256828,256832-256833,256835,256842,256
847-256848,256861,256865,256889,256911-256912,256915,256920,256925-256926,256931
,256934-256936,256951,256963,256968,256971-256972,256977-256978,257005,257007,25
7017,257038,257051,257057,257061,257065,257069-257072,257078-257079,257084,25709
2,257109,257138-257139,257142,257145-257151,257158-257159,257164,257168,257193,2
57206,257214,257216,257221,257234,257268,257272,257274,257287-257288,257304-2573
07,257329,257344-257345,257350,257359,257361,257364,257369,257377-257380,257382,
257388,257400,257402-257403,257421,257440,257490,257505,257534,257539,257542,257
555,257574,257583,257598,257633,257641,257654,257667-257668,257680,257694-257695
,257749,257754-257757,257769,257772,257780-257785,257787-257793,257795,257800-25
7801,257803-257804,257817,257819,257841-257845,257856,257858-257859,257862-25786
4,257869-257870,257872,257874,257876,257888,257915,257937-257939,257945,257996,2
58001,258016,258021,258029,258041-258043,258069,258086,258101,258122,258128,2581
35,258148-258150,258152-258156,258176,258178,258181,258187,258221,258224,258227-
258228,258235,258254,258262-258267,258276,258283,258294,258305,258307-258310,258
314,258317-258320,258345,258347-258348,258350,258353,258387-258388,258399,258425
,258432-258433,258441,258492,258495,258537,258549,258553,258570,258574,258588,25
8591,258660-258661,258664,258669,258689,258698,258714,258737,258758,258765,25878
6,258790,258796-258797,258830,258847,258853,258879,258914,258924,258941,259048,2
59053,259079,259083,259094,259103
Index: sys/fs/nfs/nfs_commonkrpc.c
===================================================================
--- sys/fs/nfs/nfs_commonkrpc.c (revision 259205)
+++ sys/fs/nfs/nfs_commonkrpc.c (working copy)
@@ -336,24 +336,25 @@
mtx_lock(&nrp->nr_mtx);
if (nrp->nr_client != NULL) {
+ mtx_unlock(&nrp->nr_mtx);
/*
* Someone else already connected.
*/
CLNT_RELEASE(client);
} else {
nrp->nr_client = client;
+ /*
+ * Protocols that do not require connections may be optionally
+ * left unconnected for servers that reply from a port other
+ * than NFS_PORT.
+ */
+ if (nmp == NULL || (nmp->nm_flag & NFSMNT_NOCONN) == 0) {
+ mtx_unlock(&nrp->nr_mtx);
+ CLNT_CONTROL(client, CLSET_CONNECT, &one);
+ } else
+ mtx_unlock(&nrp->nr_mtx);
}
- /*
- * Protocols that do not require connections may be optionally left
- * unconnected for servers that reply from a port other than NFS_PORT.
- */
- if (nmp == NULL || (nmp->nm_flag & NFSMNT_NOCONN) == 0) {
- mtx_unlock(&nrp->nr_mtx);
- CLNT_CONTROL(client, CLSET_CONNECT, &one);
- } else {
- mtx_unlock(&nrp->nr_mtx);
- }
/* Restore current thread's credentials. */
td->td_ucred = origcred;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?2147336908.28920849.1386720284423.JavaMail.root>