diff for duplicates of <20080127221017.GC597@fieldses.org> diff --git a/a/1.txt b/N1/1.txt index 8c92548..e7f7e40 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,72 +1,109 @@ -T24gU3VuLCBKYW4gMjcsIDIwMDggYXQgMDk6NDI6MjNQTSArMDEwMCwgU2ltb24gSG9sbSBUaMO4 -Z2Vyc2VuIHdyb3RlOgo+IAo+IGZyZSwgMjUgMDEgMjAwOCBrbC4gMTg6MTUgLTA1MDAsIHNrcmV2 -IEouIEJydWNlIEZpZWxkczogCj4gPiBCZWxvdyBpcyBhIHN1bW1hcnkgb2YgdGhlIG5mcyBzZXJ2 -ZXIgcGF0Y2hlcyB3aGljaCBJIGV4cGVjdCB0byBzdWJtaXQKPiA+IChhbnkgZGF5IG5vdykgZm9y -IDIuNi4yNTsgcGxlYXNlIGxldCBtZSBrbm93IGlmIHlvdSBub3RpY2UgYW55dGhpbmcKPiA+IHdy -b25nIG9yIG1pc3NpbmcuICBJJ2xsIGZvbGxvdyB1cCB0byBsaW51eC1uZnNAdmdlci5rZXJuZWwu -b3JnIHdpdGggdGhlCj4gPiBmdWxsIGxpc3Qgb2YgcGF0Y2hlcy4KPiAKPiBUaGVyZSBhcmUgYXQg -bGVhc3QgdHdvIHBhdGNoZXMgdGhhdCBkb24ndCBjb21waWxlIGFuZCBicmVhawo+IGJpc2VjdGFi -aWxpdHkuIFRoZSBlcnJvcnMgc2hvdWxkIGJlIG9idmlvdXMsIGp1c3QgY2hlY2tvdXQgYW5kIG1h -a2UKPiA2ZjMxMGRmIGFuZCAyM2I0ZTJlIChwYXRjaCBuby4gMjkgYW5kIDY1IGZyb20gdGhlIHBv -c3Rpbmcgb2YgdGhlIHBhdGNoCj4gc2V0IG9uIGxpbnV4LW5mcykuCgpXaG9vcHMsIHRoYW5rcyBm -b3IgZmluZGluZyBib3RoIG9mIHRob3NlLgoKPiAKPiBbLi4uXSAKPiA+IEouIEJydWNlIEZpZWxk -cyAoMzQpOgo+ID4gICAgICAgbmZzZDQ6IGtpbGwgdW5uZWNlc3Nhcnkgc2FtZV9uYW1lKCkgaW4g -c2V0Y2xpZW50aWRfY29uZmlybQo+IGRpZmYgLS1naXQgYS9mcy9uZnNkL25mczRzdGF0ZS5jIGIv -ZnMvbmZzZC9uZnM0c3RhdGUuYwo+IGluZGV4IDUwOGIyNTYuLmQwMjZjMjQgMTAwNjQ0Cj4gLS0t -IGEvZnMvbmZzZC9uZnM0c3RhdGUuYwo+ICsrKyBiL2ZzL25mc2QvbmZzNHN0YXRlLmMKPiBAQCAt -ODU4LDggKzg1Nyw3IEBAIG5mc2Q0X3NldGNsaWVudGlkX2NvbmZpcm0oc3RydWN0IHN2Y19ycXN0 -ICpycXN0cCwKPiAgICAgICAgICAgICAgICAgfQo+ICAgICAgICAgfSBlbHNlIGlmICgoY29uZiAm -JiAhdW5jb25mKSB8fAo+ICAgICAgICAgICAgICgoY29uZiAmJiB1bmNvbmYpICYmIAo+IC0gICAg -ICAgICAgICAoIXNhbWVfdmVyZigmY29uZi0+Y2xfdmVyaWZpZXIsICZ1bmNvbmYtPmNsX3Zlcmlm -aWVyKSB8fAo+IC0gICAgICAgICAgICAgIXNhbWVfbmFtZShjb25mLT5jbF9yZWNkaXIsIHVuY29u -Zi0+Y2xfcmVjZGlyKSkpKSB7Cj4gKyAgICAgICAgICAgICFzYW1lX3ZlcmYoJmNvbmYtPmNsX3Zl -cmlmaWVyLCAmdW5jb25mLT5jbF92ZXJpZmllcikpIHsKPiBtaXNzaW5nIGVuZGluZyBwYXJlbnRo -ZXNpcyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1eCgpZZXA7IGZpeGVk -LgoKPiAKPiAKPiBbLi4uXSAKPiA+IFRvbSBUdWNrZXIgKDQ3KToKPiA+ICAgICAgIHN2YzogTWFr -ZSBjbG9zZSB0cmFuc3BvcnQgaW5kZXBlbmRlbnQKPiBkaWZmIC0tZ2l0IGEvbmV0L3N1bnJwYy9z -dmNzb2NrLmMgYi9uZXQvc3VucnBjL3N2Y3NvY2suYwo+IGluZGV4IGY4NjUzOGUuLjZkZmZkZGEg -MTAwNjQ0Cj4gLS0tIGEvbmV0L3N1bnJwYy9zdmNzb2NrLmMKPiArKysgYi9uZXQvc3VucnBjL3N2 -Y3NvY2suYwo+IEBAIC0xOTEyLDY2ICsxOTExLDYzIEBAIHN0YXRpYyB2b2lkIHN2Y19zb2NrX2Zy -ZWUoc3RydWN0IHN2Y194cHJ0ICp4cHJ0KQo+ICB9Cj4gIAo+ICAvKgo+IC0gKiBSZW1vdmUgYSBk -ZWFkIHNvY2tldAo+ICsgKiBSZW1vdmUgYSBkZWFkIHRyYW5zcG9ydAo+ICAgKi8KPiAtc3RhdGlj -IHZvaWQKPiAtc3ZjX2RlbGV0ZV9zb2NrZXQoc3RydWN0IHN2Y19zb2NrICpzdnNrKQo+ICtzdGF0 -aWMgdm9pZCBzdmNfZGVsZXRlX3hwcnQoc3RydWN0IHN2Y194cHJ0ICp4cHJ0KQo+ICB7Cj4gLSAg -ICAgICBzdHJ1Y3Qgc3ZjX3NlcnYgKnNlcnY7Cj4gLSAgICAgICBzdHJ1Y3Qgc29jayAgICAgKnNr -Owo+IC0KPiAtICAgICAgIGRwcmludGsoInN2Yzogc3ZjX2RlbGV0ZV9zb2NrZXQoJXApXG4iLCBz -dnNrKTsKPiAtCj4gLSAgICAgICBzZXJ2ID0gc3Zzay0+c2tfeHBydC54cHRfc2VydmVyOwo+IC0g -ICAgICAgc2sgPSBzdnNrLT5za19zazsKPiArICAgICAgIHN0cnVjdCBzdmNfc2VydiAqc2VydiA9 -IHhwcnQtPnhwdF9zZXJ2ZXI7Cj4gIAo+IC0gICAgICAgc3Zzay0+c2tfeHBydC54cHRfb3BzLT54 -cG9fZGV0YWNoKCZzdnNrLT5za194cHJ0KTsKPiArICAgICAgIGRwcmludGsoInN2Yzogc3ZjX2Rl -bGV0ZV94cHJ0KCVwKVxuIiwgeHBydCk7Cj4gKyAgICAgICB4cHJ0LT54cHRfb3BzLT54cG9fZGV0 -YWNoKHhwcnQpOwo+ICAKPiAgICAgICAgIHNwaW5fbG9ja19iaCgmc2Vydi0+c3ZfbG9jayk7Cj4g -LQo+IC0gICAgICAgaWYgKCF0ZXN0X2FuZF9zZXRfYml0KFhQVF9ERVRBQ0hFRCwgJnN2c2stPnNr -X3hwcnQueHB0X2ZsYWdzKSkKPiAtICAgICAgICAgICAgICAgbGlzdF9kZWxfaW5pdCgmc3Zzay0+ -c2tfbGlzdCk7Cj4gKyAgICAgICBpZiAoIXRlc3RfYW5kX3NldF9iaXQoWFBUX0RFVEFDSEVELCAm -eHBydC0+eHB0X2ZsYWdzKSkKPiArICAgICAgICAgICAgICAgbGlzdF9kZWxfaW5pdCgmeHBydC0+ -eHB0X2xpc3QpOwo+ICAgICAgICAgLyoKPiAtICAgICAgICAqIFdlIHVzZWQgdG8gZGVsZXRlIHRo -ZSBzdmNfc29jayBmcm9tIHdoaWNoZXZlciBsaXN0Cj4gLSAgICAgICAgKiBpdCdzIHNrX3JlYWR5 -IG5vZGUgd2FzIG9uLCBidXQgd2UgZG9uJ3QgYWN0dWFsbHkKPiArICAgICAgICAqIFdlIHVzZWQg -dG8gZGVsZXRlIHRoZSB0cmFuc3BvcnQgZnJvbSB3aGljaGV2ZXIgbGlzdAo+ICsgICAgICAgICog -aXQncyBza194cHJ0LnhwdF9yZWFkeSBub2RlIHdhcyBvbiwgYnV0IHdlIGRvbid0IGFjdHVhbGx5 -Cj4gICAgICAgICAgKiBuZWVkIHRvLiAgVGhpcyBpcyBiZWNhdXNlIHRoZSBvbmx5IHRpbWUgd2Un -cmUgY2FsbGVkCj4gICAgICAgICAgKiB3aGlsZSBzdGlsbCBhdHRhY2hlZCB0byBhIHF1ZXVlLCB0 -aGUgcXVldWUgaXRzZWxmCj4gICAgICAgICAgKiBpcyBhYm91dCB0byBiZSBkZXN0cm95ZWQgKGlu -IHN2Y19kZXN0cm95KS4KPiAgICAgICAgICAqLwo+IC0gICAgICAgaWYgKCF0ZXN0X2FuZF9zZXRf -Yml0KFhQVF9ERUFELCAmc3Zzay0+c2tfeHBydC54cHRfZmxhZ3MpKSB7Cj4gLSAgICAgICAgICAg -ICAgIEJVR19PTihhdG9taWNfcmVhZCgmc3Zzay0+c2tfeHBydC54cHRfcmVmLnJlZmNvdW50KSA8 -Cj4gMik7Cj4gLSAgICAgICAgICAgICAgIGlmICh0ZXN0X2JpdChYUFRfVEVNUCwgJnN2c2stPnNr -X3hwcnQueHB0X2ZsYWdzKSkKPiArICAgICAgIGlmICghdGVzdF9hbmRfc2V0X2JpdChYUFRfREVB -RCwgJnhwcnQtPnhwdF9mbGFncykpIHsKPiArICAgICAgICAgICAgICAgQlVHX09OKGF0b21pY19y -ZWFkKCZ4cHJ0LT54cHRfcmVmLnJlZmNvdW50KSA8IDIpOwo+ICsgICAgICAgICAgICAgICBpZiAo -dGVzdF9iaXQoWFBUX1RFTVAsICZ4cHJ0LT54cHRfZmxhZ3MpKQo+ICAgICAgICAgICAgICAgICAg -ICAgICAgIHNlcnYtPnN2X3RtcGNudC0tOwo+ICAgICAgICAgICAgICAgICBzdmNfeHBydF9wdXQo -JnN2c2stPnNrX3hwcnQpOwo+IHNob3VsZCBoYXZlIGJlZW4KPiAgICAgICAgICAgICAgICAgc3Zj -X3hwcnRfcHV0KCZ4cHJ0KTsKCkFjdHVhbGx5IGxvb2tzIGxpa2UgaXQgc2hvdWxkIGJlIHN2Y194 -cHJ0X3B1dCh4cHJ0KTsgZml4ZWQuCgo+IFRoZXJlIG1pZ2h0IGJlIG1vcmUgZXJyb3JzIGluIHRo -ZSBuZXh0IDE1IHBhdGNoZXMgb3Igc287IEkgZGlkbid0IHRlc3QKPiB0aGVtIHdpdGggdGhpcyBl -cnJvciBjb3JyZWN0ZWQuCgpPSy4gIEkndmUgZ290IGEgbWFjaGluZSBydW5uaW5nCgoJZm9yIGMg -aW4gJChnaXQgcmV2LWxpc3Qgb3JpZ2luLi5saW51eC1uZnMvbmZzLXNlcnZlci1zdGFibGVeKTsg -ZG8KCQlnaXQgY2hlY2tvdXQgJGMKCQltYWtlIC1zIC1qNAoJZG9uZQoKbm93IGp1c3QgdG8gbWFr -ZSBzdXJlLi4uLiAgVGhhbmtzIGFnYWluIQoKLS1iLgpfX19fX19fX19fX19fX19fX19fX19fX19f -X19fX19fX19fX19fX19fX19fX19fXwpORlN2NCBtYWlsaW5nIGxpc3QKTkZTdjRAbGludXgtbmZz -Lm9yZwpodHRwOi8vbGludXgtbmZzLm9yZy9jZ2ktYmluL21haWxtYW4vbGlzdGluZm8vbmZzdjQ= +On Sun, Jan 27, 2008 at 09:42:23PM +0100, Simon Holm Thøgersen wrote: +> +> fre, 25 01 2008 kl. 18:15 -0500, skrev J. Bruce Fields: +> > Below is a summary of the nfs server patches which I expect to submit +> > (any day now) for 2.6.25; please let me know if you notice anything +> > wrong or missing. I'll follow up to linux-nfs@vger.kernel.org with the +> > full list of patches. +> +> There are at least two patches that don't compile and break +> bisectability. The errors should be obvious, just checkout and make +> 6f310df and 23b4e2e (patch no. 29 and 65 from the posting of the patch +> set on linux-nfs). + +Whoops, thanks for finding both of those. + +> +> [...] +> > J. Bruce Fields (34): +> > nfsd4: kill unnecessary same_name() in setclientid_confirm +> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c +> index 508b256..d026c24 100644 +> --- a/fs/nfsd/nfs4state.c +> +++ b/fs/nfsd/nfs4state.c +> @@ -858,8 +857,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp, +> } +> } else if ((conf && !unconf) || +> ((conf && unconf) && +> - (!same_verf(&conf->cl_verifier, &unconf->cl_verifier) || +> - !same_name(conf->cl_recdir, unconf->cl_recdir)))) { +> + !same_verf(&conf->cl_verifier, &unconf->cl_verifier)) { +> missing ending parenthesis ---------------------------------------^ + +Yep; fixed. + +> +> +> [...] +> > Tom Tucker (47): +> > svc: Make close transport independent +> diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c +> index f86538e..6dffdda 100644 +> --- a/net/sunrpc/svcsock.c +> +++ b/net/sunrpc/svcsock.c +> @@ -1912,66 +1911,63 @@ static void svc_sock_free(struct svc_xprt *xprt) +> } +> +> /* +> - * Remove a dead socket +> + * Remove a dead transport +> */ +> -static void +> -svc_delete_socket(struct svc_sock *svsk) +> +static void svc_delete_xprt(struct svc_xprt *xprt) +> { +> - struct svc_serv *serv; +> - struct sock *sk; +> - +> - dprintk("svc: svc_delete_socket(%p)\n", svsk); +> - +> - serv = svsk->sk_xprt.xpt_server; +> - sk = svsk->sk_sk; +> + struct svc_serv *serv = xprt->xpt_server; +> +> - svsk->sk_xprt.xpt_ops->xpo_detach(&svsk->sk_xprt); +> + dprintk("svc: svc_delete_xprt(%p)\n", xprt); +> + xprt->xpt_ops->xpo_detach(xprt); +> +> spin_lock_bh(&serv->sv_lock); +> - +> - if (!test_and_set_bit(XPT_DETACHED, &svsk->sk_xprt.xpt_flags)) +> - list_del_init(&svsk->sk_list); +> + if (!test_and_set_bit(XPT_DETACHED, &xprt->xpt_flags)) +> + list_del_init(&xprt->xpt_list); +> /* +> - * We used to delete the svc_sock from whichever list +> - * it's sk_ready node was on, but we don't actually +> + * We used to delete the transport from whichever list +> + * it's sk_xprt.xpt_ready node was on, but we don't actually +> * need to. This is because the only time we're called +> * while still attached to a queue, the queue itself +> * is about to be destroyed (in svc_destroy). +> */ +> - if (!test_and_set_bit(XPT_DEAD, &svsk->sk_xprt.xpt_flags)) { +> - BUG_ON(atomic_read(&svsk->sk_xprt.xpt_ref.refcount) < +> 2); +> - if (test_bit(XPT_TEMP, &svsk->sk_xprt.xpt_flags)) +> + if (!test_and_set_bit(XPT_DEAD, &xprt->xpt_flags)) { +> + BUG_ON(atomic_read(&xprt->xpt_ref.refcount) < 2); +> + if (test_bit(XPT_TEMP, &xprt->xpt_flags)) +> serv->sv_tmpcnt--; +> svc_xprt_put(&svsk->sk_xprt); +> should have been +> svc_xprt_put(&xprt); + +Actually looks like it should be svc_xprt_put(xprt); fixed. + +> There might be more errors in the next 15 patches or so; I didn't test +> them with this error corrected. + +OK. I've got a machine running + + for c in $(git rev-list origin..linux-nfs/nfs-server-stable^); do + git checkout $c + make -s -j4 + done + +now just to make sure.... Thanks again! + +--b. diff --git a/a/content_digest b/N1/content_digest index 65fec92..ab574b7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,83 +4,121 @@ "Subject\0Re: nfs server patches for 2.6.25\0" "Date\0Sun, 27 Jan 2008 17:10:17 -0500\0" "To\0Simon Holm Th\303\270gersen <odie@cs.aau.dk>\0" - "Cc\0linux-nfs@vger.kernel.org" + "Cc\0Tom Tucker <tom@opengridcomputing.com>" + linux-nfs@vger.kernel.org nfsv4@linux-nfs.org linux-kernel@vger.kernel.org - " Tom Tucker <tom@opengridcomputing.com>\0" + " Neil Brown <neilb@suse.de>\0" "\00:1\0" "b\0" - "T24gU3VuLCBKYW4gMjcsIDIwMDggYXQgMDk6NDI6MjNQTSArMDEwMCwgU2ltb24gSG9sbSBUaMO4\n" - "Z2Vyc2VuIHdyb3RlOgo+IAo+IGZyZSwgMjUgMDEgMjAwOCBrbC4gMTg6MTUgLTA1MDAsIHNrcmV2\n" - "IEouIEJydWNlIEZpZWxkczogCj4gPiBCZWxvdyBpcyBhIHN1bW1hcnkgb2YgdGhlIG5mcyBzZXJ2\n" - "ZXIgcGF0Y2hlcyB3aGljaCBJIGV4cGVjdCB0byBzdWJtaXQKPiA+IChhbnkgZGF5IG5vdykgZm9y\n" - "IDIuNi4yNTsgcGxlYXNlIGxldCBtZSBrbm93IGlmIHlvdSBub3RpY2UgYW55dGhpbmcKPiA+IHdy\n" - "b25nIG9yIG1pc3NpbmcuICBJJ2xsIGZvbGxvdyB1cCB0byBsaW51eC1uZnNAdmdlci5rZXJuZWwu\n" - "b3JnIHdpdGggdGhlCj4gPiBmdWxsIGxpc3Qgb2YgcGF0Y2hlcy4KPiAKPiBUaGVyZSBhcmUgYXQg\n" - "bGVhc3QgdHdvIHBhdGNoZXMgdGhhdCBkb24ndCBjb21waWxlIGFuZCBicmVhawo+IGJpc2VjdGFi\n" - "aWxpdHkuIFRoZSBlcnJvcnMgc2hvdWxkIGJlIG9idmlvdXMsIGp1c3QgY2hlY2tvdXQgYW5kIG1h\n" - "a2UKPiA2ZjMxMGRmIGFuZCAyM2I0ZTJlIChwYXRjaCBuby4gMjkgYW5kIDY1IGZyb20gdGhlIHBv\n" - "c3Rpbmcgb2YgdGhlIHBhdGNoCj4gc2V0IG9uIGxpbnV4LW5mcykuCgpXaG9vcHMsIHRoYW5rcyBm\n" - "b3IgZmluZGluZyBib3RoIG9mIHRob3NlLgoKPiAKPiBbLi4uXSAKPiA+IEouIEJydWNlIEZpZWxk\n" - "cyAoMzQpOgo+ID4gICAgICAgbmZzZDQ6IGtpbGwgdW5uZWNlc3Nhcnkgc2FtZV9uYW1lKCkgaW4g\n" - "c2V0Y2xpZW50aWRfY29uZmlybQo+IGRpZmYgLS1naXQgYS9mcy9uZnNkL25mczRzdGF0ZS5jIGIv\n" - "ZnMvbmZzZC9uZnM0c3RhdGUuYwo+IGluZGV4IDUwOGIyNTYuLmQwMjZjMjQgMTAwNjQ0Cj4gLS0t\n" - "IGEvZnMvbmZzZC9uZnM0c3RhdGUuYwo+ICsrKyBiL2ZzL25mc2QvbmZzNHN0YXRlLmMKPiBAQCAt\n" - "ODU4LDggKzg1Nyw3IEBAIG5mc2Q0X3NldGNsaWVudGlkX2NvbmZpcm0oc3RydWN0IHN2Y19ycXN0\n" - "ICpycXN0cCwKPiAgICAgICAgICAgICAgICAgfQo+ICAgICAgICAgfSBlbHNlIGlmICgoY29uZiAm\n" - "JiAhdW5jb25mKSB8fAo+ICAgICAgICAgICAgICgoY29uZiAmJiB1bmNvbmYpICYmIAo+IC0gICAg\n" - "ICAgICAgICAoIXNhbWVfdmVyZigmY29uZi0+Y2xfdmVyaWZpZXIsICZ1bmNvbmYtPmNsX3Zlcmlm\n" - "aWVyKSB8fAo+IC0gICAgICAgICAgICAgIXNhbWVfbmFtZShjb25mLT5jbF9yZWNkaXIsIHVuY29u\n" - "Zi0+Y2xfcmVjZGlyKSkpKSB7Cj4gKyAgICAgICAgICAgICFzYW1lX3ZlcmYoJmNvbmYtPmNsX3Zl\n" - "cmlmaWVyLCAmdW5jb25mLT5jbF92ZXJpZmllcikpIHsKPiBtaXNzaW5nIGVuZGluZyBwYXJlbnRo\n" - "ZXNpcyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1eCgpZZXA7IGZpeGVk\n" - "LgoKPiAKPiAKPiBbLi4uXSAKPiA+IFRvbSBUdWNrZXIgKDQ3KToKPiA+ICAgICAgIHN2YzogTWFr\n" - "ZSBjbG9zZSB0cmFuc3BvcnQgaW5kZXBlbmRlbnQKPiBkaWZmIC0tZ2l0IGEvbmV0L3N1bnJwYy9z\n" - "dmNzb2NrLmMgYi9uZXQvc3VucnBjL3N2Y3NvY2suYwo+IGluZGV4IGY4NjUzOGUuLjZkZmZkZGEg\n" - "MTAwNjQ0Cj4gLS0tIGEvbmV0L3N1bnJwYy9zdmNzb2NrLmMKPiArKysgYi9uZXQvc3VucnBjL3N2\n" - "Y3NvY2suYwo+IEBAIC0xOTEyLDY2ICsxOTExLDYzIEBAIHN0YXRpYyB2b2lkIHN2Y19zb2NrX2Zy\n" - "ZWUoc3RydWN0IHN2Y194cHJ0ICp4cHJ0KQo+ICB9Cj4gIAo+ICAvKgo+IC0gKiBSZW1vdmUgYSBk\n" - "ZWFkIHNvY2tldAo+ICsgKiBSZW1vdmUgYSBkZWFkIHRyYW5zcG9ydAo+ICAgKi8KPiAtc3RhdGlj\n" - "IHZvaWQKPiAtc3ZjX2RlbGV0ZV9zb2NrZXQoc3RydWN0IHN2Y19zb2NrICpzdnNrKQo+ICtzdGF0\n" - "aWMgdm9pZCBzdmNfZGVsZXRlX3hwcnQoc3RydWN0IHN2Y194cHJ0ICp4cHJ0KQo+ICB7Cj4gLSAg\n" - "ICAgICBzdHJ1Y3Qgc3ZjX3NlcnYgKnNlcnY7Cj4gLSAgICAgICBzdHJ1Y3Qgc29jayAgICAgKnNr\n" - "Owo+IC0KPiAtICAgICAgIGRwcmludGsoInN2Yzogc3ZjX2RlbGV0ZV9zb2NrZXQoJXApXG4iLCBz\n" - "dnNrKTsKPiAtCj4gLSAgICAgICBzZXJ2ID0gc3Zzay0+c2tfeHBydC54cHRfc2VydmVyOwo+IC0g\n" - "ICAgICAgc2sgPSBzdnNrLT5za19zazsKPiArICAgICAgIHN0cnVjdCBzdmNfc2VydiAqc2VydiA9\n" - "IHhwcnQtPnhwdF9zZXJ2ZXI7Cj4gIAo+IC0gICAgICAgc3Zzay0+c2tfeHBydC54cHRfb3BzLT54\n" - "cG9fZGV0YWNoKCZzdnNrLT5za194cHJ0KTsKPiArICAgICAgIGRwcmludGsoInN2Yzogc3ZjX2Rl\n" - "bGV0ZV94cHJ0KCVwKVxuIiwgeHBydCk7Cj4gKyAgICAgICB4cHJ0LT54cHRfb3BzLT54cG9fZGV0\n" - "YWNoKHhwcnQpOwo+ICAKPiAgICAgICAgIHNwaW5fbG9ja19iaCgmc2Vydi0+c3ZfbG9jayk7Cj4g\n" - "LQo+IC0gICAgICAgaWYgKCF0ZXN0X2FuZF9zZXRfYml0KFhQVF9ERVRBQ0hFRCwgJnN2c2stPnNr\n" - "X3hwcnQueHB0X2ZsYWdzKSkKPiAtICAgICAgICAgICAgICAgbGlzdF9kZWxfaW5pdCgmc3Zzay0+\n" - "c2tfbGlzdCk7Cj4gKyAgICAgICBpZiAoIXRlc3RfYW5kX3NldF9iaXQoWFBUX0RFVEFDSEVELCAm\n" - "eHBydC0+eHB0X2ZsYWdzKSkKPiArICAgICAgICAgICAgICAgbGlzdF9kZWxfaW5pdCgmeHBydC0+\n" - "eHB0X2xpc3QpOwo+ICAgICAgICAgLyoKPiAtICAgICAgICAqIFdlIHVzZWQgdG8gZGVsZXRlIHRo\n" - "ZSBzdmNfc29jayBmcm9tIHdoaWNoZXZlciBsaXN0Cj4gLSAgICAgICAgKiBpdCdzIHNrX3JlYWR5\n" - "IG5vZGUgd2FzIG9uLCBidXQgd2UgZG9uJ3QgYWN0dWFsbHkKPiArICAgICAgICAqIFdlIHVzZWQg\n" - "dG8gZGVsZXRlIHRoZSB0cmFuc3BvcnQgZnJvbSB3aGljaGV2ZXIgbGlzdAo+ICsgICAgICAgICog\n" - "aXQncyBza194cHJ0LnhwdF9yZWFkeSBub2RlIHdhcyBvbiwgYnV0IHdlIGRvbid0IGFjdHVhbGx5\n" - "Cj4gICAgICAgICAgKiBuZWVkIHRvLiAgVGhpcyBpcyBiZWNhdXNlIHRoZSBvbmx5IHRpbWUgd2Un\n" - "cmUgY2FsbGVkCj4gICAgICAgICAgKiB3aGlsZSBzdGlsbCBhdHRhY2hlZCB0byBhIHF1ZXVlLCB0\n" - "aGUgcXVldWUgaXRzZWxmCj4gICAgICAgICAgKiBpcyBhYm91dCB0byBiZSBkZXN0cm95ZWQgKGlu\n" - "IHN2Y19kZXN0cm95KS4KPiAgICAgICAgICAqLwo+IC0gICAgICAgaWYgKCF0ZXN0X2FuZF9zZXRf\n" - "Yml0KFhQVF9ERUFELCAmc3Zzay0+c2tfeHBydC54cHRfZmxhZ3MpKSB7Cj4gLSAgICAgICAgICAg\n" - "ICAgIEJVR19PTihhdG9taWNfcmVhZCgmc3Zzay0+c2tfeHBydC54cHRfcmVmLnJlZmNvdW50KSA8\n" - "Cj4gMik7Cj4gLSAgICAgICAgICAgICAgIGlmICh0ZXN0X2JpdChYUFRfVEVNUCwgJnN2c2stPnNr\n" - "X3hwcnQueHB0X2ZsYWdzKSkKPiArICAgICAgIGlmICghdGVzdF9hbmRfc2V0X2JpdChYUFRfREVB\n" - "RCwgJnhwcnQtPnhwdF9mbGFncykpIHsKPiArICAgICAgICAgICAgICAgQlVHX09OKGF0b21pY19y\n" - "ZWFkKCZ4cHJ0LT54cHRfcmVmLnJlZmNvdW50KSA8IDIpOwo+ICsgICAgICAgICAgICAgICBpZiAo\n" - "dGVzdF9iaXQoWFBUX1RFTVAsICZ4cHJ0LT54cHRfZmxhZ3MpKQo+ICAgICAgICAgICAgICAgICAg\n" - "ICAgICAgIHNlcnYtPnN2X3RtcGNudC0tOwo+ICAgICAgICAgICAgICAgICBzdmNfeHBydF9wdXQo\n" - "JnN2c2stPnNrX3hwcnQpOwo+IHNob3VsZCBoYXZlIGJlZW4KPiAgICAgICAgICAgICAgICAgc3Zj\n" - "X3hwcnRfcHV0KCZ4cHJ0KTsKCkFjdHVhbGx5IGxvb2tzIGxpa2UgaXQgc2hvdWxkIGJlIHN2Y194\n" - "cHJ0X3B1dCh4cHJ0KTsgZml4ZWQuCgo+IFRoZXJlIG1pZ2h0IGJlIG1vcmUgZXJyb3JzIGluIHRo\n" - "ZSBuZXh0IDE1IHBhdGNoZXMgb3Igc287IEkgZGlkbid0IHRlc3QKPiB0aGVtIHdpdGggdGhpcyBl\n" - "cnJvciBjb3JyZWN0ZWQuCgpPSy4gIEkndmUgZ290IGEgbWFjaGluZSBydW5uaW5nCgoJZm9yIGMg\n" - "aW4gJChnaXQgcmV2LWxpc3Qgb3JpZ2luLi5saW51eC1uZnMvbmZzLXNlcnZlci1zdGFibGVeKTsg\n" - "ZG8KCQlnaXQgY2hlY2tvdXQgJGMKCQltYWtlIC1zIC1qNAoJZG9uZQoKbm93IGp1c3QgdG8gbWFr\n" - "ZSBzdXJlLi4uLiAgVGhhbmtzIGFnYWluIQoKLS1iLgpfX19fX19fX19fX19fX19fX19fX19fX19f\n" - "X19fX19fX19fX19fX19fX19fX19fXwpORlN2NCBtYWlsaW5nIGxpc3QKTkZTdjRAbGludXgtbmZz\n" - Lm9yZwpodHRwOi8vbGludXgtbmZzLm9yZy9jZ2ktYmluL21haWxtYW4vbGlzdGluZm8vbmZzdjQ= + "On Sun, Jan 27, 2008 at 09:42:23PM +0100, Simon Holm Th\303\270gersen wrote:\n" + "> \n" + "> fre, 25 01 2008 kl. 18:15 -0500, skrev J. Bruce Fields: \n" + "> > Below is a summary of the nfs server patches which I expect to submit\n" + "> > (any day now) for 2.6.25; please let me know if you notice anything\n" + "> > wrong or missing. I'll follow up to linux-nfs@vger.kernel.org with the\n" + "> > full list of patches.\n" + "> \n" + "> There are at least two patches that don't compile and break\n" + "> bisectability. The errors should be obvious, just checkout and make\n" + "> 6f310df and 23b4e2e (patch no. 29 and 65 from the posting of the patch\n" + "> set on linux-nfs).\n" + "\n" + "Whoops, thanks for finding both of those.\n" + "\n" + "> \n" + "> [...] \n" + "> > J. Bruce Fields (34):\n" + "> > nfsd4: kill unnecessary same_name() in setclientid_confirm\n" + "> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c\n" + "> index 508b256..d026c24 100644\n" + "> --- a/fs/nfsd/nfs4state.c\n" + "> +++ b/fs/nfsd/nfs4state.c\n" + "> @@ -858,8 +857,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,\n" + "> }\n" + "> } else if ((conf && !unconf) ||\n" + "> ((conf && unconf) && \n" + "> - (!same_verf(&conf->cl_verifier, &unconf->cl_verifier) ||\n" + "> - !same_name(conf->cl_recdir, unconf->cl_recdir)))) {\n" + "> + !same_verf(&conf->cl_verifier, &unconf->cl_verifier)) {\n" + "> missing ending parenthesis ---------------------------------------^\n" + "\n" + "Yep; fixed.\n" + "\n" + "> \n" + "> \n" + "> [...] \n" + "> > Tom Tucker (47):\n" + "> > svc: Make close transport independent\n" + "> diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c\n" + "> index f86538e..6dffdda 100644\n" + "> --- a/net/sunrpc/svcsock.c\n" + "> +++ b/net/sunrpc/svcsock.c\n" + "> @@ -1912,66 +1911,63 @@ static void svc_sock_free(struct svc_xprt *xprt)\n" + "> }\n" + "> \n" + "> /*\n" + "> - * Remove a dead socket\n" + "> + * Remove a dead transport\n" + "> */\n" + "> -static void\n" + "> -svc_delete_socket(struct svc_sock *svsk)\n" + "> +static void svc_delete_xprt(struct svc_xprt *xprt)\n" + "> {\n" + "> - struct svc_serv *serv;\n" + "> - struct sock *sk;\n" + "> -\n" + "> - dprintk(\"svc: svc_delete_socket(%p)\\n\", svsk);\n" + "> -\n" + "> - serv = svsk->sk_xprt.xpt_server;\n" + "> - sk = svsk->sk_sk;\n" + "> + struct svc_serv *serv = xprt->xpt_server;\n" + "> \n" + "> - svsk->sk_xprt.xpt_ops->xpo_detach(&svsk->sk_xprt);\n" + "> + dprintk(\"svc: svc_delete_xprt(%p)\\n\", xprt);\n" + "> + xprt->xpt_ops->xpo_detach(xprt);\n" + "> \n" + "> spin_lock_bh(&serv->sv_lock);\n" + "> -\n" + "> - if (!test_and_set_bit(XPT_DETACHED, &svsk->sk_xprt.xpt_flags))\n" + "> - list_del_init(&svsk->sk_list);\n" + "> + if (!test_and_set_bit(XPT_DETACHED, &xprt->xpt_flags))\n" + "> + list_del_init(&xprt->xpt_list);\n" + "> /*\n" + "> - * We used to delete the svc_sock from whichever list\n" + "> - * it's sk_ready node was on, but we don't actually\n" + "> + * We used to delete the transport from whichever list\n" + "> + * it's sk_xprt.xpt_ready node was on, but we don't actually\n" + "> * need to. This is because the only time we're called\n" + "> * while still attached to a queue, the queue itself\n" + "> * is about to be destroyed (in svc_destroy).\n" + "> */\n" + "> - if (!test_and_set_bit(XPT_DEAD, &svsk->sk_xprt.xpt_flags)) {\n" + "> - BUG_ON(atomic_read(&svsk->sk_xprt.xpt_ref.refcount) <\n" + "> 2);\n" + "> - if (test_bit(XPT_TEMP, &svsk->sk_xprt.xpt_flags))\n" + "> + if (!test_and_set_bit(XPT_DEAD, &xprt->xpt_flags)) {\n" + "> + BUG_ON(atomic_read(&xprt->xpt_ref.refcount) < 2);\n" + "> + if (test_bit(XPT_TEMP, &xprt->xpt_flags))\n" + "> serv->sv_tmpcnt--;\n" + "> svc_xprt_put(&svsk->sk_xprt);\n" + "> should have been\n" + "> svc_xprt_put(&xprt);\n" + "\n" + "Actually looks like it should be svc_xprt_put(xprt); fixed.\n" + "\n" + "> There might be more errors in the next 15 patches or so; I didn't test\n" + "> them with this error corrected.\n" + "\n" + "OK. I've got a machine running\n" + "\n" + "\tfor c in $(git rev-list origin..linux-nfs/nfs-server-stable^); do\n" + "\t\tgit checkout $c\n" + "\t\tmake -s -j4\n" + "\tdone\n" + "\n" + "now just to make sure.... Thanks again!\n" + "\n" + --b. -1c2e00eb161b0e35305db48458c4e9ca20273d398a0f690ee50548657df2f730 +6c828d5b36c4349b822e485e0ae8e268e8ce6b0947c0f9fe70e0aa3dbc4cc71b
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.