diff options
| author | David Bremner <bremner@debian.org> | 2023-12-01 07:51:09 -0400 |
|---|---|---|
| committer | David Bremner <bremner@debian.org> | 2023-12-01 07:51:09 -0400 |
| commit | 126347b6942dd4b0291beb67b119431ebd750a2a (patch) | |
| tree | 532c5163cb0972c8b9e6c8b4577b86afb9c6a6a2 /test/corpora | |
Import notmuch_0.38.2.orig.tar.xz
[dgit import orig notmuch_0.38.2.orig.tar.xz]
Diffstat (limited to 'test/corpora')
319 files changed, 26784 insertions, 0 deletions
diff --git a/test/corpora/README b/test/corpora/README new file mode 100644 index 00000000..05ea386d --- /dev/null +++ b/test/corpora/README @@ -0,0 +1,19 @@ +This directory contains email corpora for testing. + +default + The default corpus is based on about 50 messages from early in the + history of the notmuch mailing list, which allows for reliably + testing commands that need to operate on a not-totally-trivial + number of messages. + +broken + The broken corpus contains messages that are broken and/or RFC + non-compliant, ensuring we deal with them in a sane way. + +html + The html corpus contains html parts + +crypto + The crypto corpus contains encrypted messages for testing. + It should probably also contain signed messages in the future. + Please add them! diff --git a/test/corpora/attachment/x-gtar-compressed.eml b/test/corpora/attachment/x-gtar-compressed.eml new file mode 100644 index 00000000..258a74d1 --- /dev/null +++ b/test/corpora/attachment/x-gtar-compressed.eml @@ -0,0 +1,136 @@ +Return-path: <anarcat@orangeseeds.org> +Envelope-to: david@tethera.net +Delivery-date: Mon, 19 Mar 2018 13:56:54 -0400 +Received: from marcos.anarc.at ([206.248.172.91]) + by fethera.tethera.net with esmtp (Exim 4.89) + (envelope-from <anarcat@orangeseeds.org>) + id 1exz1i-0002aa-If + for david@tethera.net; Mon, 19 Mar 2018 13:56:54 -0400 +Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: anarcat) with ESMTPSA id 718A610E04F +From: =?utf-8?Q?Antoine_Beaupr=C3=A9?= <anarcat@orangeseeds.org> +To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org +Subject: Re: bug: "no top level messages" crash on Zen email loops +In-Reply-To: <87a7v42bv9.fsf@curie.anarc.at> +References: <87d10042pu.fsf@curie.anarc.at> <87woy8vx7i.fsf@tesseract.cs.unb.ca> <87a7v42bv9.fsf@curie.anarc.at> +Date: Mon, 19 Mar 2018 13:56:54 -0400 +Message-ID: <874llc2bkp.fsf@curie.anarc.at> +MIME-Version: 1.0 +Content-Type: multipart/mixed; boundary="=-=-=" +X-Spam_score: 0.0 +X-Spam_score_int: 0 +X-Spam_bar: / + +--=-=-= +Content-Type: text/plain + +And obviously I forget the frigging attachment. + + +--=-=-= +Content-Type: application/x-gtar-compressed +Content-Disposition: attachment; filename=zendesk-email-loop2.tgz +Content-Transfer-Encoding: base64 + +H4sIAJX1r1oAA+xbaVPbyNbO19Gv6CF1K0mBrM2SLYOY8QoGbAzegKlbVFtq28KyJNSSF269//09 +Lclm35LJTebOiARbvZw+a5+npcPIDh08EMwoED58r0uEKyeK7FPKqfc+V9cHSZFVJZeTlWz2gyjJ +OUn9gNTvxtGdK6IhDhD6gF0cmDh8dtxr/X/Ra3Rrf0mVpaym5FQlc6orWl7P5hQpmxdzmi4qSj4D +Y2xSkLdq7XeuwQysPWt/WZIVOba/LGqalJPA/jktJ35A4neR+MH1N7f/KQmjwOVbOBwX0A6NfN8L +wt8Tr8iY3nSXO+OPA3tku9jhO14BpXrYTIb8Ht9mcMhViGPPSECsF0edEpPAMKuAhoE3RVNo9mhm +1Y0+O56JnbFHQ/QHbAIZEX6kf3/hfhkskZUssLwzugUDh/biC5rb4RhV241OC9kWkrJFVZHEqqiK +3C9DL0A7z7Czu406EdlCkoIa4ASyKOXhV0HOFZQc4sWsKKLP1UrnC+ig7eMpXx4Tc0ICvkcCantu +AbHWIqWYUttFSiabkdBnoKLCXF7Of0Ge+1DEFakjMiNOAa1u2yEOI1pATW8LUdMLiMFLGRUF5Dqy +QaeGmhFRSGhIjVLxvNq+VMWtymG9cdmu7zWrlS3ul/iuVzyqV7b2O42jy9pxs3N5dNy/LMOX02K7 +kzQ3qu12ca+6dVruVS7rzctKs91nrRXuFxyFnkNw4BpjPEXru0tQoEkM10OzRGojlhMY3wvI0rFp +WGCmwUtiIUXVECWm51oUgcV8MM8IBoEoiobAYIkunle6hkDbD33EIkMSgA6yGd+ztIyNLSlzY9El +Ze6JPr/c/YekyxlJkzIS7GqSpKe+NF287EVt5kY1WS7HbpStfbUbaffc6IFkXhRKTwv1bM99eUSR +yfM5Au8boc5ReyZl5EQK0/bHJEDFarmyzxerbVnV+PZ+EbxT1QT4jwZ2SL+wyU0PmY5N3BCZJAjt +oQ0CktjxwN2ItYq9F23wnAbL2Ww+q0lFuShKr6qwTyxQYfZWhSKoUCpkRbTJ0gT63O2U36HC9U6S +ib9Z3hRDjD7aVZ4n8MzmUiqWq2VZlHM5XftamRT9JZluiGsROkm4mHvBRHrOF0AMSc5AalbFrxVH +L5WknMzScFX9k8SpgAMVXhvL1UDUAtqzwyM8QO0k7zydgE6J7yzjrPKW0Wxc8Z4Ez0vENQhs3iPC +1yuQ/HQlp5801AtFv1QxzmsDSckOzeHgUsplAQANTT2HZXOg582cpOetS+oHUfj7HWvtcnWXv+X2 +DsH7o55cSoVslWVLkcH9pbRc9qml2tHgipiw+Z57UbDSTKqQVfiiMYaNmBAXGhIX4xr2lNzmLykj +cmXPDSH8+c7SB7NNIye0fRyEAnZCErg4hGnbHBp4kWvhYGls8LxhXE6BDBu1Zl+XMAjzWFOypGU3 +YL45xgEloRGFQz5/u2aAXQpbC191Tc+CXayAcrAzQXIpQv4BXVLfcynhmcUDsBWY1nG4uA/kn9ph +yKKG5Sp+RFwSgOdZMLmBbYcEBXSRKAwl99CRgpQlHzOwAO1BGgY+bIvP5lVFy+miLMt5GJlO5Zmb +8kXTBPFDvg6LgVxDmYgcS7h82x6BhqIAFIdmhrSNsBFQzNMxhj12G5lGAJlxQSwh/dxGlnHHiqCX +a8NyqRAuwm1EV11AJzQAjYt6HlC4zrQ/NpRNOdob+eOjA9ITx7WS2r7qdxZd3PA79SNrTq8ts7G8 +tptddWTAjLFhsTBkG0ohiF0y9Arwb5p6vG0VbJdf99DUm5hd+TTRF8zUSiHzjPXNymQkNRljzzgy +G/Ogrzfz+pV442Fts0lmvd5hq7dcqBPVy17NDhzizlsnh61KLWfnG/kDf7h57Cw2ezUXq6Q66YkL +pxYe1azRebBnXWiT3nH7qnR81VfzWAoWVDmzRq4iir090eotdGtfEMpWcZSjEC65aqPeqmXdUjXn +BV4w3FzOTFKpn8tndauy31ke2KcTTdZPz9STzRPjK03Hge1GkEQcQDGTyM/cteP/ihkPi8L1/szO +iaMDoX5Fg9HeZrNfypYOdHvzpNs5L0/y43arNtwTivsDyTpzrIDcXC33RktJGeXV3l4Qnkxvjqwr +eeDX/H1ltF+JDs91dzZoNoh/le+PvRHBfpdG+PrcOVnsh2fyvjsrDejgeKYuOuc3m1HPOSlNatHs +tGtP8y0tS2oz/8yiE41cn12U+62uV5meluoGBGm5UazybQaXC0hc3cPm7yypDXvFzIDkiMyZUTlo +j/dPawOwqoToFH6FgQFnA2y0XMc5HjQkd+HOLYWqejAVvBPDKEhSDjzi0C4vDiriYrNF1F6xfXI4 +PfcOAnMZHXswRGcU6hOzM9mviMOLRrEgiTDp4sKNzsODidf30hZf7FuNKh4W4SrkoaHIF5f62UxJ +GhiZmyKuRxd86JxUJVO1nIYNk3UYelI9syrHchQq5ym1DolOrhs6vZ3cbk+Pa9VieU1f79jl42sq +t7JLOgi7XbN6YVbPvSXNFxnfMEKdNaIbrB8oZvekeDNeQG5mlC77l+3LXA8w/Em62jC4yRaj8ogf +d1kL25p76UHIut1hEwhaduA41EM8Kh9Vi80/xUD9iXM17VnnEzyw5ovh9awYNI+/0UAzudI6mam8 +M5y/0WSMzn2bobebjE2+bzP0fpMxIk/YDL3FZKtse0TcETvmZ3NanuM4nn9/Kn+AFlgOFXwHkPV7 +Uvx15EGe5v3AdkM8cAjHffzIoxYcNylBbJdCS4Zp4l0N4YE3g9axTZFjuwTxHz9y3L79AONtcVxn +jN0Jm4kYimX7HDZD5pX3UWOGASZkYjelH3oJccK2dnZIxQbnQjNohfVhy0IumSPbBapTQENwpI+n +QK8NMQD0+mNAF/HCc2yHW/G3KV6ioe0anIXGxPGHkXOPApxEmISWZ0ZTUFLSCGuPw9CnBUGADpq5 +RbUZZIC9GN+eDzDHSjhO1mcHbQpRyCSNKAK5YkluxcQOhSNeQNixLplicBTNbByzMCcDpq/p3dVT +FHmHAWFsCsTlIyqkyJIKoJQM6hgcKCKezxiCdSHUrZWC/MCzIjNkCvkUkHSPwG6iEtC4SyH9xlyw +FQ2OIdeQ4GkMW7HjxEQswshSMILJcl4QWwywKCS3kNGKXQVWAj9K9dQnyPG8CWNrjoOYG7YgW5yZ +BnCk58zWPpYAZTqGxZ3lrxxXYrcBGcFMugVORVb+wzjjuIodL4kmrjf/ba3jCSE+bFnYnCBvGLMO +H/ECicZpLDaIY4NnRnCSdsEIiMYPfVK9rNTAlMCMArFBgiE2ya+oZ1P7JesAKUaeAqKBaQ8sP/KQ +ZQP8DxNfX6kTwioK7/lR7AAG95ILrI2vy2pWBs9nDwqgD3zYSsVgJksmA6n7gsRxiVkvCWz4Shbs +C+APAuHi4lFqoLXOMqgax6TpGRxbArTIpBqAT9jDoW3CSYVJNPQcx5tnwDSe+ymMDZOQWWkTJ+gd ++ZhSOE5bv6HSMgmSJGa2WNCsBs3B9QwODht8EjJWzDWz+CAKkyC3wbwuSdwcnImEqQ+m5CHuwTUz +6JQpC0INGIh3kHX/nUhL1XsHSgpwmBkLM1lwPFCIsJp0GTBSbLepxeLGerZdGgYQYLB5ULalxDG3 +WiXhLNnVgNERe/oBQkIMASrlvCdVlEHNRHmJkKBptj2z6ZSQp9z61ySLvHRBCK13V/gC9ifBzGbe +wJ51JLG1hequmQETrq4/kgMyz07I/zb+vFQ1DqfOt2WqnV8rx+XOeauKGC3U6paO6mW0wQtCXykL +QqVTQWfsSSs7WqOYos3sgx1BqDY30AazPBh+Pje4eWauZLxgJHROhQWjJrHp6dcEoKdzM1Zobexy +O6yHfRBs7XII7UwhmGNf4tlz4pmhVDbuCr2BUrTPOm7lX4uvVGIFGNwGEmJ6NFw6SQZezzAp3WB9 +CIWJL1joP/EtQgNwM9CWCQ6JfQoqXn3bjgf8H6MoxCSBZyFhemfgWZCvWCNbYm5bDJBIovivX+0p +c0XswhEKTljg/AAZt8GfrcQU4nbMx45lz27nr3sl0V+g7Rgh8LDLjsZwtJfy/mIbwhe0McRT21kW +0KejyLQtjPYMDtRrkU9bPRJYsPlsFQMbO1sUdM6Dg9rDdCK1b0AwSWaUQDwvKHzMxtd2qpX7/CRD +0MeByn5gzNuAjcGtoM2OAPRSyv7uY5izI/i70PFmrGNwr6GdN2Mdg3sN7bwZ6wDCYmvvgPMGZMgU +9wzw2QC2HdbvAq6IH0EHG7v3xhrc7egdAe9mUKqi96MlSKNP46Wn0dIT3K+zpsG9Ap1eFOxe8jW4 +F8gkEnfeiMHA6V9FYW/EYJDcX0BhqQneBsRA7U9CsZTIPTy2Mwhgq3oAytKBgMwSUt+OzSCgDe49 +2OwlX7BBV29x58eQi1n3PrK7Ded3Y7uHLBrcG2He60yDX71MInHTF9FiqljYGb4ZLaZY0eBeQIsr +n3kbZIRj3Kug8Y2QkUGv10Djk5DxsYsZ3LvwI6z5rCkBW74TjQK1xKoP8ajBfQ0ifRKPQuC8H5Ey +y8bII06kO9QHO63y86c0hdfi69PuPZgJWAXG7u4IDKLEiCVBWyzB2yGZUhPSSfxtBZBSLEfNMQgV +I7nYBdOXShu3sMCyqe/AjrIsuJ5LNnZT2MBowZ7psyE4VtrG21aCgBsJPZvMi8ms3RgvgGdO7tGM +AmfjhX0pNjZEydNBLyREY4h5l6iLp/eBJeMj1r7BgYexaYnuk99fCd7h3PCjK2P+HtdT9V9y5lRS +JFXKaWpeVHN6Ts3ns+LXF4C9Vv8lyuK6/ksVFVb/lctK/9R//Teu/8X6L12vFtVvqP9SxIKq//D6 +LzmTf6r+q9g/2kpqwMQfXgP2TKXWMxUoL3c/qNTS3lOplVdK+do3VGo9NvjjMqNnSp+e7XlQqaX8 +lyu13l4FFGuwokga7PG6JGez361S6xkVvr1S6+3lZ3H1WbVUrspSuVSVf85KrfeJU6xVS1oizute +/rer1Hpv+dQ3VGq9tyhsXam1Ppq6XvyYYx4fJf3fvltRFs4puvWUUvKS9NcqypLyP2VRFhlqN165 +oUuji173Cotdunm1lLs9s3W4SZvjC8+cuYqiTIY31R9QzRPOWsv6jVKea5KrRjK1j+3lqV1tFA9J +ZVqN5EpjJLWpqmQ3xVZrNuiMgqgf9AcXE+fgZqlqp5V6y86OvcPNrq2NbkTBHmud5cnZnhb6tQa5 +yC7qWX3veulH0ol85kndWaT1W+cVkndzFbl0IOTnLW0zur7YrPhFnHOspi17/n5vNrW0vcNydCQO +m3mnP7Mq0+yPLcr6uc1Ir498tecfDoOlM+rIzdzNYE4qVLFMs3rWyGbn3qQhBAv3Iqv7ujA/rxw0 +G4PhsJRfnp1dYKl0IB6eDh2hW7v2Wvnzi9Z5kJPxZlXWpe5o8+ZakrsHttroyz133mgdLIr+5pk+ +PiG6WLxpErNUuTruurp6bZcP3Vnvahx2hKMeaU310qA5znfnZbWvXI+F69pVb/KeoqzTxrGVHVxv +/hxFWWzWdNY8xAvXGbv7IZ87qJzW6XM1WHbZPpbdw8XeeLQq8SkuOmU6j/hnirweFW49KgJiRF4v +3Ko07bl3SDRvOVxWrvDZk0VAjNSDKiAYNArq067bwycVcrg3lTsdr14syPL3Kel63rw/T0nX39Xg +jwrCNEl5oSDsJRjxkxSEvVaF8KAmgXvwWjXGvpKyFf/ZjhT/FRLHziDxKjalEfn35wc1G/HT8YSK +MMcONOGJJ8RjqSCpX7bYw++AIMszOELZawZKyJQ9uWYPsd3lGg1m0DJ5GxC/12GPtZOJsPIUogzu +oNlz2YN0VlNjw4ERwxnQS56uU9siAxyw1xGA4tNH7n/EbCD2x1mg3ydZ/2JwyGYP2sMImF8iipc0 +eYgfT2Vv/7RbFjlunghjszdlHlhljWVH3m8/uAjkve75TxHIP0Ugf5kikHuUE5UApvThyKP6iw0E +QBTz64dylQ15Y3cnsVGsVdYkiQYn/gvcgDhOqirWLCYt1MfmbUtizeSGvcgJg+QtEBh8RQ8chVlq +4yn9A0vMXKlPxGxK0GR57EiIPpoq+9lOXlcBVdjNHrL6NYwyTkB5ibsygryDQcVhYWizI8JquVtx +Hl9MwBl24PSRSAisPyWgmIoYf2yj1HGz4HZ3Vkkp2tMRKyV24ri7TTcbKPFM1pplvAfmvbdzxITT +T2YU4BlYNkiyTPzV4ARFHUhkIIqiCacXrCoS0YaKaWr5vDYksiX/xhwVqP1/O2e32yYQROH7fQpk +KelNaQA7TVW6lnrTF2h7XYEgjpWAkXGUKk/fmeFvzQKmaVRZyvkUyXgJy3J2dnYHxqy8yygrwiS9 +jR7l/FL7xfLrRfCN/qhVZclPzI1giYq3GcUuJW0Env+RPurD3er07ifvQ5FvpGLWfVPpQ3ObNL8e +bRz09wcg9WnId7u49LPDD0BD8cNuQouXveQISTFVFTruUxrfbw9ubUL7KNnybXGR2812z4M7rDKt +qEM6s2Kdr47658vVIRk0BdPSxRzZLw4YgumeFp3piOEcn6loD6eqhv1Q7YWa79/J/zg/8y3NP73S +1lNp9f5HdLfLolFnJcIMeMLahcQ0JPmunhfSOsB0K8fetnF3fuwnfmoZeQ+qimaP/S7frI/XVzwD +SPH4sfzYvldVp9w/6aaVqdwp3ZaWbsF1q5tWnXL+tSHnhHSxYEmnlbXknJBjXDaaHzhv7SEqSxbq +OXHrldnCnpCCOEiD25HZUNTTqtXPktl5V0lHW42WzpiKq+K3Vn0dg06wZq6g2ao43U6t7Ja+sJ1a +2S2d007Os5I0DXJwi7WEBloZwcFAAti8OKFKyVFVUk6VnOQY2Tm04NpvZJW2+BU/RPl9l3o1XD/N +OL0zcJqOEY3Mj0X4FwqT0cj8WIR8exeNTGtl5CgNysG5LycFkWs+Gd/wwGkuvEoIe8mYEUvU6jXG +jFgiafU3tjgVmGkllyXLyRm+xJwU6UuzWKLNKOYF1tr4L9kve6i8XbAi6+rss66momVkXb056vyv +PH06h/e/Lb0b35P3v3krvP/tf1D3/yErzqX//er9f+h/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAABg +lD9gaWU0AHgAAA== +--=-=-= +Content-Type: text/plain + + +PS: don't we have a "you forgot to actually attach the damn file" plugin +when we detect the word "attachment" and there's no attach? :p + +--=-=-=-- diff --git a/test/corpora/broken/broken-cc b/test/corpora/broken/broken-cc new file mode 100644 index 00000000..57ae9ba9 --- /dev/null +++ b/test/corpora/broken/broken-cc @@ -0,0 +1,9 @@ +From: Alice <alice@example.org> +To: Daniel <daniel@example.org> +Cc: Bob <bob@example.org> +Subject: wowsers! +cc: Charles <charles@example.org> +Message-Id: <multiple-cc@example.org> +Date: Thu, 16 Jun 2016 22:14:41 -0400 + +Note the Cc: and cc: headers. diff --git a/test/corpora/broken/loop/loop-12 b/test/corpora/broken/loop/loop-12 new file mode 100644 index 00000000..b5c3af7e --- /dev/null +++ b/test/corpora/broken/loop/loop-12 @@ -0,0 +1,8 @@ +From: Alice <alice@example.org> +To: Daniel <daniel@example.org> +Subject: referencing in-reply-to-loop-21 +Message-ID: <mid-loop-12@example.org> +In-Reply-To: <mid-loop-21@example.org> +Date: Thu, 16 Jun 2016 22:14:41 -0400 + +Note Message-ID and In-Reply-To: in file in-reply-to-loop-21 diff --git a/test/corpora/broken/loop/loop-21 b/test/corpora/broken/loop/loop-21 new file mode 100644 index 00000000..234f0323 --- /dev/null +++ b/test/corpora/broken/loop/loop-21 @@ -0,0 +1,8 @@ +From: Alice <alice@example.org> +To: Daniel <daniel@example.org> +Subject: referencing in-reply-to-loop-12 +Message-ID: <mid-loop-21@example.org> +In-Reply-To: <mid-loop-12@example.org> +Date: Fri, 17 Jun 2016 22:14:41 -0400 + +Note Message-ID and In-Reply-To: in file in-reply-to-loop-12 diff --git a/test/corpora/crypto/basic-encrypted.eml b/test/corpora/crypto/basic-encrypted.eml new file mode 100644 index 00000000..b139a735 --- /dev/null +++ b/test/corpora/crypto/basic-encrypted.eml @@ -0,0 +1,27 @@ +From: test_suite@notmuchmail.org +To: test_suite@notmuchmail.org +Subject: Here is the password +Date: Sat, 01 Jan 2000 12:00:00 +0000 +Message-ID: <basic-encrypted@crypto.notmuchmail.org> +MIME-Version: 1.0 +Content-Type: multipart/encrypted; boundary="=-=-="; + protocol="application/pgp-encrypted" + +--=-=-= +Content-Type: application/pgp-encrypted + +Version: 1 + +--=-=-= +Content-Type: application/octet-stream + +-----BEGIN PGP MESSAGE----- + +hF4DHXHP849rSK8SAQdAYbv9NFaU2Fbd6JbfE87h/yZNyWLJYZ2EseU0WyOz7Agw +/+KTbbIqRcEYhnpQhQXBQ2wqIN5gmdRhaqrj5q0VLV2BOKNJKqXGs/W4DghXwfAu +0oMBqjTd/mMbF0nJLw3bPX+LW47RHQdZ8vUVPlPr0ALg8kqgcfy95Qqy5h796Uyq +xs+I/UUOt7fzTDAw0B4qkRbdSangwYy80N4X43KrAfKSstBH3/7O4285XZr86YhF +rEtsBuwhoXI+DaG3uYZBBMTkzfButmBKHwB2CmWutmVpQL087A== +=lhSz +-----END PGP MESSAGE----- +--=-=-=-- diff --git a/test/corpora/crypto/encrypted-rfc822-attachment b/test/corpora/crypto/encrypted-rfc822-attachment new file mode 100644 index 00000000..e7bad9b0 --- /dev/null +++ b/test/corpora/crypto/encrypted-rfc822-attachment @@ -0,0 +1,47 @@ +Content-Type: multipart/encrypted; protocol="application/pgp-encrypted"; boundary="===============9060418334135509864==" +MIME-Version: 1.0 +From: Notmuch test suite <test_suite@notmuchmail.org> +To: test_suite@notmuchmail.org +Subject: testing encrypted rfc822 attachments +Date: Sat, 03 Jul 2021 16:00:02 -0300 +Message-ID: <encrypted-rfc822-attachment@crypto.notmuchmail.org> +User-Agent: alot/0.9.1 + +--===============9060418334135509864== +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Type: application/pgp-encrypted; charset="us-ascii" + +Version: 1 +--===============9060418334135509864== +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Type: application/octet-stream; charset="us-ascii" + +-----BEGIN PGP MESSAGE----- + +hF4DHXHP849rSK8SAQdAtWMNBhjdh9Xyig/GYM1RN27B7LmCk0oRkguuFMROXk8w +wLmcm3HiikqziJzlPY8sBLEx7cLQCkCrg6KarCHGvcqajUJluLAZgrwUsmUpOFy0 +0ukBQ6EnlpNlxdcmOElG9ZYn2Dgp1Gq4eo9rHb9f/TBLxuTr1Yr0vZ5f38bVn+tB +0FupuYE5h/PAM2JPjVg4rh1pIN2yWvNdFBHCm0Yt3AquS9bwQymUOjh0ZCey5ERy +WJtUQ7u+f2Hfm5K9CPPqlM7GPqeR8nv2/cgJxsA9nGn4tco7pHEkM1Kwe1dLlTbh +ZqEMKu+dVK/RqRUjDVdAonM7wz3Uah6HJH3a6W4g2mPiPPkOpnbTClCLiK0H8NRv +9rbO69kHoNar0YTpTAAbkxlKkdKeM/xAS2UFIdE+tXSofeCHmsFCmcohKH7Rt66l +rU7BJE7dtTiaPFYgHBuzbrkA+oH8gU9l7PQ1L16zo1rRVRb8IIBPSHY64Ekpy3L4 +FQ3Ttg8e26d2X+6eGca6RIXksTfqOniC33Fal6gBIUqP1w4ky1wjJ+wujkSuf0QB +yFWPP3o16o9X3nEIa2L8v/engSM5p7pezZfVJej/5hWnuPP3YmbDpn0ir21Qye96 +qxq7XI7GSWukxisxC8WakNA1LHnXo5DvHB8wm3lJIfEfIJ9RHhZqyRMptC563XCZ +A1NvY+4sKgx9g8PBRai019ZaTMYJRQqE3VlU+xHbJWMf4aymYyeY8ut8HvFhC9Tk +4D3eol7/LgHhXA9Db4L5MJX8iHtXhqyt62vmMXcFzC1Wi8Co/HnchzGQx2vXnUIZ +IlomEAvN1RZC2UV8q2NHKzKnfr43WfnIsdt1fQwEfQeTKX6wfhq8FDR5NmEeLeTw +ddGA95bZEkT2xYh+2g7G1c5Z33l5WLeriA/SUMWK1oafUtcx81lJnmK/xSIg3PKZ +jKIbTwv4tKjmGUJE5xb/RTUfOTG+v7HOBo0avwofvqz5k7Do8v0BEEmhewjcIKBf +h2Go8VxFtDj/OG0J98PS3OVQtnv4jzepXUxr2ZW7Z0aPFUHQ2F97Yio3nxb7r7um +OjKhNgIPp+iAWisqqw+kwWxPx/5GHxVYsOM+fqpFEjELGGNv+ImTG7jS1V5agqIr +qU+dxYydDKnQi/5xXeE4TO0MEFhCIttOQARw3DPtZmjLuXFjqvaasTV4YyXwrKCJ +0sfemg3wxkZxY0NI13g3CaJGtSzXdZVfkzpdVxRAZoETT7rLNDbawuq0AzSava2u +nB/vgcDWfPr4jW21 +=r4Vv +-----END PGP MESSAGE----- + +--===============9060418334135509864==-- diff --git a/test/corpora/crypto/encrypted-signed.eml b/test/corpora/crypto/encrypted-signed.eml new file mode 100644 index 00000000..f5d5d120 --- /dev/null +++ b/test/corpora/crypto/encrypted-signed.eml @@ -0,0 +1,34 @@ +From: test_suite@notmuchmail.org +To: test_suite@notmuchmail.org +Subject: Lyrics +Date: Wed 29 May 2019 06:09:22 PM EDT +Message-ID: <encrypted-signed@crypto.notmuchmail.org> +MIME-Version: 1.0 +Content-Type: multipart/encrypted; boundary="=-=-="; + protocol="application/pgp-encrypted" + +--=-=-= +Content-Type: application/pgp-encrypted + +Version: 1 + +--=-=-= +Content-Type: application/octet-stream + +-----BEGIN PGP MESSAGE----- + +hF4DHXHP849rSK8SAQdAwRMXQWEiw2ZldkVtILgy2w/vFrKxAgAxFmyDGvtbiTow +xLMHH7PgH+S0JIjEOM0jFglpyMdzvNBWII726THKbFnOcR38CsbK55lCYw2uhABS +0sD1AU/yQZNNDwjuJT6wjtxMdfI4DaFMD5XTpioNtRcphLpN7MHbYr4MYCxszRY7 +ZLIAkUCoY/3D26dcOkB0EMGELsRsPmKaCq/m3FVvxHHku94MzLnjV/eGRE40AiSe +JzteAKwXzUAYzYw+LCj9WPZvy1Rs37I4VgukEgSYXMidgc9fUQ4yYKesbyQ8/iMW +Ryo+X2yu7Iv3a7pp2qdArsJwatWpyRuASVVA7nZlNQS0YGh/fuSX3x8TJuSPliFr +sdTVuE6sJIlqttH9CRgxMjLY5YbpF3lBTqlv2tmz0VERhWKKsh5VOiUvJvZ3p5hn +FqnD1bcoWoBPZRNOoF6PzGkvWQIqysGLgg24wZr7ZRgZ8mHRgykBN6cmZHQKf16m +zqqf8sppaRal6d/L72EzmeHEusUn6FlWcEDlXLc5anghYdna7qhbLqsoY7X504SQ +Mx4tj1P4XVhgoXdLRR2EHOLrzUCrkiQ9cKfoAcUFJTcbGGYYiYwzUCkZWhsHOKsQ +y7tajvWUzGaJ8aiZ1dfdUraOzrvOOif4TdnFJrTpM0Agy6IH8tbm8EnhNOxkjQPr +3t7eS3JcuC0= +=qz8x +-----END PGP MESSAGE----- +--=-=-=-- diff --git a/test/corpora/crypto/simple-encrypted b/test/corpora/crypto/simple-encrypted new file mode 100644 index 00000000..6869972d --- /dev/null +++ b/test/corpora/crypto/simple-encrypted @@ -0,0 +1,36 @@ +From: Daniel Kahn Gillmor <dkg@fifthhorseman.net> +To: dkg@fifthhorseman.net +Subject: encrypted message +Date: Mon, 22 Dec 2016 08:34:56 -0400 +Message-ID: <simple-encrypted@crypto.notmuchmail.org> +MIME-Version: 1.0 +Content-Type: multipart/encrypted; boundary="=-=-="; + protocol="application/pgp-encrypted" + +--=-=-= +Content-Type: application/pgp-encrypted + +Version: 1 + +--=-=-= +Content-Type: application/octet-stream + +-----BEGIN PGP MESSAGE----- + +hQIMAzt6p/AU5ptaAQ/+IDRx5dZWKjUz9qITP76w8OvtmTV9p871UoGWil1DSd3J +dHgf56rXDWS73dzJ5EigevxLVMD3Xv8QEJBgMWb6yC+uR8ZdJ8h7hlE2lYyEg3Ch +smqzcaYp2nKWw9JZQqubsMaeIgVu0exb4YE8g/qlUOL2mD64dXhnkJ68GGMmiEPJ ++d0H7fTMwstbxvKPKDmFJUztH43V2NSfxpeQUTi4iWmQtUGw6THYjjAWNFy7jVEE +ozloT9W3ER5cRaXyKE4GWMBlUAOB0YwwsVnBU2JGUtTBzNHxQAbeoKrG6myrzmnC +LhUNag0gMuNEbGR78XfWKpCbccEC1VLf9uUXze6yeuRXDuhfsvilKOH9MpaR9n+G +JuYVAAobDc5wGOt5VGMka50ToaALrNt3FrWqni/0jqwqshEVKM3Kqzq6cSjh1TPf +pfxE9aUDdvf+Nn16ZBGgyLox2NV4GkSQYq2ySzAk3XwLU80F0nCmtOV3EH+OMrv6 +sZI/Svwzaqzrs/w17cvpf0czXjE/N9V1MHdNtIkfb707WkO0l9/wtYvlrg/KyrU2 +FH5aecEO9VpMumgzBqP1MrrnzVlSM3kgRLIu06oshQYD+jjFn2YzvkwZ+pWoAxsQ +ninQxoF8Ck2D7s8uGzx+HSQQpRVBM5AGfVdEkmzW/sZrlz63ZGUFh0FYqLl30rfS +cQGqSoZz0ugTSxnTlg0nuzFmG7ylC1cx3dlSrnfv+l1azwLAr58ptoYZ0mO+D+Fy +bePpCGoFAPKi0cZ/4eFlLKL7uYPmGeEo5Ku2wXU/SXtPfl4vRxzvPXTJTvD06vIx +Dh1P0ChAJtxUjGGY6xkCHMY0 +=frmz +-----END PGP MESSAGE----- +--=-=-=-- diff --git a/test/corpora/default/01:2, b/test/corpora/default/01:2, new file mode 100644 index 00000000..7e9e3490 --- /dev/null +++ b/test/corpora/default/01:2, @@ -0,0 +1,34 @@ +From: "Mikhail Gusarov" <dottedmag@dottedmag.net> +To: notmuch@notmuchmail.org +Date: Tue, 17 Nov 2009 21:28:37 +0600 +Subject: [notmuch] [PATCH 1/2] Close message file after parsing message + headers +Message-ID: <1258471718-6781-1-git-send-email-dottedmag@dottedmag.net> + +Keeping unused files open helps to see "Too many open files" often. + +Signed-off-by: Mikhail Gusarov <dottedmag at dottedmag.net> +--- + lib/message-file.c | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/lib/message-file.c b/lib/message-file.c +index 8a3f8ee..197ab01 100644 +--- a/lib/message-file.c ++++ b/lib/message-file.c +@@ -325,6 +325,11 @@ notmuch_message_file_get_header (notmuch_message_file_t *message, + return decoded_value; + } + ++ if (message->parsing_finished) { ++ fclose (message->file); ++ message->file = NULL; ++ } ++ + if (message->line) + free (message->line); + message->line = NULL; +-- +1.6.3.3 + + diff --git a/test/corpora/default/02:2, b/test/corpora/default/02:2, new file mode 100644 index 00000000..dadcdaac --- /dev/null +++ b/test/corpora/default/02:2, @@ -0,0 +1,32 @@ +From: "Mikhail Gusarov" <dottedmag@dottedmag.net> +To: notmuch@notmuchmail.org +Date: Tue, 17 Nov 2009 21:28:38 +0600 +Subject: [notmuch] [PATCH 2/2] Include <stdint.h> to get uint32_t in C++ + file with gcc 4.4 +In-Reply-To: <1258471718-6781-1-git-send-email-dottedmag@dottedmag.net> +References: <1258471718-6781-1-git-send-email-dottedmag@dottedmag.net> +Message-ID: <1258471718-6781-2-git-send-email-dottedmag@dottedmag.net> + + +Signed-off-by: Mikhail Gusarov <dottedmag at dottedmag.net> +--- + lib/message.cc | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/lib/message.cc b/lib/message.cc +index 72c350f..a4b090b 100644 +--- a/lib/message.cc ++++ b/lib/message.cc +@@ -21,6 +21,8 @@ + #include "notmuch-private.h" + #include "database-private.h" + ++#include <stdint.h> ++ + #include <gmime/gmime.h> + + #include <xapian.h> +-- +1.6.3.3 + + diff --git a/test/corpora/default/bar/17:2, b/test/corpora/default/bar/17:2, new file mode 100644 index 00000000..d3b75685 --- /dev/null +++ b/test/corpora/default/bar/17:2, @@ -0,0 +1,23 @@ +From: "Israel Herraiz" <isra@herraiz.org> +To: notmuch@notmuchmail.org +Date: Tue, 17 Nov 2009 23:57:18 +0100 +Subject: [notmuch] New to the list +Message-ID: <1258498485-sup-142@elly> + +Hi all, + +I have subscribed to the list. As suggested by the welcome message, I +am introducing myself. My name is Israel Herraiz, and I have done a +couple of contributions to Sup, the probably well-known here e-mail +client. + +"Not much" sounds interesting, and I wonder whether it could be +integrated with the views of Sup (inbox, threads, etc). So I have +subscribed to the list to keep an eye on what's going on here. + +I have just heard of "Not much". I have not even tried to download the +code yet. + +Cheers, +Israel + diff --git a/test/corpora/default/bar/18:2, b/test/corpora/default/bar/18:2, new file mode 100644 index 00000000..f522f69e --- /dev/null +++ b/test/corpora/default/bar/18:2, @@ -0,0 +1,12 @@ +From: "Aron Griffis" <agriffis@n01se.net> +To: notmuch@notmuchmail.org +Date: Tue, 17 Nov 2009 18:21:38 -0500 +Subject: [notmuch] archive +Message-ID: <20091117232137.GA7669@griffis1.net> + +Just subscribed, I'd like to catch up on the previous postings, +but the archive link seems to be bogus? + +Thanks, +Aron + diff --git a/test/corpora/default/bar/baz/05:2, b/test/corpora/default/bar/baz/05:2, new file mode 100644 index 00000000..ce174b52 --- /dev/null +++ b/test/corpora/default/bar/baz/05:2, @@ -0,0 +1,104 @@ +MIME-Version: 1.0 +Date: Tue, 17 Nov 2009 11:36:14 -0800 +Message-ID: <cf0c4d610911171136h1713aa59w9cf9aa31f052ad0a@mail.gmail.com> +From: Alex Botero-Lowry <alex.boterolowry@gmail.com> +To: notmuch@notmuchmail.org +Content-Type: multipart/mixed; boundary=0016e687869333b1570478963d35 +Subject: [notmuch] preliminary FreeBSD support +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + <notmuch.notmuchmail.org> +List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe> +List-Archive: <http://notmuchmail.org/pipermail/notmuch> +List-Post: <mailto:notmuch@notmuchmail.org> +List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help> +List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=subscribe> +Sender: notmuch-bounces@notmuchmail.org +Errors-To: notmuch-bounces@notmuchmail.org + +--0016e687869333b1570478963d35 +Content-Type: multipart/alternative; boundary=0016e687869333b14e0478963d33 + +--0016e687869333b14e0478963d33 +Content-Type: text/plain; charset=ISO-8859-1 + +I saw the announcement this morning, and was very excited, as I had been +hoping sup would be turned into a library, +since I like the concept more than the UI (I'd rather an emacs interface). + +I did a preliminary compile which worked out fine, but +sysconf(_SC_SC_GETPW_R_SIZE_MAX) returns -1 on +FreeBSD, so notmuch_config_open segfaulted. + +Attached is a patch that supplies a default buffer size of 64 in cases where +-1 is returned. + +http://www.opengroup.org/austin/docs/austin_328.txt - seems to indicate this +is acceptable behavior, +and http://mail-index.netbsd.org/pkgsrc-bugs/2006/06/07/msg016808.htmlspecifically +uses 64 as the +buffer size. + +--0016e687869333b14e0478963d33 +Content-Type: text/html; charset=ISO-8859-1 +Content-Transfer-Encoding: quoted-printable + +I saw the announcement this morning, and was very excited, as I had been ho= +ping sup would be turned into a library,<br>since I like the concept more t= +han the UI (I'd rather an emacs interface).<br><br>I did a preliminary = +compile which worked out fine, but sysconf(_SC_SC_GETPW_R_SIZE_MAX) returns= + -1 on<br> +FreeBSD, so notmuch_config_open segfaulted.<br><br>Attached is a patch that= + supplies a default buffer size of 64 in cases where -1 is returned.<br><br= +><a href=3D"http://www.opengroup.org/austin/docs/austin_328.txt">http://www= +.opengroup.org/austin/docs/austin_328.txt</a> - seems to indicate this is a= +cceptable behavior,<br> +and <a href=3D"http://mail-index.netbsd.org/pkgsrc-bugs/2006/06/07/msg01680= +8.html">http://mail-index.netbsd.org/pkgsrc-bugs/2006/06/07/msg016808.html<= +/a> specifically uses 64 as the<br>buffer size.<br><br><br> + +--0016e687869333b14e0478963d33-- +--0016e687869333b1570478963d35 +Content-Type: text/x-diff; + name="0001-Deal-with-situation-where-sysconf-_SC_GETPW_R_SIZE_M.patch" +Content-Disposition: attachment; + filename="0001-Deal-with-situation-where-sysconf-_SC_GETPW_R_SIZE_M.patch" +Content-Transfer-Encoding: base64 +X-Attachment-Id: f_g252e6gs0 + +RnJvbSBlM2JjNGJiZDdiOWQwZDA4NjgxNmFiNWY4ZjJkNmZmZWExZGQzZWE0IE1vbiBTZXAgMTcg +MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4YW5kZXIgQm90ZXJvLUxvd3J5IDxhbGV4LmJvdGVyb2xv +d3J5QGdtYWlsLmNvbT4KRGF0ZTogVHVlLCAxNyBOb3YgMjAwOSAxMTozMDozOSAtMDgwMApTdWJq +ZWN0OiBbUEFUQ0hdIERlYWwgd2l0aCBzaXR1YXRpb24gd2hlcmUgc3lzY29uZihfU0NfR0VUUFdf +Ul9TSVpFX01BWCkgcmV0dXJucyAtMQoKLS0tCiBub3RtdWNoLWNvbmZpZy5jIHwgICAgMiArKwog +MSBmaWxlcyBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDAgZGVsZXRpb25zKC0pCgpkaWZmIC0t +Z2l0IGEvbm90bXVjaC1jb25maWcuYyBiL25vdG11Y2gtY29uZmlnLmMKaW5kZXggMjQ4MTQ5Yy4u +ZTcyMjBkOCAxMDA2NDQKLS0tIGEvbm90bXVjaC1jb25maWcuYworKysgYi9ub3RtdWNoLWNvbmZp +Zy5jCkBAIC03Nyw2ICs3Nyw3IEBAIHN0YXRpYyBjaGFyICoKIGdldF9uYW1lX2Zyb21fcGFzc3dk +X2ZpbGUgKHZvaWQgKmN0eCkKIHsKICAgICBsb25nIHB3X2J1Zl9zaXplID0gc3lzY29uZihfU0Nf +R0VUUFdfUl9TSVpFX01BWCk7CisgICAgaWYgKHB3X2J1Zl9zaXplID09IC0xKSBwd19idWZfc2l6 +ZSA9IDY0OwogICAgIGNoYXIgKnB3X2J1ZiA9IHRhbGxvY196ZXJvX3NpemUgKGN0eCwgcHdfYnVm +X3NpemUpOwogICAgIHN0cnVjdCBwYXNzd2QgcGFzc3dkLCAqaWdub3JlZDsKICAgICBjaGFyICpu +YW1lOwpAQCAtMTAxLDYgKzEwMiw3IEBAIHN0YXRpYyBjaGFyICoKIGdldF91c2VybmFtZV9mcm9t +X3Bhc3N3ZF9maWxlICh2b2lkICpjdHgpCiB7CiAgICAgbG9uZyBwd19idWZfc2l6ZSA9IHN5c2Nv +bmYoX1NDX0dFVFBXX1JfU0laRV9NQVgpOworICAgIGlmIChwd19idWZfc2l6ZSA9PSAtMSkgcHdf +YnVmX3NpemUgPSA2NDsKICAgICBjaGFyICpwd19idWYgPSB0YWxsb2NfemVyb19zaXplIChjdHgs +IHB3X2J1Zl9zaXplKTsKICAgICBzdHJ1Y3QgcGFzc3dkIHBhc3N3ZCwgKmlnbm9yZWQ7CiAgICAg +Y2hhciAqbmFtZTsKLS0gCjEuNi41LjIKCg== +--0016e687869333b1570478963d35 +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Disposition: inline + +_______________________________________________ +notmuch mailing list +notmuch@notmuchmail.org +http://notmuchmail.org/mailman/listinfo/notmuch + +--0016e687869333b1570478963d35-- + diff --git a/test/corpora/default/bar/baz/23:2, b/test/corpora/default/bar/baz/23:2, new file mode 100644 index 00000000..9bb62d73 --- /dev/null +++ b/test/corpora/default/bar/baz/23:2, @@ -0,0 +1,145 @@ +Date: Tue, 17 Nov 2009 19:58:29 -0500 +From: Lars Kellogg-Stedman <lars@seas.harvard.edu> +To: notmuch <notmuch@notmuchmail.org> +Message-ID: <20091118005829.GB25380@dottiness.seas.harvard.edu> +MIME-Version: 1.0 +User-Agent: Mutt/1.5.19 (2009-01-05) +Subject: [notmuch] "notmuch help" outputs to stderr? +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + <notmuch.notmuchmail.org> +List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe> +List-Archive: <http://notmuchmail.org/pipermail/notmuch> +List-Post: <mailto:notmuch@notmuchmail.org> +List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help> +List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=subscribe> +Content-Type: multipart/mixed; boundary="===============1359248349==" +Sender: notmuch-bounces@notmuchmail.org +Errors-To: notmuch-bounces@notmuchmail.org + + +--===============1359248349== +Content-Type: multipart/signed; micalg=pgp-sha256; + protocol="application/pgp-signature"; boundary="L6iaP+gRLNZHKoI4" +Content-Disposition: inline + + +--L6iaP+gRLNZHKoI4 +Content-Type: multipart/mixed; boundary="z6Eq5LdranGa6ru8" +Content-Disposition: inline + + +--z6Eq5LdranGa6ru8 +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +Content-Transfer-Encoding: quoted-printable + +I'm just noticing that 'notmuch help ...' outputs to stderr, which +isn't terribly intuitive. For example, the obvious invocation: + + notmuch help | less + +=2E..isn't terribly helpful. + +I've attached a patch that lets usage() take a FILE * argument so that +you can output to stderr in response to usage errors, and stdout in +response to an explicit request. + +--=20 +Lars Kellogg-Stedman <lars@seas.harvard.edu> +Senior Technologist, Computing and Information Technology +Harvard University School of Engineering and Applied Sciences + + +--z6Eq5LdranGa6ru8 +Content-Type: text/plain; charset=us-ascii +Content-Disposition: attachment; filename="notmuch-help.patch" +Content-Transfer-Encoding: quoted-printable + +diff --git a/notmuch.c b/notmuch.c +index c47e640..a35cb99 100644 +--- a/notmuch.c ++++ b/notmuch.c +@@ -157,23 +157,23 @@ command_t commands[] =3D { + }; +=20 + static void +-usage (void) ++usage (FILE *out) + { + command_t *command; + unsigned int i; +=20 +- fprintf (stderr, "Usage: notmuch <command> [args...]\n"); +- fprintf (stderr, "\n"); +- fprintf (stderr, "Where <command> and [args...] are as follows:\n"); +- fprintf (stderr, "\n"); ++ fprintf (out, "Usage: notmuch <command> [args...]\n"); ++ fprintf (out, "\n"); ++ fprintf (out, "Where <command> and [args...] are as follows:\n"); ++ fprintf (out, "\n"); +=20 + for (i =3D 0; i < ARRAY_SIZE (commands); i++) { + command =3D &commands[i]; +=20 +- fprintf (stderr, "\t%s\t%s\n\n", command->name, command->summary); ++ fprintf (out, "\t%s\t%s\n\n", command->name, command->summary); + } +=20 +- fprintf (stderr, "Use \"notmuch help <command>\" for more details on e= +ach command.\n\n"); ++ fprintf (out, "Use \"notmuch help <command>\" for more details on each= + command.\n\n"); + } +=20 + static int +@@ -183,8 +183,8 @@ notmuch_help_command (unused (void *ctx), int argc, cha= +r *argv[]) + unsigned int i; +=20 + if (argc =3D=3D 0) { +- fprintf (stderr, "The notmuch mail system.\n\n"); +- usage (); ++ fprintf (stdout, "The notmuch mail system.\n\n"); ++ usage (stdout); + return 0; + } +=20 + +--z6Eq5LdranGa6ru8-- + +--L6iaP+gRLNZHKoI4 +Content-Type: application/pgp-signature +Content-Disposition: inline + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iQEcBAEBCAAGBQJLA0a1AAoJENdGlQYxQazYr78IAJtqTWIpBqSdOWqTzt/r4XNn +KJ5mWAoNfq4H+3kx3xoWOFYS7qAYeJoHQWCDbMdb+zEXvPX6hMFn9+OxRN+N5FdQ +uxGTugSG9xSsK28oGDCQUtr5uheo+tH0jygPjI+LTD97vjUYS4K2qzhLGFJmpLcj +1akMJXM0gSdPZT8dJyjxvC15pgboLspE4+b6jexXmd4UoFvXgqvjkYHeV4Wk+s0L +xu+HkCGXL9WHYc3t171fFAru4Zd1AUxFQl4BZ2Y+OqRZUrD28Mtz3zGQxbJQoifl +JFrgPAWioLN71SkVq/y+efjvGSl0osPpKU5dftMmyY1zV7k7mMlO08ZSJU+wANA= +=Iijt +-----END PGP SIGNATURE----- + +--L6iaP+gRLNZHKoI4-- + +--===============1359248349== +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Disposition: inline + +_______________________________________________ +notmuch mailing list +notmuch@notmuchmail.org +http://notmuchmail.org/mailman/listinfo/notmuch + +--===============1359248349==-- + diff --git a/test/corpora/default/bar/baz/24:2, b/test/corpora/default/bar/baz/24:2, new file mode 100644 index 00000000..c8000207 --- /dev/null +++ b/test/corpora/default/bar/baz/24:2, @@ -0,0 +1,204 @@ +Return-path: <notmuch-bounces@notmuchmail.org> +Envelope-to: cworth@localhost +Delivery-date: Wed, 18 Nov 2009 01:43:47 -0800 +Received: from yoom.home.cworth.org ([127.0.0.1]) + by yoom.home.cworth.org with esmtp (Exim 4.69) + (envelope-from <notmuch-bounces@notmuchmail.org>) + id 1NAgpH-0005Ab-20 + for cworth@localhost; Wed, 18 Nov 2009 01:27:47 -0800 +X-Original-To: cworth@cworth.org +Delivered-To: cworth@cworth.org +Received: from olra.theworths.org [82.165.184.25] + by yoom.home.cworth.org with IMAP (fetchmail-6.3.9-rc2) + for <cworth@localhost> (single-drop); Wed, 18 Nov 2009 01:27:47 -0800 (PST) +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 12248431FC3 + for <cworth@cworth.org>; Tue, 17 Nov 2009 17:01:22 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -6.17 +X-Spam-Level: +X-Spam-Status: No, score=-6.17 tagged_above=-999 required=2 tests=[AWL=0.429, + BAYES_00=-2.599, RCVD_IN_DNSWL_MED=-4] autolearn=unavailable +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id TmBdVd1i-Wjb; Tue, 17 Nov 2009 17:01:20 -0800 (PST) +Received: from olra.theworths.org (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id AF876431FBC; + Tue, 17 Nov 2009 17:01:20 -0800 (PST) +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 75784431FBC + for <notmuch@notmuchmail.org>; Tue, 17 Nov 2009 17:01:19 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id IoYHzHoKBskU for <notmuch@notmuchmail.org>; + Tue, 17 Nov 2009 17:01:18 -0800 (PST) +Received: from smtp-outbound.seas.harvard.edu (smtp-outbound.seas.harvard.edu + [140.247.51.171]) + by olra.theworths.org (Postfix) with ESMTP id 7E033431FAE + for <notmuch@notmuchmail.org>; Tue, 17 Nov 2009 17:01:18 -0800 (PST) +Received: from dottiness.seas.harvard.edu (dottiness.seas.harvard.edu + [140.247.52.224]) + by smtp-outbound.seas.harvard.edu (8.13.8/8.13.8) with SMTP id + nAI11Gkj008772 + for <notmuch@notmuchmail.org>; Tue, 17 Nov 2009 20:01:16 -0500 +Received: by dottiness.seas.harvard.edu (sSMTP sendmail emulation); + Tue, 17 Nov 2009 20:01:16 -0500 +Date: Tue, 17 Nov 2009 20:01:16 -0500 +From: Lars Kellogg-Stedman <lars@seas.harvard.edu> +To: notmuch <notmuch@notmuchmail.org> +Message-ID: <20091118010116.GC25380@dottiness.seas.harvard.edu> +References: <20091118005829.GB25380@dottiness.seas.harvard.edu> +MIME-Version: 1.0 +In-Reply-To: <20091118005829.GB25380@dottiness.seas.harvard.edu> +User-Agent: Mutt/1.5.19 (2009-01-05) +Subject: Re: [notmuch] "notmuch help" outputs to stderr? +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + <notmuch.notmuchmail.org> +List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe> +List-Archive: <http://notmuchmail.org/pipermail/notmuch> +List-Post: <mailto:notmuch@notmuchmail.org> +List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help> +List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=subscribe> +Content-Type: multipart/mixed; boundary="===============0848253760==" +Sender: notmuch-bounces@notmuchmail.org +Errors-To: notmuch-bounces@notmuchmail.org + + +--===============0848253760== +Content-Type: multipart/signed; micalg=pgp-sha256; + protocol="application/pgp-signature"; boundary="ZInfyf7laFu/Kiw7" +Content-Disposition: inline + + +--ZInfyf7laFu/Kiw7 +Content-Type: multipart/mixed; boundary="KdquIMZPjGJQvRdI" +Content-Disposition: inline + + +--KdquIMZPjGJQvRdI +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +Content-Transfer-Encoding: quoted-printable + +> I've attached a patch that lets usage() take a FILE * argument so that +> you can output to stderr in response to usage errors, and stdout in +> response to an explicit request. + +Whoops, missed a couple of stderr's in that last patch. New one +attached. + +--=20 +Lars Kellogg-Stedman <lars@seas.harvard.edu> +Senior Technologist, Computing and Information Technology +Harvard University School of Engineering and Applied Sciences + + +--KdquIMZPjGJQvRdI +Content-Type: text/plain; charset=us-ascii +Content-Disposition: attachment; filename="notmuch-help.patch" +Content-Transfer-Encoding: quoted-printable + +diff --git a/notmuch.c b/notmuch.c +index c47e640..446c810 100644 +--- a/notmuch.c ++++ b/notmuch.c +@@ -157,23 +157,23 @@ command_t commands[] =3D { + }; +=20 + static void +-usage (void) ++usage (FILE *out) + { + command_t *command; + unsigned int i; +=20 +- fprintf (stderr, "Usage: notmuch <command> [args...]\n"); +- fprintf (stderr, "\n"); +- fprintf (stderr, "Where <command> and [args...] are as follows:\n"); +- fprintf (stderr, "\n"); ++ fprintf (out, "Usage: notmuch <command> [args...]\n"); ++ fprintf (out, "\n"); ++ fprintf (out, "Where <command> and [args...] are as follows:\n"); ++ fprintf (out, "\n"); +=20 + for (i =3D 0; i < ARRAY_SIZE (commands); i++) { + command =3D &commands[i]; +=20 +- fprintf (stderr, "\t%s\t%s\n\n", command->name, command->summary); ++ fprintf (out, "\t%s\t%s\n\n", command->name, command->summary); + } +=20 +- fprintf (stderr, "Use \"notmuch help <command>\" for more details on e= +ach command.\n\n"); ++ fprintf (out, "Use \"notmuch help <command>\" for more details on each= + command.\n\n"); + } +=20 + static int +@@ -183,8 +183,8 @@ notmuch_help_command (unused (void *ctx), int argc, cha= +r *argv[]) + unsigned int i; +=20 + if (argc =3D=3D 0) { +- fprintf (stderr, "The notmuch mail system.\n\n"); +- usage (); ++ fprintf (stdout, "The notmuch mail system.\n\n"); ++ usage (stdout); + return 0; + } +=20 +@@ -192,8 +192,8 @@ notmuch_help_command (unused (void *ctx), int argc, cha= +r *argv[]) + command =3D &commands[i]; +=20 + if (strcmp (argv[0], command->name) =3D=3D 0) { +- fprintf (stderr, "Help for \"notmuch %s\":\n\n", argv[0]); +- fprintf (stderr, "\t%s\t%s\n\n%s\n\n", command->name, ++ fprintf (stdout, "Help for \"notmuch %s\":\n\n", argv[0]); ++ fprintf (stdout, "\t%s\t%s\n\n%s\n\n", command->name, + command->summary, command->documentation); + return 0; + } + +--KdquIMZPjGJQvRdI-- + +--ZInfyf7laFu/Kiw7 +Content-Type: application/pgp-signature +Content-Disposition: inline + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iQEcBAEBCAAGBQJLA0dcAAoJENdGlQYxQazY4nIIAIBCds86/uTmnouvyoPruUUR +Bg5mXcnjuopz1Nwotl9s9U5sGeZuZngxyEvDz1Z1aTEjwab8ndNTf1xCwIoqBs+l +i/sc4nPYubLdy1Ab/84DKVtCSbj+v5rtqhegwUWV7S1BY7t8dKNPNv7YBg7P0Azs +6s3CUxDV5eJCcxCGxxWHH8JDKRf7rDs6vzDwyPWLxlg1Xb1lEM/sRgPCKiShPdO3 +Ak2hECusjskALhSDYX8/FLMd9HwLBC13sfWuSi/pHUAIOI2jru2p5sXrVSlTnFIJ +fiMbPhKWiEaJj2kmm4pRwAhbTWp/J8ZvXWp0AyosxXQhQUWqujiyxgfiXS70SdQ= +=t3Yc +-----END PGP SIGNATURE----- + +--ZInfyf7laFu/Kiw7-- + +--===============0848253760== +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Disposition: inline + +_______________________________________________ +notmuch mailing list +notmuch@notmuchmail.org +http://notmuchmail.org/mailman/listinfo/notmuch + +--===============0848253760==-- + diff --git a/test/corpora/default/bar/baz/cur/25:2, b/test/corpora/default/bar/baz/cur/25:2, new file mode 100644 index 00000000..7378f820 --- /dev/null +++ b/test/corpora/default/bar/baz/cur/25:2, @@ -0,0 +1,32 @@ +From: "Stewart Smith" <stewart@flamingspork.com> +To: notmuch@notmuchmail.org +Date: Wed, 18 Nov 2009 12:05:53 +1100 +Subject: [notmuch] [PATCH] Fix linking with gcc to use g++ to link in C++ + libs. +Message-ID: <1258506353-20352-1-git-send-email-stewart@flamingspork.com> + +Previously, Ubuntu 9.10, gcc 4.4.1 was getting: + +ccache gcc `pkg-config --libs glib-2.0 gmime-2.4 talloc` `xapian-config --libs` notmuch.o notmuch-config.o notmuch-dump.o notmuch-new.o notmuch-reply.o notmuch-restore.o notmuch-search.o notmuch-setup.o notmuch-show.o notmuch-tag.o notmuch-time.o gmime-filter-reply.o query-string.o show-message.o lib/notmuch.a -o notmuch +/usr/bin/ld: lib/notmuch.a(database.o): in function global constructors keyed to BOOLEAN_PREFIX_INTERNAL:database.cc(.text+0x3a): error: undefined reference to 'std::ios_base::Init::Init()' +--- + Makefile.local | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile.local b/Makefile.local +index f824bed..dbd3e20 100644 +--- a/Makefile.local ++++ b/Makefile.local +@@ -18,7 +18,7 @@ notmuch_client_srcs = \ + + notmuch_client_modules = $(notmuch_client_srcs:.c=.o) + notmuch: $(notmuch_client_modules) lib/notmuch.a +- $(CC) $(LDFLAGS) $^ -o $@ ++ $(CXX) $(LDFLAGS) $^ -o $@ + + notmuch.1.gz: + gzip --stdout notmuch.1 > notmuch.1.gz +-- +1.6.3.3 + + diff --git a/test/corpora/default/bar/baz/cur/26:2, b/test/corpora/default/bar/baz/cur/26:2, new file mode 100644 index 00000000..f3c5f53d --- /dev/null +++ b/test/corpora/default/bar/baz/cur/26:2, @@ -0,0 +1,121 @@ +From: "Stewart Smith" <stewart@flamingspork.com> +To: notmuch@notmuchmail.org +Date: Wed, 18 Nov 2009 12:56:40 +1100 +Subject: [notmuch] [PATCH 2/2] Read mail directory in inode number order +Message-ID: <1258509400-32511-1-git-send-email-stewart@flamingspork.com> + +This gives a rather decent reduction in number of seeks required when +reading a Maildir that isn't in pagecache. + +Most filesystems give some locality on disk based on inode numbers. +In ext[234] this is the inode tables, in XFS groups of sequential inode +numbers are together on disk and the most significant bits indicate +allocation group (i.e inode 1,000,000 is always after inode 1,000). + +With this patch, we read in the whole directory, sort by inode number +before stat()ing the contents. + +Ideally, directory is sequential and then we make one scan through the +file system stat()ing. + +Since the universe is not ideal, we'll probably seek during reading the +directory and a fair bit while reading the inodes themselves. + +However... with readahead, and stat()ing in inode order, we should be +in the best place possible to hit the cache. + +In a (not very good) benchmark of "how long does it take to find the first +15,000 messages in my Maildir after 'echo 3 > /proc/sys/vm/drop_caches'", +this patch consistently cut at least 8 seconds off the scan time. + +Without patch: 50 seconds +With patch: 38-42 seconds. + +(I did this in a previous maildir reading project and saw large improvements too) +--- + notmuch-new.c | 32 +++++++++++++++----------------- + 1 files changed, 15 insertions(+), 17 deletions(-) + +diff --git a/notmuch-new.c b/notmuch-new.c +index 83a05ba..11fad8c 100644 +--- a/notmuch-new.c ++++ b/notmuch-new.c +@@ -73,6 +73,11 @@ add_files_print_progress (add_files_state_t *state) + fflush (stdout); + } + ++static int ino_cmp(const struct dirent **a, const struct dirent **b) ++{ ++ return ((*a)->d_ino < (*b)->d_ino)? -1: 1; ++} ++ + /* Examine 'path' recursively as follows: + * + * o Ask the filesystem for the mtime of 'path' (path_mtime) +@@ -100,13 +105,12 @@ add_files_recursive (notmuch_database_t *notmuch, + add_files_state_t *state) + { + DIR *dir = NULL; +- struct dirent *e, *entry = NULL; +- int entry_length; +- int err; ++ struct dirent *entry = NULL; + char *next = NULL; + time_t path_mtime, path_dbtime; + notmuch_status_t status, ret = NOTMUCH_STATUS_SUCCESS; + notmuch_message_t *message = NULL; ++ struct dirent **namelist = NULL; + + /* If we're told to, we bail out on encountering a read-only + * directory, (with this being a clear clue from the user to +@@ -122,31 +126,23 @@ add_files_recursive (notmuch_database_t *notmuch, + path_mtime = st->st_mtime; + + path_dbtime = notmuch_database_get_timestamp (notmuch, path); ++ int n_entries= scandir(path, &namelist, 0, ino_cmp); + +- dir = opendir (path); +- if (dir == NULL) { ++ if (n_entries == -1) { + fprintf (stderr, "Error opening directory %s: %s\n", + path, strerror (errno)); + ret = NOTMUCH_STATUS_FILE_ERROR; + goto DONE; + } + +- entry_length = offsetof (struct dirent, d_name) + +- pathconf (path, _PC_NAME_MAX) + 1; +- entry = malloc (entry_length); ++ int i=0; + + while (!interrupted) { +- err = readdir_r (dir, entry, &e); +- if (err) { +- fprintf (stderr, "Error reading directory: %s\n", +- strerror (errno)); +- ret = NOTMUCH_STATUS_FILE_ERROR; +- goto DONE; +- } +- +- if (e == NULL) ++ if (i == n_entries) + break; + ++ entry= namelist[i++]; ++ + /* If this directory hasn't been modified since the last + * add_files, then we only need to look further for + * sub-directories. */ +@@ -243,6 +239,8 @@ add_files_recursive (notmuch_database_t *notmuch, + free (entry); + if (dir) + closedir (dir); ++ if (namelist) ++ free (namelist); + + return ret; + } +-- +1.6.3.3 + + diff --git a/test/corpora/default/bar/baz/new/27:2, b/test/corpora/default/bar/baz/new/27:2, new file mode 100644 index 00000000..7f0f045b --- /dev/null +++ b/test/corpora/default/bar/baz/new/27:2, @@ -0,0 +1,21 @@ +From: "Keith Packard" <keithp@keithp.com> +To: notmuch@notmuchmail.org +Date: Tue, 17 Nov 2009 17:59:49 -0800 +Subject: [notmuch] New to the list +In-Reply-To: <1258498485-sup-142@elly> +References: <1258498485-sup-142@elly> +Message-ID: <yun3a4cegoa.fsf@aiko.keithp.com> + +On Tue, 17 Nov 2009 23:57:18 +0100, Israel Herraiz <isra at herraiz.org> wrote: + +> "Not much" sounds interesting, and I wonder whether it could be +> integrated with the views of Sup (inbox, threads, etc). So I have +> subscribed to the list to keep an eye on what's going on here. + +We've tried to clone much of the sup UI inside emacs, including the +inbox and threaded message presentation. Of course, we had to "improve" +it a bit, as much due to the differences between curses and emacs as due +to personal preferences... + +-keith + diff --git a/test/corpora/default/bar/baz/new/28:2, b/test/corpora/default/bar/baz/new/28:2, new file mode 100644 index 00000000..83ce01bd --- /dev/null +++ b/test/corpora/default/bar/baz/new/28:2, @@ -0,0 +1,38 @@ +From: "Keith Packard" <keithp@keithp.com> +To: notmuch@notmuchmail.org +Date: Tue, 17 Nov 2009 18:03:17 -0800 +Subject: [notmuch] Introducing myself +In-Reply-To: <20091118002059.067214ed@hikari> +References: <20091118002059.067214ed@hikari> +Message-ID: <yun1vjwegii.fsf@aiko.keithp.com> + +On Wed, 18 Nov 2009 00:20:59 +0100, Adrian Perez de Castro <aperez at igalia.com> wrote: + +> Some time ago I thought +> about doing something like Not Much and in fact I played a bit with the +> Python+Xapian and the Python+Whoosh combinations, because I find relaxing +> to code things in Python when I am not working and also it is installed +> by default on most distribution. I got to have some mailboxes indexed and +> basic searching working a couple of months ago. + +Sup certainly started a lot of people thinking... + +> Also, I would like to share one idea I had in mind, that you might find +> interesting: One thing I have found very annoying is having to re-tag my +> mail when the indexes get b0rked (it happened a couple of times to me while +> using Sup), so I was planning to mails as read/unread and adding the tags +> not just to the index, but to the mail text itself, e.g. by adding a +> "X-Tags" header field or by reusing the "Keywords" one. + +Easier than that, notmuch (and sup too), provide a 'dump' command which +just lists all of the message IDs and their associated tags. Makes +saving tags easy and doesn't involve rewriting messages. I do this once +a day just before my computer is backed up to an external drive. + +If the index is destroyed, you can reindex the messages and then reapply +all of the tags with 'notmuch restore'. + +-- +keith.packard at intel.com + + diff --git a/test/corpora/default/bar/cur/19:2, b/test/corpora/default/bar/cur/19:2, new file mode 100644 index 00000000..1b7872b0 --- /dev/null +++ b/test/corpora/default/bar/cur/19:2, @@ -0,0 +1,360 @@ +From: "Ingmar Vanhassel" <ingmar@exherbo.org> +To: notmuch@notmuchmail.org +Date: Wed, 18 Nov 2009 00:23:42 +0100 +Subject: [notmuch] [PATCH] Typsos +Message-ID: <1258500222-32066-1-git-send-email-ingmar@exherbo.org> + +--- + Makefile | 4 ++-- + README | 6 +++--- + gmime-filter-reply.h | 2 +- + lib/database.cc | 2 +- + lib/index.cc | 2 +- + lib/message.cc | 2 +- + lib/messages.c | 2 +- + lib/notmuch-private.h | 2 +- + lib/notmuch.h | 10 +++++----- + lib/sha1.c | 2 +- + lib/thread.cc | 2 +- + notmuch-completion.bash | 2 +- + notmuch-new.c | 4 ++-- + notmuch-search.c | 2 +- + notmuch.1 | 4 ++-- + notmuch.el | 10 +++++----- + show-message.c | 2 +- + 17 files changed, 30 insertions(+), 30 deletions(-) + +diff --git a/Makefile b/Makefile +index 436dacf..96aaa73 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,4 +1,4 @@ +-# Default FLAGS, (can be overriden by user such as "make CFLAGS=-O2") ++# Default FLAGS, (can be overridden by user such as "make CFLAGS=-O2") + WARN_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings -Wswitch-enum + CFLAGS=-O2 + +@@ -14,7 +14,7 @@ override CXXFLAGS += $(WARN_FLAGS) $(extra_cflags) $(extra_cxxflags) + override LDFLAGS += `pkg-config --libs glib-2.0 gmime-2.4 talloc` \ + `xapian-config --libs` + +-# Include our local Makfile.local first so that its first target is default ++# Include our local Makefile.local first so that its first target is default + include Makefile.local + include lib/Makefile.local + +diff --git a/README b/README +index 40f05ab..27af77f 100644 +--- a/README ++++ b/README +@@ -3,7 +3,7 @@ Notmuch - thread-based email index, search and tagging. + Notmuch is a system for indexing, searching, reading, and tagging + large collections of email messages. It uses the Xapian library to + provide fast, full-text search of very large collection of email with +-a very convenient search syntas. ++a very convenient search syntax. + + Notmuch is free software, released under the GNU General Public + License version 3 (or later). +@@ -45,7 +45,7 @@ obtaining a more sophisticated interface: + notmuch.el file in this distribution. + + If someone were to write a curses-based interface, or similar, +- it might also be reasonable to buil on the "notmuch" ++ it might also be reasonable to build on the "notmuch" + command-line interface. + + 2. Build on top of the notmuch library interface. +@@ -67,4 +67,4 @@ still in development. We would appreciate any contributions to these + efforts. + + +- +\ No newline at end of file ++ +diff --git a/gmime-filter-reply.h b/gmime-filter-reply.h +index 41cbc13..b7cbc6b 100644 +--- a/gmime-filter-reply.h ++++ b/gmime-filter-reply.h +@@ -40,7 +40,7 @@ typedef struct _GMimeFilterReplyClass GMimeFilterReplyClass; + * @saw_nl: previous char was a \n + * @saw_angle: previous char was a > + * +- * A filter to insert/remove reply markers (lines begining with >) ++ * A filter to insert/remove reply markers (lines beginning with >) + **/ + struct _GMimeFilterReply { + GMimeFilter parent_object; +diff --git a/lib/database.cc b/lib/database.cc +index 3c8d626..27597cf 100644 +--- a/lib/database.cc ++++ b/lib/database.cc +@@ -180,7 +180,7 @@ notmuch_status_to_string (notmuch_status_t status) + case NOTMUCH_STATUS_TAG_TOO_LONG: + return "Tag value is too long (exceeds NOTMUCH_TAG_MAX)"; + case NOTMUCH_STATUS_UNBALANCED_FREEZE_THAW: +- return "Unblanced number of calls to notmuch_message_freeze/thaw"; ++ return "Unbalanced number of calls to notmuch_message_freeze/thaw"; + default: + case NOTMUCH_STATUS_LAST_STATUS: + return "Unknown error status value"; +diff --git a/lib/index.cc b/lib/index.cc +index 65b83b3..80df64b 100644 +--- a/lib/index.cc ++++ b/lib/index.cc +@@ -198,7 +198,7 @@ _index_mime_part (notmuch_message_t *message, + if (i == 1) + continue; + if (i > 1) +- fprintf (stderr, "Warning: Unexpected extra parts of mutlipart/signed. Indexing anyway.\n"); ++ fprintf (stderr, "Warning: Unexpected extra parts of multipart/signed. Indexing anyway.\n"); + } + _index_mime_part (message, + g_mime_multipart_get_part (multipart, i)); +diff --git a/lib/message.cc b/lib/message.cc +index a4b090b..1d6623f 100644 +--- a/lib/message.cc ++++ b/lib/message.cc +@@ -144,7 +144,7 @@ _notmuch_message_create (const void *talloc_owner, + } + + /* Create a new notmuch_message_t object for a specific message ID, +- * (which may or may not already exist in the databas). ++ * (which may or may not already exist in the database). + * + * Here, 'talloc owner' is an optional talloc context to which the new + * message will belong. This allows for the caller to not bother +diff --git a/lib/messages.c b/lib/messages.c +index a588f8f..2f7c283 100644 +--- a/lib/messages.c ++++ b/lib/messages.c +@@ -47,7 +47,7 @@ _notmuch_message_list_create (const void *ctx) + return list; + } + +-/* Append 'node' (which can of course point to an aribtrarily long ++/* Append 'node' (which can of course point to an arbitrarily long + * list of nodes) to the end of 'list'. + */ + void +diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h +index 6036ce4..af82e58 100644 +--- a/lib/notmuch-private.h ++++ b/lib/notmuch-private.h +@@ -235,7 +235,7 @@ notmuch_message_file_open (const char *filename); + notmuch_message_file_t * + _notmuch_message_file_open_ctx (void *ctx, const char *filename); + +-/* Close a notmuch message preivously opened with notmuch_message_open. */ ++/* Close a notmuch message previously opened with notmuch_message_open. */ + void + notmuch_message_file_close (notmuch_message_file_t *message); + +diff --git a/lib/notmuch.h b/lib/notmuch.h +index 32b5332..384c177 100644 +--- a/lib/notmuch.h ++++ b/lib/notmuch.h +@@ -222,7 +222,7 @@ notmuch_database_get_timestamp (notmuch_database_t *database, + + /* Add a new message to the given notmuch database. + * +- * Here,'filename' should be a path relative to the the path of ++ * Here,'filename' should be a path relative to the path of + * 'database' (see notmuch_database_get_path), or else should be an + * absolute filename with initial components that match the path of + * 'database'. +@@ -258,7 +258,7 @@ notmuch_database_add_message (notmuch_database_t *database, + const char *filename, + notmuch_message_t **message); + +-/* Find a message with the given messsage_id. ++/* Find a message with the given message_id. + * + * If the database contains a message with the given message_id, then + * a new notmuch_message_t object is returned. The caller should call +@@ -620,7 +620,7 @@ notmuch_messages_advance (notmuch_messages_t *messages); + /* Destroy a notmuch_messages_t object. + * + * It's not strictly necessary to call this function. All memory from +- * the notmuch_messages_t object will be reclaimed when the containg ++ * the notmuch_messages_t object will be reclaimed when the containing + * query object is destroyed. + */ + void +@@ -865,7 +865,7 @@ notmuch_tags_has_more (notmuch_tags_t *tags); + /* Get the current tag from 'tags' as a string. + * + * Note: The returned string belongs to 'tags' and has a lifetime +- * identical to it (and the query to which it utlimately belongs). ++ * identical to it (and the query to which it ultimately belongs). + * + * See the documentation of notmuch_message_get_tags for example code + * showing how to iterate over a notmuch_tags_t object. +@@ -884,7 +884,7 @@ notmuch_tags_advance (notmuch_tags_t *tags); + /* Destroy a notmuch_tags_t object. + * + * It's not strictly necessary to call this function. All memory from +- * the notmuch_tags_t object will be reclaimed when the containg ++ * the notmuch_tags_t object will be reclaimed when the containing + * message or query objects are destroyed. + */ + void +diff --git a/lib/sha1.c b/lib/sha1.c +index ff4dd16..cc48108 100644 +--- a/lib/sha1.c ++++ b/lib/sha1.c +@@ -43,7 +43,7 @@ _hex_of_sha1_digest (const unsigned char digest[SHA1_DIGEST_SIZE]) + return result; + } + +-/* Create a hexadcimal string version of the SHA-1 digest of 'str' ++/* Create a hexadecimal string version of the SHA-1 digest of 'str' + * (including its null terminating character). + * + * This function returns a newly allocated string which the caller +diff --git a/lib/thread.cc b/lib/thread.cc +index 4411d64..da58edc 100644 +--- a/lib/thread.cc ++++ b/lib/thread.cc +@@ -190,7 +190,7 @@ _resolve_thread_relationships (unused (notmuch_thread_t *thread)) + * subject line, the total count of messages, and all authors). The + * second search is for all messages that are in the thread and that + * also match the given query_string. This is to allow for a separate +- * count of matched messages, and to allow a viewer to diplay these ++ * count of matched messages, and to allow a viewer to display these + * messages differently. + * + * Here, 'ctx' is talloc context for the resulting thread object. +diff --git a/notmuch-completion.bash b/notmuch-completion.bash +index ad55f6d..cdad05d 100644 +--- a/notmuch-completion.bash ++++ b/notmuch-completion.bash +@@ -1,4 +1,4 @@ +-# Bash completion for notmutch ++# Bash completion for notmuch + # + # Copyright ?? 2009 Carl Worth + # +diff --git a/notmuch-new.c b/notmuch-new.c +index 83a05ba..5405a9f 100644 +--- a/notmuch-new.c ++++ b/notmuch-new.c +@@ -303,7 +303,7 @@ add_files (notmuch_database_t *notmuch, + + /* XXX: This should be merged with the add_files function since it + * shares a lot of logic with it. */ +-/* Recursively count all regular files in path and all sub-direcotries ++/* Recursively count all regular files in path and all sub-directories + * of path. The result is added to *count (which should be + * initialized to zero by the top-level caller before calling + * count_files). */ +@@ -469,7 +469,7 @@ notmuch_new_command (void *ctx, + + if (elapsed > 1 && ! add_files_state.saw_read_only_directory) { + printf ("\nTip: If you have any sub-directories that are archives (that is,\n" +- "they will never receive new mail), marking these directores as\n" ++ "they will never receive new mail), marking these directories as\n" + "read-only (chmod u-w /path/to/dir) will make \"notmuch new\"\n" + "much more efficient (it won't even look in those directories).\n"); + } +diff --git a/notmuch-search.c b/notmuch-search.c +index 8db09c7..ac81372 100644 +--- a/notmuch-search.c ++++ b/notmuch-search.c +@@ -76,7 +76,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[]) + + query_str = query_string_from_args (ctx, argc, argv); + if (query_str == NULL) { +- fprintf (stderr, "Out of moemory.\n"); ++ fprintf (stderr, "Out of memory.\n"); + return 1; + } + +diff --git a/notmuch.1 b/notmuch.1 +index 6c3d10f..86d5f59 100644 +--- a/notmuch.1 ++++ b/notmuch.1 +@@ -60,7 +60,7 @@ archives, and will then proceed to build a database that indexes the + mail to allow for fast search of the archive. + + This directory can contain any number of sub-directories and should +-primarily contain only files with indvidual email messages ++primarily contain only files with individual email messages + (eg. maildir or mh archives are perfect). If there are other, + non-email files (such as indexes maintained by other email programs) + then notmuch will do its best to detect those and ignore them. +@@ -173,7 +173,7 @@ Constructs a reply template for a set of messages. + + See the documentation of + .B search +-for deatils of the supported syntax of search terms. ++for details of the supported syntax of search terms. + + To make replying to email easier, + .B notmuch reply +diff --git a/notmuch.el b/notmuch.el +index 8894a8e..7e01ed6 100644 +--- a/notmuch.el ++++ b/notmuch.el +@@ -205,7 +205,7 @@ Unlike builtin `next-line' this version accepts no arguments." + (defun notmuch-show-mark-read-then-archive-thread () + "Remove \"unread\" tag from each message, then archive and show next thread. + +-Archive each message currrently shown by removing the \"unread\" ++Archive each message currently shown by removing the \"unread\" + and \"inbox\" tag from each. Then kill this buffer and show the + next thread from the search from which this thread was originally + shown. +@@ -220,7 +220,7 @@ buffer." + (defun notmuch-show-archive-thread () + "Archive each message in thread, and show next thread from search. + +-Archive each message currrently shown by removing the \"inbox\" ++Archive each message currently shown by removing the \"inbox\" + tag from each. Then kill this buffer and show the next thread + from the search from which this thread was originally shown. + +@@ -340,7 +340,7 @@ there are no more unread messages past the current point." + (notmuch-show-next-message))) + + (defun notmuch-show-next-open-message () +- "Advance to the the next message which is not hidden. ++ "Advance to the next message which is not hidden. + + If read messages are currently hidden, advance to the next unread + message. Otherwise, advance to the next message." +@@ -674,7 +674,7 @@ thread from that buffer can be show when done with this one)." + ))) + + (defvar notmuch-search-authors-width 40 +- "Number of columns to use to diplay authors in a notmuch-search buffer.") ++ "Number of columns to use to display authors in a notmuch-search buffer.") + + (defvar notmuch-search-mode-map + (let ((map (make-sparse-keymap))) +@@ -910,7 +910,7 @@ the beginning of the buffer). + + This command toggles the sort order for the current search. + +-Note that any fitlered searches created by ++Note that any filtered searches created by + `notmuch-search-filter' retain the search order of the parent + search." + (interactive) +diff --git a/show-message.c b/show-message.c +index 79b02e2..38f5897 100644 +--- a/show-message.c ++++ b/show-message.c +@@ -38,7 +38,7 @@ show_message_part (GMimeObject *part, int *part_count, + if (i == 1) + continue; + if (i > 1) +- fprintf (stderr, "Warning: Unexpected extra parts of mutlipart/signed. Continuing.\n"); ++ fprintf (stderr, "Warning: Unexpected extra parts of multipart/signed. Continuing.\n"); + } + show_message_part (g_mime_multipart_get_part (multipart, i), + part_count, show_part); +-- +1.6.5.2.433.g23cdb + + diff --git a/test/corpora/default/bar/cur/20:2, b/test/corpora/default/bar/cur/20:2, new file mode 100644 index 00000000..f08a3145 --- /dev/null +++ b/test/corpora/default/bar/cur/20:2, @@ -0,0 +1,101 @@ +Date: Wed, 18 Nov 2009 00:20:59 +0100 +From: Adrian Perez de Castro <aperez@igalia.com> +To: notmuch@notmuchmail.org +Message-ID: <20091118002059.067214ed@hikari> +Organization: Igalia +X-Mailer: Claws Mail 3.7.3 (GTK+ 2.18.3; x86_64-redhat-linux-gnu) +Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAAXNSR0IArs4c6QAAADBQTFRFBwcHFhYWKCgoNzc3SEhIV1dXaGhod3d3iIiIlpaWqKiouLi4x8fH2NjY5+fn/v7+rSjDkgAAAjVJREFUOE9l07tvE0EQwOHfrkV9O+eko7g701BBfECJsIigT2IpooIqaSiRUEB0REj00FBQgYSCkhry+gecUPJybJeIxLumTbilsH2PMNXufDOa3ZVW+1JkpbUmD/8+vXR3c7or4Gz93mH309Kz8/C9/RQge7VfhW/LW+PF8IkrQ7Z6OKmQr1tl+LU/yWP9mxJka9O88fZHPwf/7u0kLyCnX3I4fQhgjAgIfi+HHw5A1Y2ggIMcFKAEnRoL0M3BosI4TI2IATjuT8DvSNJoNNJgkIhxlr9TUHeSpDnfohlIrMBlU+BGmsZqfr69FMfGMw4NoG835+J62riWyjQ/uXlTQjNUIoYegMsBM0pCD8oDas7n4HQsBghXFxJTW42KDs+4XLfjsN0wOYgABqARjMKIHIaAQnmHjsI5Cvi9Cf6k03OoWBkpIP3Q7354+dEimFBKHbMP9oKjwfd9gbrxR5KDToczK4uPF8UgNomKU2GaENRi77zyDKICxKBS4xXYbONPMQMdYZTBwMiMWiUg9g6UJ3OBogzjV8E7sBVwyvfAOYdQhsABzuOxI1MGZbs98Q6Md5UOfbbR2R0eWOesrnRw5ajT6f60LrNhWIHZpBnUWv2s14ukArWWTqTes3YQxRXgFkcMu70TPYqqUBs0YwmO967OVIdTG4bY4a7WLaqgLm5vbHdH5np0Dri//fmg7y8scB4u3+zsuNlH0X+g19bby69b+TYH6isvns8VdQWgxj9tHP8AR5/hSdYqkwsAAAAASUVORK5CYII= +Mime-Version: 1.0 +Subject: [notmuch] Introducing myself +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + <notmuch.notmuchmail.org> +List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe> +List-Archive: <http://notmuchmail.org/pipermail/notmuch> +List-Post: <mailto:notmuch@notmuchmail.org> +List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help> +List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=subscribe> +Content-Type: multipart/mixed; boundary="===============1167731900==" +Sender: notmuch-bounces@notmuchmail.org +Errors-To: notmuch-bounces@notmuchmail.org + +--===============1167731900== +Content-Type: multipart/signed; micalg=PGP-SHA1; + boundary="Sig_/ayZz9m37AOMROJCyUudvXvZ"; protocol="application/pgp-signature" + +--Sig_/ayZz9m37AOMROJCyUudvXvZ +Content-Type: text/plain; charset=US-ASCII +Content-Transfer-Encoding: quoted-printable + + +Hello to all, + +I have just heard about Not Much today in some random Linux-related news +site (LWN?), my name is Adrian Perez and I work as systems administrator +(although I can do some code as well :P). I have always thought that the +ideas behind Sup were great, but after some time using it, I got tired of +the oddities that it has. I also do not like doing things like having to +install Ruby just for reading and sorting mails. Some time ago I thought +about doing something like Not Much and in fact I played a bit with the +Python+Xapian and the Python+Whoosh combinations, because I find relaxing +to code things in Python when I am not working and also it is installed +by default on most distribution. I got to have some mailboxes indexed and +basic searching working a couple of months ago. Lately I have been very +busy and had no time for coding, and them... boom! Not Much appears -- and +it is almost exactly what I was trying to do, but faster. I have been +playing a bit with Not Much today, and I think it has potential. + +Also, I would like to share one idea I had in mind, that you might find +interesting: One thing I have found very annoying is having to re-tag my +mail when the indexes get b0rked (it happened a couple of times to me while +using Sup), so I was planning to mails as read/unread and adding the tags +not just to the index, but to the mail text itself, e.g. by adding a +"X-Tags" header field or by reusing the "Keywords" one. This way, the index +could be totally recreated by re-reading the mail directories, and this +would also allow to a tools like OfflineIMAP [1] to get the mails into a +local maildir, tagging and indexing the mails with the e-mail reader and +then syncing back the messages with the "X-Tags" header to the IMAP server. +This would allow to use the mail reader from a different computer and still +have everything tagged finely. + +Best regards, + + +--- +[1] http://software.complete.org/software/projects/show/offlineimap + +--=20 +Adrian Perez de Castro <aperez@igalia.com> +Igalia - Free Software Engineering + +--Sig_/ayZz9m37AOMROJCyUudvXvZ +Content-Type: application/pgp-signature; name=signature.asc +Content-Disposition: attachment; filename=signature.asc + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.13 (GNU/Linux) + +iEYEARECAAYFAksDL+AACgkQkcVZ2+TJEjtsuQCfXmilW8WpMQHCnwwJjRE1PWZy +oFAAn3MmXC5sW7MvCFjs7ks6U16zgMEg +=eL9p +-----END PGP SIGNATURE----- + +--Sig_/ayZz9m37AOMROJCyUudvXvZ-- + +--===============1167731900== +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Disposition: inline + +_______________________________________________ +notmuch mailing list +notmuch@notmuchmail.org +http://notmuchmail.org/mailman/listinfo/notmuch + +--===============1167731900==-- + diff --git a/test/corpora/default/bar/new/21:2, b/test/corpora/default/bar/new/21:2, new file mode 100644 index 00000000..7ff55ccf --- /dev/null +++ b/test/corpora/default/bar/new/21:2, @@ -0,0 +1,102 @@ +MIME-Version: 1.0 +Date: Tue, 17 Nov 2009 16:23:53 -0800 +Message-ID: <cf0c4d610911171623q3e27a0adx802e47039b57604b@mail.gmail.com> +From: Alex Botero-Lowry <alex.boterolowry@gmail.com> +To: notmuch@notmuchmail.org +Content-Type: multipart/mixed; boundary=0016e64ca4d8f27a4804789a4139 +Subject: [notmuch] [PATCH] Error out if no query is supplied to search + instead of going into an infinite loop +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + <notmuch.notmuchmail.org> +List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe> +List-Archive: <http://notmuchmail.org/pipermail/notmuch> +List-Post: <mailto:notmuch@notmuchmail.org> +List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help> +List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=subscribe> +Sender: notmuch-bounces@notmuchmail.org +Errors-To: notmuch-bounces@notmuchmail.org + +--0016e64ca4d8f27a4804789a4139 +Content-Type: multipart/alternative; boundary=0016e64ca4d8f27a3604789a4137 + +--0016e64ca4d8f27a3604789a4137 +Content-Type: text/plain; charset=ISO-8859-1 + +In this case error out when no query is supplied. There seems to be an +infinite-loop casued by i think notmuch_query_search_threads having +an exception: + +A Xapian exception occurred: Syntax: <expression> AND <expression> +A Xapian exception occurred: Syntax: <expression> AND <expression> +A Xapian exception occurred: Syntax: <expression> AND <expression> +A Xapian exception occurred: Syntax: <expression> AND <expression> +A Xapian exception occurred: Syntax: <expression> AND <expression> +A Xapian exception occurred: Syntax: <expression> AND <expression> +A Xapian exception occurred: Syntax: <expression> AND <expression> +A Xapian exception occurred: Syntax: <expression> AND <expression> +A Xapian exception occurred: Syntax: <expression> AND <expression> +A Xapian exception occurred: Syntax: <expression> AND <expression> +A Xapian exception occurred: Syntax: <expression> AND <expression> +A Xapian exception occurred: Syntax: <expression> AND <expression> +A Xapian exception occurred: Syntax: <expression> AND <expression> +A Xapian exception occurred: Syntax: <expression> AND <expression> +A Xapian exception occurred: Syntax: <expression> AND <expression> + +I'll look into that bug specifically a bit later. + +It might be better to do a usage instead of just throwing an error here? + +alex + +--0016e64ca4d8f27a3604789a4137 +Content-Type: text/html; charset=ISO-8859-1 + +In this case error out when no query is supplied. There seems to be an infinite-loop casued by i think notmuch_query_search_threads having<br>an exception:<br><br>A Xapian exception occurred: Syntax: <expression> AND <expression><br> +A Xapian exception occurred: Syntax: <expression> AND <expression><br>A Xapian exception occurred: Syntax: <expression> AND <expression><br>A Xapian exception occurred: Syntax: <expression> AND <expression><br> +A Xapian exception occurred: Syntax: <expression> AND <expression><br>A Xapian exception occurred: Syntax: <expression> AND <expression><br>A Xapian exception occurred: Syntax: <expression> AND <expression><br> +A Xapian exception occurred: Syntax: <expression> AND <expression><br>A Xapian exception occurred: Syntax: <expression> AND <expression><br>A Xapian exception occurred: Syntax: <expression> AND <expression><br> +A Xapian exception occurred: Syntax: <expression> AND <expression><br>A Xapian exception occurred: Syntax: <expression> AND <expression><br>A Xapian exception occurred: Syntax: <expression> AND <expression><br> +A Xapian exception occurred: Syntax: <expression> AND <expression><br>A Xapian exception occurred: Syntax: <expression> AND <expression><br><br>I'll look into that bug specifically a bit later.<br> +<br>It might be better to do a usage instead of just throwing an error here?<br><br>alex<br> + +--0016e64ca4d8f27a3604789a4137-- +--0016e64ca4d8f27a4804789a4139 +Content-Type: application/octet-stream; + name="0001-Error-out-if-no-query-is-supplied-to-search-instead-.patch" +Content-Disposition: attachment; + filename="0001-Error-out-if-no-query-is-supplied-to-search-instead-.patch" +Content-Transfer-Encoding: base64 +X-Attachment-Id: f_g25cms190 + +RnJvbSAzZjk0MzFmNzRhNWZmNjZjODRjODY5YTNlMjZjMmJhZDQyYmVkMWIxIE1vbiBTZXAgMTcg +MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4YW5kZXIgQm90ZXJvLUxvd3J5IDxhbGV4LmJvdGVyb2xv +d3J5QGdtYWlsLmNvbT4KRGF0ZTogVHVlLCAxNyBOb3YgMjAwOSAxNjoyMDoyOCAtMDgwMApTdWJq +ZWN0OiBbUEFUQ0hdIEVycm9yIG91dCBpZiBubyBxdWVyeSBpcyBzdXBwbGllZCB0byBzZWFyY2gg +aW5zdGVhZCBvZiBnb2luZyBpbnRvIGFuIGluZmluaXRlIGxvb3AKCi0tLQogbm90bXVjaC1zZWFy +Y2guYyB8ICAgIDUgKysrKysKIDEgZmlsZXMgY2hhbmdlZCwgNSBpbnNlcnRpb25zKCspLCAwIGRl +bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL25vdG11Y2gtc2VhcmNoLmMgYi9ub3RtdWNoLXNlYXJj +aC5jCmluZGV4IDhkYjA5YzcuLmQ5NGZjY2QgMTAwNjQ0Ci0tLSBhL25vdG11Y2gtc2VhcmNoLmMK +KysrIGIvbm90bXVjaC1zZWFyY2guYwpAQCAtNjYsNiArNjYsMTEgQEAgbm90bXVjaF9zZWFyY2hf +Y29tbWFuZCAodm9pZCAqY3R4LCBpbnQgYXJnYywgY2hhciAqYXJndltdKQogICAgIGFyZ2MgLT0g +aTsKICAgICBhcmd2ICs9IGk7CiAKKyAgICBpZiAoYXJnYyA9PSAwKSB7CisgICAgICAgIGZwcmlu +dGYgKHN0ZGVyciwgIk5vIHF1ZXJ5IHByb3ZpZGVkXG4iKTsKKyAgICAgICAgcmV0dXJuIDE7Cisg +ICAgfQorCiAgICAgY29uZmlnID0gbm90bXVjaF9jb25maWdfb3BlbiAoY3R4LCBOVUxMLCBOVUxM +KTsKICAgICBpZiAoY29uZmlnID09IE5VTEwpCiAJcmV0dXJuIDE7Ci0tIAoxLjYuNS4yCgo= +--0016e64ca4d8f27a4804789a4139 +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Disposition: inline + +_______________________________________________ +notmuch mailing list +notmuch@notmuchmail.org +http://notmuchmail.org/mailman/listinfo/notmuch + +--0016e64ca4d8f27a4804789a4139-- + diff --git a/test/corpora/default/bar/new/22:2, b/test/corpora/default/bar/new/22:2, new file mode 100644 index 00000000..08adada6 --- /dev/null +++ b/test/corpora/default/bar/new/22:2, @@ -0,0 +1,84 @@ +Date: Tue, 17 Nov 2009 19:50:40 -0500 +From: Lars Kellogg-Stedman <lars@seas.harvard.edu> +To: Keith Packard <keithp@keithp.com> +Message-ID: <20091118005040.GA25380@dottiness.seas.harvard.edu> +References: <20091117190054.GU3165@dottiness.seas.harvard.edu> + <87iqd9rn3l.fsf@vertex.dottedmag> + <20091117203301.GV3165@dottiness.seas.harvard.edu> + <yunaayketfm.fsf@aiko.keithp.com> +MIME-Version: 1.0 +In-Reply-To: <yunaayketfm.fsf@aiko.keithp.com> +User-Agent: Mutt/1.5.19 (2009-01-05) +Cc: notmuch@notmuchmail.org +Subject: Re: [notmuch] Working with Maildir storage? +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + <notmuch.notmuchmail.org> +List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe> +List-Archive: <http://notmuchmail.org/pipermail/notmuch> +List-Post: <mailto:notmuch@notmuchmail.org> +List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help> +List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=subscribe> +Content-Type: multipart/mixed; boundary="===============1483126515==" +Sender: notmuch-bounces@notmuchmail.org +Errors-To: notmuch-bounces@notmuchmail.org + + +--===============1483126515== +Content-Type: multipart/signed; micalg=pgp-sha256; + protocol="application/pgp-signature"; boundary="9amGYk9869ThD9tj" +Content-Disposition: inline + + +--9amGYk9869ThD9tj +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +Content-Transfer-Encoding: quoted-printable + +> I've also pushed a slightly more complicated (and complete) fix to my +> private notmuch repository + +The version of lib/messages.cc in your repo doesn't build because it's +missing "#include <stdint.h>" (for the uint32_t on line 466). + +--=20 +Lars Kellogg-Stedman <lars@seas.harvard.edu> +Senior Technologist, Computing and Information Technology +Harvard University School of Engineering and Applied Sciences + + +--9amGYk9869ThD9tj +Content-Type: application/pgp-signature +Content-Disposition: inline + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iQEcBAEBCAAGBQJLA0TgAAoJENdGlQYxQazYsG0IAJ1t9h4Q3ma8z8ejeKR22Xh0 +WcuRX2x9yEXy/+aG9W7Mot0mqUQCiLdmHM/2h5N9BFHyJvfOUf8lmssrJ5OS/kp5 +j7FIx3GUELBmEZqFUPjRSQPk1hZURYdRsloKkrbQ2kAivjjb50zAAQ8Av4Cgj6cS +3HvNNmeVfJt1NS75vm+/wn48M8Vrcdv4gvNlSOhgFOixknvRoxSyNDOHYBKvHnSV +2HnO0GzhAQzDZAwdHBzJtb8vRmglrH33TVdrE7OW+sojYB3Wyz8r9+HIt8Q8ovzX +nQ8p0Nf5DlF7tye3JYo0EeNm5EQJ4q0YyVYInhmtpi3A5Cyu50GcB/GZ5Sd6ajo= +=WULe +-----END PGP SIGNATURE----- + +--9amGYk9869ThD9tj-- + +--===============1483126515== +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Disposition: inline + +_______________________________________________ +notmuch mailing list +notmuch@notmuchmail.org +http://notmuchmail.org/mailman/listinfo/notmuch + +--===============1483126515==-- + diff --git a/test/corpora/default/cur/29:2, b/test/corpora/default/cur/29:2, new file mode 100644 index 00000000..c76eff33 --- /dev/null +++ b/test/corpora/default/cur/29:2, @@ -0,0 +1,21 @@ +From: "Keith Packard" <keithp@keithp.com> +To: notmuch@notmuchmail.org +Date: Tue, 17 Nov 2009 18:04:31 -0800 +Subject: [notmuch] archive +In-Reply-To: <20091117232137.GA7669@griffis1.net> +References: <20091117232137.GA7669@griffis1.net> +Message-ID: <yunzl6kd1w0.fsf@aiko.keithp.com> + +On Tue, 17 Nov 2009 18:21:38 -0500, Aron Griffis <agriffis at n01se.net> wrote: + +> Just subscribed, I'd like to catch up on the previous postings, +> but the archive link seems to be bogus? + +Yeah, the archive appears broken and will need to wait until Carl +arrives in Barcelona to get fixed. + +-- +keith.packard at intel.com + + + diff --git a/test/corpora/default/cur/30:2, b/test/corpora/default/cur/30:2, new file mode 100644 index 00000000..a5b94a0a --- /dev/null +++ b/test/corpora/default/cur/30:2, @@ -0,0 +1,75 @@ +From: "Stewart Smith" <stewart@flamingspork.com> +To: notmuch@notmuchmail.org +Date: Wed, 18 Nov 2009 13:22:20 +1100 +Subject: [notmuch] [PATCH] count_files: sort directory in inode order before + statting +Message-ID: <1258510940-7018-1-git-send-email-stewart@flamingspork.com> + +--- + notmuch-new.c | 30 ++++++++++-------------------- + 1 files changed, 10 insertions(+), 20 deletions(-) + +diff --git a/notmuch-new.c b/notmuch-new.c +index 11fad8c..c5f841a 100644 +--- a/notmuch-new.c ++++ b/notmuch-new.c +@@ -308,36 +308,26 @@ add_files (notmuch_database_t *notmuch, + static void + count_files (const char *path, int *count) + { +- DIR *dir; +- struct dirent *e, *entry = NULL; +- int entry_length; +- int err; ++ struct dirent *entry = NULL; + char *next; + struct stat st; ++ struct dirent **namelist = NULL; + +- dir = opendir (path); ++ int n_entries= scandir(path, &namelist, 0, ino_cmp); + +- if (dir == NULL) { ++ if (n_entries == -1) { + fprintf (stderr, "Warning: failed to open directory %s: %s\n", + path, strerror (errno)); + goto DONE; + } + +- entry_length = offsetof (struct dirent, d_name) + +- pathconf (path, _PC_NAME_MAX) + 1; +- entry = malloc (entry_length); ++ int i=0; + + while (!interrupted) { +- err = readdir_r (dir, entry, &e); +- if (err) { +- fprintf (stderr, "Error reading directory: %s\n", +- strerror (errno)); +- free (entry); +- goto DONE; +- } ++ if (i == n_entries) ++ break; + +- if (e == NULL) +- break; ++ entry= namelist[i++]; + + /* Ignore special directories to avoid infinite recursion. + * Also ignore the .notmuch directory. +@@ -376,8 +366,8 @@ count_files (const char *path, int *count) + DONE: + if (entry) + free (entry); +- +- closedir (dir); ++ if (namelist) ++ free (namelist); + } + + int +-- +1.6.3.3 + + diff --git a/test/corpora/default/cur/31:2, b/test/corpora/default/cur/31:2, new file mode 100644 index 00000000..88f17ca9 --- /dev/null +++ b/test/corpora/default/cur/31:2, @@ -0,0 +1,31 @@ +From: "Jjgod Jiang" <gzjjgod@gmail.com> +To: notmuch@notmuchmail.org +Date: Wed, 18 Nov 2009 11:50:17 +0800 +Subject: [notmuch] Mac OS X/Darwin compatibility issues +Message-ID: <ddd65cda0911171950o4eea4389v86de9525e46052d3@mail.gmail.com> + +Hi, + +When I tried to compile notmuch under Mac OS X 10.6, several issues +arisen: + +1. g++ reports 'warning: command line option "-Wmissing-declarations" +is valid for C/ObjC but not for C++' + +2. +notmuch-reply.c: In function ?address_is_users?: +notmuch-reply.c:87: warning: passing argument 2 of +?notmuch_config_get_user_other_email? from incompatible pointer type + +That's due to the size incompatibility of 'unsigned int' and 'size_t' +(size_t is uint64_t in Mac OS X). + +3. Several errors about missing GNU extensions like getline() and strndup(): + +warning: implicit declaration of function ?getline? +error: ?strndup? was not declared in this scope + +We can implement these with fgets() and strncpy() though. + +- Jiang + diff --git a/test/corpora/default/cur/32:2, b/test/corpora/default/cur/32:2, new file mode 100644 index 00000000..c1633cdd --- /dev/null +++ b/test/corpora/default/cur/32:2, @@ -0,0 +1,165 @@ +From: "Jan Janak" <jan@ryngle.com> +To: notmuch@notmuchmail.org +Date: Wed, 18 Nov 2009 05:57:03 +0100 +Subject: [notmuch] [PATCH] notmuch new: Support for conversion of spool + subdirectories into tags +Message-ID: <1258520223-15328-1-git-send-email-jan@ryngle.com> + +This patch makes it possible to convert subdirectory names inside the +spool directory into message tags. Messages stored in subdirectory +"foo" will be marked with tag "foo". Message duplicates found in several +subdirectories will be given one tag per subdirectory. + +This feature can be used to synchronize notmuch's tags with with gmail +tags, for example. Gmail IMAP servers convert tags to IMAP +subdirectories and those subdirectories can be converted back to tags +in notmuch. + +The patch modifies notmuch_database_add_message function to return a +pointer to the message even if a message duplicate was found in the +database. This is needed if we want to add a tag for each subdirectory +in which a message duplicate was found. + +In addition to that, it makes the pointer to notmuch_config_t global +(previously it was a local variable in notmuch_new_command). The +configuration data structure is used by the function which converts +subdirectory names to tags. + +Finally, there is a new function called subdir_to_tag. The function +extracts the name of the subdirectory inside the spool from the full +path of the message (also removing Maildir's cur,dir,and tmp +subdirectories) and adds it as a new tag to the message. + +Signed-off-by: Jan Janak <jan at ryngle.com> +--- + lib/database.cc | 3 +- + notmuch-new.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 74 insertions(+), 3 deletions(-) + +diff --git a/lib/database.cc b/lib/database.cc +index 3c8d626..f7799d2 100644 +--- a/lib/database.cc ++++ b/lib/database.cc +@@ -949,7 +949,8 @@ notmuch_database_add_message (notmuch_database_t *notmuch, + + DONE: + if (message) { +- if (ret == NOTMUCH_STATUS_SUCCESS && message_ret) ++ if ((ret == NOTMUCH_STATUS_SUCCESS || ++ ret == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) && message_ret) + *message_ret = message; + else + notmuch_message_destroy (message); +diff --git a/notmuch-new.c b/notmuch-new.c +index 83a05ba..d94ce16 100644 +--- a/notmuch-new.c ++++ b/notmuch-new.c +@@ -19,6 +19,9 @@ + */ + + #include "notmuch-client.h" ++#include <libgen.h> ++ ++static notmuch_config_t *config = 0; + + static volatile sig_atomic_t do_add_files_print_progress = 0; + +@@ -45,6 +48,69 @@ tag_inbox_and_unread (notmuch_message_t *message) + notmuch_message_add_tag (message, "unread"); + } + ++/* ++ * Extracts the sub-directory from the filename and adds it as a new tag to ++ * the message. The filename must begin with the database directory configured ++ * in the configuration file. This prefix is then removed. If the remaining ++ * sub-directory ends with one of the Maildir special directories (/tmp, /new, ++ * /cur) then they are removed as well. If there is anything left then the ++ * function adds it as a new tag to the message. ++ * ++ * The function does nothing if it cannot extract a sub-directory from ++ * filename. ++ */ ++static void ++subdir_to_tag (char* filename, notmuch_message_t *message) ++{ ++ const char* db_path; ++ char *msg_dir, *tmp; ++ int db_path_len, msg_dir_len; ++ ++ if (config == NULL) return; ++ db_path = notmuch_config_get_database_path (config); ++ if (db_path == NULL) return; ++ db_path_len = strlen(db_path); ++ ++ /* Make a copy of the string as dirname may need to modify it. */ ++ tmp = talloc_strdup(message, filename); ++ msg_dir = dirname(tmp); ++ msg_dir_len = strlen(msg_dir); ++ ++ /* If msg_dir starts with db_path, remove it, including the / which delimits ++ * it from the rest of the directory name. */ ++ if (db_path_len < msg_dir_len && ++ !strncmp(db_path, msg_dir, db_path_len)) { ++ msg_dir += db_path_len + 1; ++ msg_dir_len -= db_path_len + 1; ++ } else { ++ /* If we get here, either the message filename is not inside the ++ * database directory configured in the configuration file, or it is a ++ * file in the root directory of the database. Either way we just skip ++ * it because we do not know how to convert it to a meaningful ++ * subdirectory string that we could add as tag. */ ++ goto out; ++ } ++ ++ /* Special conditioning for Maildirs. If the remainder of the directory ++ * name ends with /new, /cur, or /tmp then remove it. */ ++ if ((msg_dir_len >= 4) && ++ (!strncmp(msg_dir + msg_dir_len - 4, "/new", 4) || ++ !strncmp(msg_dir + msg_dir_len - 4, "/cur", 4) || ++ !strncmp(msg_dir + msg_dir_len - 4, "/tmp", 4))) { ++ msg_dir[msg_dir_len - 4] = '\0'; ++ } ++ ++ /* If, after all the modifications, we still have a subdirectory, add it ++ * as tag. */ ++ if (strlen(msg_dir)) { ++ notmuch_message_add_tag (message, msg_dir); ++ } ++ ++out: ++ talloc_free(tmp); ++} ++ ++ + static void + add_files_print_progress (add_files_state_t *state) + { +@@ -186,10 +252,15 @@ add_files_recursive (notmuch_database_t *notmuch, + case NOTMUCH_STATUS_SUCCESS: + state->added_messages++; + tag_inbox_and_unread (message); ++ subdir_to_tag(next, message); + break; + /* Non-fatal issues (go on to next file) */ + case NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID: +- /* Stay silent on this one. */ ++ /* Stay silent on this one. The message already exists in the ++ * database, that means we may have found a duplicate in ++ * another directory. If that's the case then we add another ++ * tag to the message with the sub-directory. */ ++ subdir_to_tag(next, message); + break; + case NOTMUCH_STATUS_FILE_NOT_EMAIL: + fprintf (stderr, "Note: Ignoring non-mail file: %s\n", +@@ -386,7 +457,6 @@ int + notmuch_new_command (void *ctx, + unused (int argc), unused (char *argv[])) + { +- notmuch_config_t *config; + notmuch_database_t *notmuch; + add_files_state_t add_files_state; + double elapsed; +-- +1.6.3.3 + + diff --git a/test/corpora/default/cur/33:2, b/test/corpora/default/cur/33:2, new file mode 100644 index 00000000..a9b32524 --- /dev/null +++ b/test/corpora/default/cur/33:2, @@ -0,0 +1,13 @@ +From: "Rolland Santimano" <rollandsantimano@yahoo.com> +To: notmuch@notmuchmail.org +Date: Tue, 17 Nov 2009 21:12:23 -0800 (PST) +Subject: [notmuch] Link to mailing list archives ? +Message-ID: <736613.51770.qm@web113505.mail.gq1.yahoo.com> + +The link[1] provided on the list page[2] is broken: +[1] http://notmuchmail.org/pipermail/notmuch/ +[2] http://notmuchmail.org/mailman/listinfo/notmuch + + + + diff --git a/test/corpora/default/cur/34:2, b/test/corpora/default/cur/34:2, new file mode 100644 index 00000000..b94dd069 --- /dev/null +++ b/test/corpora/default/cur/34:2, @@ -0,0 +1,46 @@ +From: "Alexander Botero-Lowry" <alex.boterolowry@gmail.com> +To: notmuch@notmuchmail.org +Date: Tue, 17 Nov 2009 21:45:36 -0800 +Subject: [notmuch] Mac OS X/Darwin compatibility issues +In-Reply-To: <ddd65cda0911171950o4eea4389v86de9525e46052d3@mail.gmail.com> +References: <ddd65cda0911171950o4eea4389v86de9525e46052d3@mail.gmail.com> +Message-ID: <86einw2xof.fsf@fortitudo.i-did-not-set--mail-host-address--so-tickle-me> + +On Wed, 18 Nov 2009 11:50:17 +0800, Jjgod Jiang <gzjjgod at gmail.com> wrote: +> Hi, +> +> When I tried to compile notmuch under Mac OS X 10.6, several issues +> arisen: +> +> 1. g++ reports 'warning: command line option "-Wmissing-declarations" +> is valid for C/ObjC but not for C++' +> +I got that too. I presume it's newly supported in GCC4.4? + +> 3. Several errors about missing GNU extensions like getline() and strndup(): +> +strndup from V8: + +char* strndup(char* str, size_t n) { + // Stupid implementation of strndup since macos isn't born with + // one. + size_t len = strlen(str); + if (len <= n) + return StrDup(str); + char* result = new char[n+1]; + size_t i; + for (i = 0; i <= n; i++) + result[i] = str[i]; + result[i] = '\0'; + return result; +} + +> warning: implicit declaration of function ?getline? +> error: ?strndup? was not declared in this scope +> +for getline do you mind trying #define _GNU_SOURCE 1 +before #include <stdio.h> in the offending files? The FreeBSD man pages +mentions that as a way of enabling the GNU version of getline(). + +Alex + diff --git a/test/corpora/default/cur/35:2, b/test/corpora/default/cur/35:2, new file mode 100644 index 00000000..d7276705 --- /dev/null +++ b/test/corpora/default/cur/35:2, @@ -0,0 +1,24 @@ +From: "Jjgod Jiang" <gzjjgod@gmail.com> +To: notmuch@notmuchmail.org +Date: Wed, 18 Nov 2009 14:14:27 +0800 +Subject: [notmuch] Mac OS X/Darwin compatibility issues +In-Reply-To: <86einw2xof.fsf@fortitudo.i-did-not-set--mail-host-address--so-tickle-me> +References: <ddd65cda0911171950o4eea4389v86de9525e46052d3@mail.gmail.com> + <86einw2xof.fsf@fortitudo.i-did-not-set--mail-host-address--so-tickle-me> +Message-ID: <ddd65cda0911172214t60d22b63hcfeb5a19ab54a39b@mail.gmail.com> + +Hi, + +On Wed, Nov 18, 2009 at 1:45 PM, Alexander Botero-Lowry +<alex.boterolowry at gmail.com> wrote: +> for getline do you mind trying #define _GNU_SOURCE 1 +> before #include <stdio.h> in the offending files? The FreeBSD man pages +> mentions that as a way of enabling the GNU version of getline(). + +It seems even _GNU_SOURCE is defined, getline is still not present. +the C lib in Mac OS X simply doesn't have it. See also [1]. + +- Jiang + +[1] http://stackoverflow.com/questions/1117108/compiling-c-code-using-gnu-c-getline-on-mac-osx + diff --git a/test/corpora/default/cur/36:2, b/test/corpora/default/cur/36:2, new file mode 100644 index 00000000..4cd0d200 --- /dev/null +++ b/test/corpora/default/cur/36:2, @@ -0,0 +1,25 @@ +From: "Alexander Botero-Lowry" <alex.boterolowry@gmail.com> +To: notmuch@notmuchmail.org +Date: Tue, 17 Nov 2009 22:19:29 -0800 +Subject: [notmuch] Mac OS X/Darwin compatibility issues +In-Reply-To: <ddd65cda0911172214t60d22b63hcfeb5a19ab54a39b@mail.gmail.com> +References: <ddd65cda0911171950o4eea4389v86de9525e46052d3@mail.gmail.com> + <86einw2xof.fsf@fortitudo.i-did-not-set--mail-host-address--so-tickle-me> + <ddd65cda0911172214t60d22b63hcfeb5a19ab54a39b@mail.gmail.com> +Message-ID: <86d43g2w3y.fsf@fortitudo.i-did-not-set--mail-host-address--so-tickle-me> + +On Wed, 18 Nov 2009 14:14:27 +0800, Jjgod Jiang <gzjjgod at gmail.com> wrote: +> Hi, +> +> On Wed, Nov 18, 2009 at 1:45 PM, Alexander Botero-Lowry +> <alex.boterolowry at gmail.com> wrote: +> > for getline do you mind trying #define _GNU_SOURCE 1 +> > before #include <stdio.h> in the offending files? The FreeBSD man pages +> > mentions that as a way of enabling the GNU version of getline(). +> +> It seems even _GNU_SOURCE is defined, getline is still not present. +> the C lib in Mac OS X simply doesn't have it. See also [1]. +> +Alas. Since it's ostensibly based on the FreeBSD one, I figured there +was a chance that would fix the problem. :/ + diff --git a/test/corpora/default/cur/37:2, b/test/corpora/default/cur/37:2, new file mode 100644 index 00000000..4e17e82b --- /dev/null +++ b/test/corpora/default/cur/37:2, @@ -0,0 +1,22 @@ +From: "Alexander Botero-Lowry" <alex.boterolowry@gmail.com> +To: notmuch@notmuchmail.org +Date: Wed, 18 Nov 2009 00:02:56 -0800 +Subject: [notmuch] request for pull +Message-ID: <86aayk2rbj.fsf@fortitudo.i-did-not-set--mail-host-address--so-tickle-me> + +The following changes since commit e8c9c3e6a534fc6c2919c2c1de63cea7250eb488: + Ingmar Vanhassel (1): + Makefile: Manual pages shouldn't be executable + +are available in the git repository at: + + git://alexbl.net/notmuch.git master + +Alexander Botero-Lowry (2): + Error out if no query is supplied to search instead of going into an infinite loop + set a local truncate-line variable in notmuch-search-mode, so that subjects don't wrap and make the output look weird + + notmuch-search.c | 5 +++++ + notmuch.el | 1 + + 2 files changed, 6 insertions(+), 0 deletions(-) + diff --git a/test/corpora/default/cur/38:2, b/test/corpora/default/cur/38:2, new file mode 100644 index 00000000..f5537ffe --- /dev/null +++ b/test/corpora/default/cur/38:2, @@ -0,0 +1,40 @@ +From: "Keith Packard" <keithp@keithp.com> +To: notmuch@notmuchmail.org +Date: Wed, 18 Nov 2009 00:29:59 -0800 +Subject: [notmuch] [PATCH] Create a default notmuch-show-hook that + highlights URLs and uses word-wrap +Message-ID: <1258532999-9316-1-git-send-email-keithp@keithp.com> + +I created the notmuch-show-hook precisely so I could add these two +options, but I suspect most people will want them, so I just made them +the default. If you don't want them, you can use remove-hook to get +rid of this. + +Signed-off-by: Keith Packard <keithp at keithp.com> +--- + notmuch.el | 8 ++++++++ + 1 files changed, 8 insertions(+), 0 deletions(-) + +diff --git a/notmuch.el b/notmuch.el +index 1bb1294..c95cb43 100644 +--- a/notmuch.el ++++ b/notmuch.el +@@ -698,6 +698,14 @@ view, (remove the \"inbox\" tag from each), with either + :options '(goto-address) + :group 'notmuch) + ++; Make show mode a bit prettier, highlighting URLs and using word wrap ++ ++(defun notmuch-show-pretty-hook () ++ (goto-address-mode 1) ++ (visual-line-mode)) ++ ++(add-hook 'notmuch-show-hook 'notmuch-show-pretty-hook) ++ + (defun notmuch-show (thread-id &optional parent-buffer) + "Run \"notmuch show\" with the given thread ID and display results. + +-- +1.6.5.2 + + diff --git a/test/corpora/default/cur/39:2, b/test/corpora/default/cur/39:2, new file mode 100644 index 00000000..637b3c74 --- /dev/null +++ b/test/corpora/default/cur/39:2, @@ -0,0 +1,32 @@ +From: "Alexander Botero-Lowry" <alex.boterolowry@gmail.com> +To: notmuch@notmuchmail.org +Date: Wed, 18 Nov 2009 00:52:34 -0800 +Subject: [notmuch] [PATCH] Create a default notmuch-show-hook that + highlights URLs and uses word-wrap +In-Reply-To: <1258532999-9316-1-git-send-email-keithp@keithp.com> +References: <1258532999-9316-1-git-send-email-keithp@keithp.com> +Message-ID: <867hto2p0t.fsf@fortitudo.i-did-not-set--mail-host-address--so-tickle-me> + +On Wed, 18 Nov 2009 00:29:59 -0800, Keith Packard <keithp at keithp.com> wrote: +> I created the notmuch-show-hook precisely so I could add these two +> options, but I suspect most people will want them, so I just made them +> the default. If you don't want them, you can use remove-hook to get +> rid of this. +> +Yes, hooks should be added for search as well. :) + +> +; Make show mode a bit prettier, highlighting URLs and using word wrap +> + +> +(defun notmuch-show-pretty-hook () +> + (goto-address-mode 1) +> + (visual-line-mode)) +> + +visual-line-mode turns out to make subject look pretty ugly if there is a +continuation. It doesn't do much good for the citation headers +either. We probably need to do our own intelligent wrapping rather then +use visual-line-mode to make this actually look right. + +goto-address-mode is important though. :) + +alex + diff --git a/test/corpora/default/cur/40:2, b/test/corpora/default/cur/40:2, new file mode 100644 index 00000000..91a15a8d --- /dev/null +++ b/test/corpora/default/cur/40:2, @@ -0,0 +1,31 @@ +From: "Carl Worth" <cworth@cworth.org> +To: notmuch@notmuchmail.org +Date: Wed, 18 Nov 2009 01:42:02 -0800 +Subject: [notmuch] [PATCH 1/2] Close message file after parsing message + headers +In-Reply-To: <yunbpj0etua.fsf@aiko.keithp.com> +References: <1258471718-6781-1-git-send-email-dottedmag@dottedmag.net> + <87lji5cbwo.fsf@yoom.home.cworth.org> <yunbpj0etua.fsf@aiko.keithp.com> +Message-ID: <87pr7gqidx.fsf@yoom.home.cworth.org> + +On Tue, 17 Nov 2009 13:15:25 -0800, Keith Packard <keithp at keithp.com> wrote: +> Threading the message also involves displaying the from and to contents, +> which requires opening the message file. The alternative to the fix I +> provided is to just parse all of the message headers when first opening +> the message; it could then be immediately closed and the hash referred +> to for all header data. Given the choice, just having the caller say +> when it has finished with a message is probably a reasonable option... + +Hi Keith, + +Once I finally got back on the ground again, I pushed out a revised +version of your patch, (didn't need the reply-to stuff anymore since I +had fixed that differently in the meantime). + +I'm pretty happy with the state of this portion of the code now. + +Thanks Keith and Mikhail for your input on and code to fix this bug. + +-Carl + + diff --git a/test/corpora/default/cur/41:2, b/test/corpora/default/cur/41:2, new file mode 100644 index 00000000..da22cc02 --- /dev/null +++ b/test/corpora/default/cur/41:2, @@ -0,0 +1,37 @@ +From: "Carl Worth" <cworth@cworth.org> +To: notmuch@notmuchmail.org +Date: Wed, 18 Nov 2009 02:08:10 -0800 +Subject: [notmuch] Working with Maildir storage? +In-Reply-To: <20091117190054.GU3165@dottiness.seas.harvard.edu> +References: <20091117190054.GU3165@dottiness.seas.harvard.edu> +Message-ID: <87ocn0qh6d.fsf@yoom.home.cworth.org> + +On Tue, 17 Nov 2009 14:00:54 -0500, Lars Kellogg-Stedman <lars at seas.harvard.edu> wrote: +> I saw the LWN article and decided to take a look at notmuch. I'm +> currently using mutt and mairix to index and read a collection of +> Maildir mail folders (around 40,000 messages total). + +Welcome, Lars! + +I hadn't even seen that Keith's blog post had been picked up by lwn.net. +That's very interesting. So, thanks for coming and trying out notmuch. + +> Error opening +> /home/lars/Mail/read-messages.2008/cur/1246413773.24928_27334.hostname,U=3026:2,S: +> Too many open files + +Sadly, the lwn article coincided with me having just introduced this +bug, and then getting on a Trans-Atlantic flight. So I fixed the bug +fairly quickly, but there was quite a bit of latency before I could push +the fix out. It should be fixed now. + +> I'm curious if this is expected behavior (i.e., notmuch does not work +> with Maildir) or if something else is going on. + +Notmuch works just fine with maildir---it's one of the things that it +likes the best. + +Happy hacking, + +-Carl + diff --git a/test/corpora/default/cur/42:2, b/test/corpora/default/cur/42:2, new file mode 100644 index 00000000..98fa75fa --- /dev/null +++ b/test/corpora/default/cur/42:2, @@ -0,0 +1,30 @@ +From: "Carl Worth" <cworth@cworth.org> +To: notmuch@notmuchmail.org +Date: Wed, 18 Nov 2009 02:19:26 -0800 +Subject: [notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands + remove inbox (and unread) tags +In-Reply-To: <1258493565-13508-1-git-send-email-keithp@keithp.com> +References: <1258493565-13508-1-git-send-email-keithp@keithp.com> +Message-ID: <87k4xoqgnl.fsf@yoom.home.cworth.org> + +On Tue, 17 Nov 2009 13:32:45 -0800, Keith Packard <keithp at keithp.com> wrote: +> When closing a thread view, mark the thread as archived by removing +> the "inbox" tag, and for the 'x' variant, the "unread" tag as well, +> then kill the buffer and update the search window view as well. +> +> This makes 'x' much the same as 'a', but instead of taking you to the +> next message, it takes you back to the search window instead. + +I don't like this---but that's because I use 'x' precisely *because* it +preserves these tags. + +Otherwise, you might as well just remove inbox and unread as soon as the +message is presented to the user. And that's a bug in a lot of other +email programs that I'm unwilling to replicate. + +We may run into a need to define different ways that people like to work +with their email here. (I know that so far I've just been coding up the +way I want my mail to work.) + +-Carl + diff --git a/test/corpora/default/cur/43:2, b/test/corpora/default/cur/43:2, new file mode 100644 index 00000000..2f6c8bc8 --- /dev/null +++ b/test/corpora/default/cur/43:2, @@ -0,0 +1,26 @@ +From: "Carl Worth" <cworth@cworth.org> +To: notmuch@notmuchmail.org +Date: Wed, 18 Nov 2009 02:22:12 -0800 +Subject: [notmuch] archive +In-Reply-To: <yunzl6kd1w0.fsf@aiko.keithp.com> +References: <20091117232137.GA7669@griffis1.net> + <yunzl6kd1w0.fsf@aiko.keithp.com> +Message-ID: <87iqd8qgiz.fsf@yoom.home.cworth.org> + +On Tue, 17 Nov 2009 18:04:31 -0800, Keith Packard <keithp at keithp.com> wrote: +> On Tue, 17 Nov 2009 18:21:38 -0500, Aron Griffis <agriffis at n01se.net> wrote: +> +> > Just subscribed, I'd like to catch up on the previous postings, +> > but the archive link seems to be bogus? +> +> Yeah, the archive appears broken and will need to wait until Carl +> arrives in Barcelona to get fixed. + +Fixed it in transit in Frankfurt---with only moments to spare on my +battery and no outlets in sight. + +Thanks for the report, Aron. And welcome to notmuch! + +-Carl (who wants to reply to a lot more mail, but will have to wait + until later for that) + diff --git a/test/corpora/default/cur/44:2, b/test/corpora/default/cur/44:2, new file mode 100644 index 00000000..c896c189 --- /dev/null +++ b/test/corpora/default/cur/44:2, @@ -0,0 +1,29 @@ +From: "Carl Worth" <cworth@cworth.org> +To: notmuch@notmuchmail.org +Date: Wed, 18 Nov 2009 02:43:50 -0800 +Subject: [notmuch] [PATCH] Older versions of install do not support -C. +In-Reply-To: <1258496327-12086-1-git-send-email-jan@ryngle.com> +References: <1258496327-12086-1-git-send-email-jan@ryngle.com> +Message-ID: <87hbssqfix.fsf@yoom.home.cworth.org> + +On Tue, 17 Nov 2009 23:18:47 +0100, Jan Janak <jan at ryngle.com> wrote: +> Do not use -C cmdline option of install, older versions, commonly found in +> distributions like Debian, do not seem to support it. Running make install +> on such systems (tested on Debian Lenny) fails. +> +> Signed-off-by: Jan Janak <jan at ryngle.com> + +Thanks, Jan. This is pushed now. + +And did I say welcome to notmuch yet? (It's easy to lose track with all +the newcomers---which I'm not complaining about---especially since so +many are sharing code.) + +-Carl + +PS. I actually really like the behavior of -C (especially when +installing a low-level library to avoid big waterfalls of needless +recompiles). But since we're *not* actually installing a library (yet) +I'm happy with this patch rather than writing code in configure to check +if "install -C" works or not. + diff --git a/test/corpora/default/cur/45:2, b/test/corpora/default/cur/45:2, new file mode 100644 index 00000000..806b0e89 --- /dev/null +++ b/test/corpora/default/cur/45:2, @@ -0,0 +1,41 @@ +From: "Carl Worth" <cworth@cworth.org> +To: notmuch@notmuchmail.org +Date: Wed, 18 Nov 2009 02:49:52 -0800 +Subject: [notmuch] What a great idea! +In-Reply-To: <f35dbb950911171435ieecd458o853c873e35f4be95@mail.gmail.com> +References: <f35dbb950911171435ieecd458o853c873e35f4be95@mail.gmail.com> +Message-ID: <87fx8cqf8v.fsf@yoom.home.cworth.org> + +On Tue, 17 Nov 2009 23:35:30 +0100, Jan Janak <jan at ryngle.com> wrote: +> First of all, notmuch is a wonderful idea, both the cmdline tool and +> the emacs interface! Thanks a lot for writing it, I was really excited +> when I read the announcement today. + +Ah, here's where I planned a nice welcome. So welcome (again), Jan! :-) + +I've been having a lot of fun with notmuch already, (though there have +been some days of pain before it was functional enough and my +email-reply latency went way up). But regardless---I got through that, +and I'm able to work more efficiently with notmuch now than I could with +sup before. So I'm happy. + +And I'm delighted when other people find this interesting as well. + +> Have you considered sending an announcement to the org-mode mailing list? +> http://orgmode.org + +Thanks for the idea. I think I may have looked into org-mode years ago, +(when I was investigating planner-mode and various emacs "personal wiki" +systems for keeping random notes and what-not). + +> Various ways of searching/referencing emails from emacs were discussed +> there several times and none of them were as elegant as notmuch (not +> even close). Maybe notmuch would attract some of the developers +> there.. + +Yeah. I'll drop them a mail. Having a real emacs wizard on board would +be nice. (I'm afraid the elisp I've written so far for this project is +fairly grim.) + +-Carl + diff --git a/test/corpora/default/cur/46:2, b/test/corpora/default/cur/46:2, new file mode 100644 index 00000000..bbd1b37f --- /dev/null +++ b/test/corpora/default/cur/46:2, @@ -0,0 +1,57 @@ +From: "Carl Worth" <cworth@cworth.org> +To: notmuch@notmuchmail.org +Date: Wed, 18 Nov 2009 03:02:43 -0800 +Subject: [notmuch] New to the list +In-Reply-To: <1258498485-sup-142@elly> +References: <1258498485-sup-142@elly> +Message-ID: <87bpj0qeng.fsf@yoom.home.cworth.org> + +On Tue, 17 Nov 2009 23:57:18 +0100, Israel Herraiz <isra at herraiz.org> wrote: +> I have subscribed to the list. As suggested by the welcome message, I +> am introducing myself. My name is Israel Herraiz, and I have done a +> couple of contributions to Sup, the probably well-known here e-mail +> client. + +Welcome, Israel! + +I'm glad people read that little bit of text in the welcome email and +are introducing themselves. I like to think of our new notmuch community +as a very personable place. + +> "Not much" sounds interesting, and I wonder whether it could be +> integrated with the views of Sup (inbox, threads, etc). So I have +> subscribed to the list to keep an eye on what's going on here. +> +> I have just heard of "Not much". I have not even tried to download the +> code yet. + +Yes, take a look. If you're already an emacs user, then you'll find the +interface of notmuch very comfortable, (looks a lot like sup, but lives +inside of emacs). Even outside of emacs, the command line interface of +notmuch gives view *fairly* similar to those of sup: + + notmuch search tag:inbox # Very much like sup's inbox + + notmuch show thread:some-thread-id # A lot like sup's thread -view + +The command-line output right now isn't nearly as neat as sup's, (it +doesn't elide comments--it doesn't do the indenting of threads, etc.), +even though the command-line interface has all the information it needs +to do that. The reason for that is to let the emacs code own most of the +formatting, (so that it can be more flexible--such as making hidden +things visible, changing column widths, etc.). + +But one thing I wonder is if there would be situations where it would +make sense to get the cleaner output directly out of the command-line +tool. + +For example, for someone who isn't an emacs user, the command-line +interface might be their only introduction to what the "notmuch +experience" is like. So maybe "notmuch show" should give nice clean +output by default and then the emacs code could call "notmuch show +--format=emacs-friendly" or something to get the current output. + +That's an idea anyway. + +-Carl + diff --git a/test/corpora/default/cur/47:2, b/test/corpora/default/cur/47:2, new file mode 100644 index 00000000..9de5532c --- /dev/null +++ b/test/corpora/default/cur/47:2, @@ -0,0 +1,84 @@ +From: "Carl Worth" <cworth@cworth.org> +To: notmuch@notmuchmail.org +Date: Wed, 18 Nov 2009 03:15:31 -0800 +Subject: [notmuch] Introducing myself +In-Reply-To: <20091118002059.067214ed@hikari> +References: <20091118002059.067214ed@hikari> +Message-ID: <87aaykqe24.fsf@yoom.home.cworth.org> + +On Wed, 18 Nov 2009 00:20:59 +0100, Adrian Perez de Castro <aperez at igalia.com> wrote: +> I have just heard about Not Much today in some random Linux-related news +> site (LWN?), my name is Adrian Perez and I work as systems administrator + +Welcome to notmuch, Adrian! We're glad to have you here. + +> by default on most distribution. I got to have some mailboxes indexed and +> basic searching working a couple of months ago. Lately I have been very +> busy and had no time for coding, and them... boom! Not Much appears -- and +> it is almost exactly what I was trying to do, but faster. I have been +> playing a bit with Not Much today, and I think it has potential. + +It's funny, because I had the exact same experience with sup a couple of +months ago. I had been frustrated for years with email programs, and had +been thinking about how I'd like things to work n the back of my mind +for a long time, (but never *quite* getting to the point where I would +commit to writing an email system myself). + +And then... boom! I found sup and was instantly hooked. It had so much +of what I had imagined, (and much of what I hadn't yet imagined) that I +was quite delighted. + +It was really quite by accident that I ended up inventing a different +system. I had started out just trying to speedup index creation for sup. +If I hadn't run into the problem that it was very difficult[*] to create a +sup-compatible index from C code, I might have stopped there. + +So I'd written a bunch of functional code, only to find myself stuck at +the very last step, (hooking it up to the existing sup interface). Then +Keith suggested emacs and it all seemed pretty easy since I'd already +done all the Xapian work. So it's funny, I was only willing to commit to +this project because I wasn't consciously aware I was working on it. +Otherwise it would have seemed to overwhelming to start. :-) + +Anyway, that's a lot of off-topic rambling off of your introduction. But +I'm glad that notmuch can now give that same "boom!" to others, and I'm +glad you see potential in it. + +> Also, I would like to share one idea I had in mind, that you might find +> interesting: One thing I have found very annoying is having to re-tag my +> mail when the indexes get b0rked (it happened a couple of times to me while +> using Sup), so I was planning to mails as read/unread and adding the tags +> not just to the index, but to the mail text itself, e.g. by adding a +> "X-Tags" header field or by reusing the "Keywords" one. This way, the index +> could be totally recreated by re-reading the mail directories, and this +> would also allow to a tools like OfflineIMAP [1] to get the mails into a +> local maildir, tagging and indexing the mails with the e-mail reader and +> then syncing back the messages with the "X-Tags" header to the IMAP server. +> This would allow to use the mail reader from a different computer and still +> have everything tagged finely. + +It is an interesting idea. But there's also something really comforting +about the email indexed never modifying the mail files. If you're +reading the notmuch commit logs closely you'll see that I'm not actually +careful enough to be trusted with your mail (but I try). So I like that +I don't even have to trust myself---the worst that happens is that I +have to recreate my index. + +And as Keith mentioned, we've got the "notmuch dump; notmuch restore" +idea working exactly as it did in sup. (Though I am thinking of also +adding thread IDs to that now---more on that later.) + +The big annoyance I had with sup index creation, (I ended up having to +do it more than once too), was that it takes *forever*. Right now, +notmuch is a little bit faster, but not a lot faster. And I've got some +ideas to fix that. It would be really nice if index creation were pain +free. (And maybe it is for some user with small amounts of mail---oh, to +have only 40000 messages to have to index!). + +-Carl + +[*] The problem here is that sup puts serialized ruby data structures +into the data field of its Xapian documents. So being compatible with +sup means being able to recreate serialized data structures for a +particular version of ruby. + diff --git a/test/corpora/default/cur/48:2, b/test/corpora/default/cur/48:2, new file mode 100644 index 00000000..419e21db --- /dev/null +++ b/test/corpora/default/cur/48:2, @@ -0,0 +1,17 @@ +From: "Carl Worth" <cworth@cworth.org> +To: notmuch@notmuchmail.org +Date: Wed, 18 Nov 2009 03:22:32 -0800 +Subject: [notmuch] [PATCH] Typsos +In-Reply-To: <1258500222-32066-1-git-send-email-ingmar@exherbo.org> +References: <1258500222-32066-1-git-send-email-ingmar@exherbo.org> +Message-ID: <878we4qdqf.fsf@yoom.home.cworth.org> + +On Wed, 18 Nov 2009 00:23:42 +0100, Ingmar Vanhassel <ingmar at exherbo.org> wrote: +> 17 files changed, 30 insertions(+), 30 deletions(-) + +Yikes. That's a lot of typos. + +Thanks Ingmar, for cleaning up after my sloppy keyboarding. Pushed. + +-Carl + diff --git a/test/corpora/default/cur/49:2, b/test/corpora/default/cur/49:2, new file mode 100644 index 00000000..b244f8ce --- /dev/null +++ b/test/corpora/default/cur/49:2, @@ -0,0 +1,33 @@ +From: "Carl Worth" <cworth@cworth.org> +To: notmuch@notmuchmail.org +Date: Wed, 18 Nov 2009 03:31:23 -0800 +Subject: [notmuch] [PATCH] Error out if no query is supplied to search + instead of going into an infinite loop +In-Reply-To: <cf0c4d610911171623q3e27a0adx802e47039b57604b@mail.gmail.com> +References: <cf0c4d610911171623q3e27a0adx802e47039b57604b@mail.gmail.com> +Message-ID: <877htoqdbo.fsf@yoom.home.cworth.org> + +On Tue, 17 Nov 2009 16:23:53 -0800, Alex Botero-Lowry <alex.boterolowry at gmail.com> wrote: +> In this case error out when no query is supplied. There seems to be an +> infinite-loop casued by i think notmuch_query_search_threads having +> an exception: +> A Xapian exception occurred: Syntax: <expression> AND <expression> +> A Xapian exception occurred: Syntax: <expression> AND <expression> +> A Xapian exception occurred: Syntax: <expression> AND <expression> +> +> I'll look into that bug specifically a bit later. +> +> It might be better to do a usage instead of just throwing an error here? + +Definitely. + +Priit Laes reported the same thing in IRC and I've just committed a +patch to give a nice error message: + +$ ./notmuch search +Error: notmuch search requires at least one search term. + +Thanks for the report! + +-Carl + diff --git a/test/corpora/default/cur/50:2, b/test/corpora/default/cur/50:2, new file mode 100644 index 00000000..44e8be5d --- /dev/null +++ b/test/corpora/default/cur/50:2, @@ -0,0 +1,39 @@ +From: "Chris Wilson" <chris@chris-wilson.co.uk> +To: notmuch@notmuchmail.org +Date: Wed, 18 Nov 2009 11:34:54 +0000 +Subject: [notmuch] [PATCH 1/2] Makefile: evaluate pkg-config once +Message-ID: <1258544095-16616-1-git-send-email-chris@chris-wilson.co.uk> + +Currently the same `pkg-config ...` is executed for every target, so +just store the results in a variable. +--- + Makefile | 9 +++++---- + 1 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 96aaa73..023b2ec 100644 +--- a/Makefile ++++ b/Makefile +@@ -4,15 +4,16 @@ CFLAGS=-O2 + + # Additional flags that we will append to whatever the user set. + # These aren't intended for the user to manipulate. +-extra_cflags = `pkg-config --cflags glib-2.0 gmime-2.4 talloc` +-extra_cxxflags = `xapian-config --cxxflags` ++extra_cflags := $(shell pkg-config --cflags glib-2.0 gmime-2.4 talloc) ++extra_cxxflags := $(shell xapian-config --cxxflags) + + # Now smash together user's values with our extra values + override CFLAGS += $(WARN_FLAGS) $(extra_cflags) + override CXXFLAGS += $(WARN_FLAGS) $(extra_cflags) $(extra_cxxflags) + +-override LDFLAGS += `pkg-config --libs glib-2.0 gmime-2.4 talloc` \ +- `xapian-config --libs` ++override LDFLAGS += \ ++ $(shell pkg-config --libs glib-2.0 gmime-2.4 talloc) \ ++ $(shell xapian-config --libs) + + # Include our local Makefile.local first so that its first target is default + include Makefile.local +-- +1.6.5.2 diff --git a/test/corpora/default/cur/51:2, b/test/corpora/default/cur/51:2, new file mode 100644 index 00000000..f522f69e --- /dev/null +++ b/test/corpora/default/cur/51:2, @@ -0,0 +1,12 @@ +From: "Aron Griffis" <agriffis@n01se.net> +To: notmuch@notmuchmail.org +Date: Tue, 17 Nov 2009 18:21:38 -0500 +Subject: [notmuch] archive +Message-ID: <20091117232137.GA7669@griffis1.net> + +Just subscribed, I'd like to catch up on the previous postings, +but the archive link seems to be bogus? + +Thanks, +Aron + diff --git a/test/corpora/default/cur/52:2, b/test/corpora/default/cur/52:2, new file mode 100644 index 00000000..60283404 --- /dev/null +++ b/test/corpora/default/cur/52:2, @@ -0,0 +1,39 @@ +Message-ID: <4EFC743A.3060609@april.org> +Date: Thu, 29 Dec 2010 15:07:54 +0100 +From: "=?ISO-8859-1?Q?Fran=E7ois_Boulogne?=" <boulogne.f@gmail.com> +User-Agent: Mozilla/5.0 (X11; Linux i686; + rv:9.0) Gecko/20111224 Thunderbird/9.0.1 +MIME-Version: 1.0 +To: Allan McRae <allan@archlinux.org>, + "Discussion about the Arch User Repository (AUR)" <aur-general@archlinux.org> +References: <4EFC3931.6030007@april.org> <4EFC3D62.4030202@archlinux.org> +In-Reply-To: <4EFC3D62.4030202@archlinux.org> +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +Subject: Re: [aur-general] Guidelines: cp, mkdir vs install + +Le 29/12/2011 11:13, Allan McRae a écrit : +> On 29/12/11 19:56, François Boulogne wrote: +>> Hi, +>> +>> Looking to improve the quality of my packages, I read again the guidelines. +>> https://wiki.archlinux.org/index.php/Arch_Packaging_Standards +>> +>> However, it don't see anything about the install command like +>> install -d $pkgdir/usr/{bin,share/man/man1,share/locale} +>> +>> Some contributors on AUR use cp or mkdir to install files/dir (when no +>> makefile is provided) and others use install command. +>> +>> What's the opinion of TU on this point? +>> +> +> Use install with -m specifying the correct permissions +> + +Thank you Allan + + +-- +François Boulogne. +https://www.sciunto.org diff --git a/test/corpora/default/cur/53:2, b/test/corpora/default/cur/53:2, new file mode 100644 index 00000000..7a1e2e58 --- /dev/null +++ b/test/corpora/default/cur/53:2, @@ -0,0 +1,20 @@ +From: Olivier Berger <olivier.berger@it-sudparis.eu> +To: olivier.berger@it-sudparis.eu +Subject: Essai =?iso-8859-1?Q?accentu=E9?= +User-Agent: Notmuch/0.10.1 (http://notmuchmail.org) Emacs/23.3.1 (i486-pc-linux-gnu) +X-Draft-From: ("nnimap+localdovecot:INBOX" 44228) +Date: Fri, 16 Dec 2010 16:49:59 +0100 +Message-ID: <877h1wv7mg.fsf@inf-8657.int-evry.fr> +MIME-Version: 1.0 +Content-Type: text/plain; charset=iso-8859-1 +Content-Transfer-Encoding: quoted-printable + +Du texte accentu=E9 pour =E7a ... + +=E0 la bonne heure ! +--=20 +Olivier BERGER=20 +http://www-public.it-sudparis.eu/~berger_o/ - OpenPGP-Id: 2048R/5819D7E8 +Ingenieur Recherche - Dept INF +Institut TELECOM, SudParis (http://www.it-sudparis.eu/), Evry (France) + diff --git a/test/corpora/default/foo/06:2, b/test/corpora/default/foo/06:2, new file mode 100644 index 00000000..3baad491 --- /dev/null +++ b/test/corpora/default/foo/06:2, @@ -0,0 +1,36 @@ +From: "Carl Worth" <cworth@cworth.org> +To: notmuch@notmuchmail.org +Date: Tue, 17 Nov 2009 12:19:24 -0800 +Subject: [notmuch] preliminary FreeBSD support +In-Reply-To: <cf0c4d610911171136h1713aa59w9cf9aa31f052ad0a@mail.gmail.com> +References: <cf0c4d610911171136h1713aa59w9cf9aa31f052ad0a@mail.gmail.com> +Message-ID: <87lji4lx9v.fsf@yoom.home.cworth.org> + +On Tue, 17 Nov 2009 11:36:14 -0800, Alex Botero-Lowry <alex.boterolowry at gmail.com> wrote: +> I saw the announcement this morning, and was very excited, as I had been +> hoping sup would be turned into a library, +> since I like the concept more than the UI (I'd rather an emacs interface). + +Hi Alex, + +That's great! It's good to hear that there are like-minded people out +there. I hope that Notmuch will be useful for you. + +> I did a preliminary compile which worked out fine, but +> sysconf(_SC_SC_GETPW_R_SIZE_MAX) returns -1 on +> FreeBSD, so notmuch_config_open segfaulted. +> +> Attached is a patch that supplies a default buffer size of 64 in cases where +> -1 is returned. + +Thanks for the patch. As we discussed in IRC[*], we should probably +do the correct thing and check for ERANGE and loop as necessary (even if +sysconf returns a positive value). Example code here: + +http://www.opengroup.org/austin/docs/austin_328.txt + +-Carl + +[*] #notmuch on irc.freenode.net for those who didn't just guess that +already, (and I'll add that to the website soon). + diff --git a/test/corpora/default/foo/baz/11:2, b/test/corpora/default/foo/baz/11:2, new file mode 100644 index 00000000..c0701def --- /dev/null +++ b/test/corpora/default/foo/baz/11:2, @@ -0,0 +1,27 @@ +From: "Keith Packard" <keithp@keithp.com> +To: notmuch@notmuchmail.org +Date: Tue, 17 Nov 2009 13:15:25 -0800 +Subject: [notmuch] [PATCH 1/2] Close message file after parsing message + headers +In-Reply-To: <87lji5cbwo.fsf@yoom.home.cworth.org> +References: <1258471718-6781-1-git-send-email-dottedmag@dottedmag.net> + <87lji5cbwo.fsf@yoom.home.cworth.org> +Message-ID: <yunbpj0etua.fsf@aiko.keithp.com> + +On Tue, 17 Nov 2009 09:13:27 -0800, Carl Worth <cworth at cworth.org> wrote: + +> I didn't apply Keith's fix yet, because I think I'd rather just fix the +> indexer to store the In-Reply-To header in a separate term prefix from +> the term used for the References header[*]. That will then let us lookup +> the in-reply-to value later for thread constructions without having to +> open the original email file at all. + +Threading the message also involves displaying the from and to contents, +which requires opening the message file. The alternative to the fix I +provided is to just parse all of the message headers when first opening +the message; it could then be immediately closed and the hash referred +to for all header data. Given the choice, just having the caller say +when it has finished with a message is probably a reasonable option... + +-keith + diff --git a/test/corpora/default/foo/baz/12:2, b/test/corpora/default/foo/baz/12:2, new file mode 100644 index 00000000..fbc604c0 --- /dev/null +++ b/test/corpora/default/foo/baz/12:2, @@ -0,0 +1,27 @@ +From: "Keith Packard" <keithp@keithp.com> +To: notmuch@notmuchmail.org +Date: Tue, 17 Nov 2009 13:24:13 -0800 +Subject: [notmuch] Working with Maildir storage? +In-Reply-To: <20091117203301.GV3165@dottiness.seas.harvard.edu> +References: <20091117190054.GU3165@dottiness.seas.harvard.edu> + <87iqd9rn3l.fsf@vertex.dottedmag> + <20091117203301.GV3165@dottiness.seas.harvard.edu> +Message-ID: <yunaayketfm.fsf@aiko.keithp.com> + +On Tue, 17 Nov 2009 15:33:01 -0500, Lars Kellogg-Stedman <lars at seas.harvard.edu> wrote: +> > See the patch just posted here. + +I've also pushed a slightly more complicated (and complete) fix to my +private notmuch repository + +git://keithp.com/git/notmuch + +> Is the list archived anywhere? + +Oops. Looks like Carl's mail server is broken. He's traveling to +Barcelona today and so it won't get fixed for a while. + +Thanks to everyone for trying out notmuch! + +-keith + diff --git a/test/corpora/default/foo/baz/cur/13:2, b/test/corpora/default/foo/baz/cur/13:2, new file mode 100644 index 00000000..03cb3744 --- /dev/null +++ b/test/corpora/default/foo/baz/cur/13:2, @@ -0,0 +1,178 @@ +From: "Keith Packard" <keithp@keithp.com> +To: notmuch@notmuchmail.org +Date: Tue, 17 Nov 2009 13:32:45 -0800 +Subject: [notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove + inbox (and unread) tags +Message-ID: <1258493565-13508-1-git-send-email-keithp@keithp.com> + +When closing a thread view, mark the thread as archived by removing +the "inbox" tag, and for the 'x' variant, the "unread" tag as well, +then kill the buffer and update the search window view as well. + +This makes 'x' much the same as 'a', but instead of taking you to the +next message, it takes you back to the search window instead. + +Signed-off-by: Keith Packard <keithp at keithp.com> +--- + notmuch.el | 86 ++++++++++++++++++++++++++++++++++++++++++++++------------- + 1 files changed, 67 insertions(+), 19 deletions(-) + +diff --git a/notmuch.el b/notmuch.el +index 638d49d..7b0d72c 100644 +--- a/notmuch.el ++++ b/notmuch.el +@@ -31,8 +31,8 @@ + ; Will be much preferable to switch to direct manipulation for + ; toggling visibility of these components. Probably using + ; overlays-at to query and manipulate the current overlay. +- (define-key map "a" 'notmuch-show-archive-thread) +- (define-key map "A" 'notmuch-show-mark-read-then-archive-thread) ++ (define-key map "a" 'notmuch-show-mark-read-archive-thread-next-thread) ++ (define-key map "A" 'notmuch-show-archive-thread-next-thread) + (define-key map "b" 'notmuch-show-toggle-body-read-visible) + (define-key map "c" 'notmuch-show-toggle-citations-visible) + (define-key map "h" 'notmuch-show-toggle-headers-visible) +@@ -47,7 +47,8 @@ + (define-key map "s" 'notmuch-show-toggle-signatures-visible) + (define-key map "v" 'notmuch-show-view-all-mime-parts) + (define-key map "w" 'notmuch-show-view-raw-message) +- (define-key map "x" 'kill-this-buffer) ++ (define-key map "x" 'notmuch-show-mark-read-archive-thread-kill-buffer) ++ (define-key map "X" 'notmuch-show-archive-thread-kill-buffer) + (define-key map "+" 'notmuch-show-add-tag) + (define-key map "-" 'notmuch-show-remove-tag) + (define-key map (kbd "DEL") 'notmuch-show-rewind) +@@ -183,7 +184,33 @@ Unlike builtin `next-line' this version accepts no arguments." + (cons (notmuch-show-get-message-id) nil))) + (notmuch-show-set-tags (sort (set-difference tags toremove :test 'string=) 'string<)))))) + +-(defun notmuch-show-archive-thread-maybe-mark-read (markread) ++(defun notmuch-show-next-thread (markread) ++ (let ((parent-buffer notmuch-show-parent-buffer)) ++ (kill-this-buffer) ++ (if parent-buffer ++ (progn ++ (switch-to-buffer parent-buffer) ++ (forward-line) ++ (notmuch-search-show-thread))))) ++ ++(defun notmuch-delete-tags (to-remove from) ++ (if to-remove ++ (delete (car to-remove) (notmuch-delete-tags (cdr to-remove) from)) ++ from)) ++ ++(defun notmuch-kill-message-buffer (markread) ++ (let ((parent-buffer notmuch-show-parent-buffer)) ++ (kill-this-buffer) ++ (if parent-buffer ++ (progn ++ (switch-to-buffer parent-buffer) ++ (let ((tags (notmuch-search-get-tags))) ++ (setq tags (delete "inbox" tags)) ++ (if markread (setq tags (delete "unread" tags))) ++ (notmuch-search-set-tags tags)) ++ (forward-line))))) ++ ++(defun notmuch-show-archive-thread-maybe-mark-read (markread shownext) + (save-excursion + (goto-char (point-min)) + (while (not (eobp)) +@@ -194,15 +221,9 @@ Unlike builtin `next-line' this version accepts no arguments." + (forward-char)) + (if (not (re-search-forward notmuch-show-message-begin-regexp nil t)) + (goto-char (point-max))))) +- (let ((parent-buffer notmuch-show-parent-buffer)) +- (kill-this-buffer) +- (if parent-buffer +- (progn +- (switch-to-buffer parent-buffer) +- (forward-line) +- (notmuch-search-show-thread))))) ++ (if shownext (notmuch-show-next-thread markread) (notmuch-kill-message-buffer markread))) + +-(defun notmuch-show-mark-read-then-archive-thread () ++(defun notmuch-show-mark-read-archive-thread-next-thread () + "Remove \"unread\" tag from each message, then archive and show next thread. + + Archive each message currrently shown by removing the \"unread\" +@@ -215,9 +236,22 @@ being delivered to the same thread. It does not archive the + entire thread, but only the messages shown in the current + buffer." + (interactive) +- (notmuch-show-archive-thread-maybe-mark-read t)) ++ (notmuch-show-archive-thread-maybe-mark-read t t)) ++ ++(defun notmuch-show-mark-read-archive-thread-kill-buffer () ++ "Remove \"unread\" tag from each message, then archive and kill the buffer. ++ ++Archive each message currrently shown by removing the \"unread\" ++and \"inbox\" tag from each. Then kill this buffer. ++ ++Note: This command is safe from any race condition of new messages ++being delivered to the same thread. It does not archive the ++entire thread, but only the messages shown in the current ++buffer." ++ (interactive) ++ (notmuch-show-archive-thread-maybe-mark-read t nil)) + +-(defun notmuch-show-archive-thread () ++(defun notmuch-show-archive-thread-next-thread () + "Archive each message in thread, and show next thread from search. + + Archive each message currrently shown by removing the \"inbox\" +@@ -229,7 +263,20 @@ being delivered to the same thread. It does not archive the + entire thread, but only the messages shown in the current + buffer." + (interactive) +- (notmuch-show-archive-thread-maybe-mark-read nil)) ++ (notmuch-show-archive-thread-maybe-mark-read nil t)) ++ ++(defun notmuch-show-archive-thread-kill-buffer () ++ "Archive each message in thread, and kill the thread buffer. ++ ++Archive each message currrently shown by removing the \"inbox\" ++tag from each. Then kill this buffer. ++ ++Note: This command is safe from any race condition of new messages ++being delivered to the same thread. It does not archive the ++entire thread, but only the messages shown in the current ++buffer." ++ (interactive) ++ (notmuch-show-archive-thread-maybe-mark-read nil t)) + + (defun notmuch-show-view-raw-message () + "View the raw email of the current message." +@@ -297,7 +344,7 @@ by searching backward)." + (not (re-search-forward notmuch-show-message-begin-regexp nil t))))) + + (defun notmuch-show-message-unread-p () +- "Preficate testing whether current message is unread." ++ "Predicate testing whether current message is unread." + (member "unread" (notmuch-show-get-tags))) + + (defun notmuch-show-next-message () +@@ -434,7 +481,7 @@ which this thread was originally shown." + (let ((last (notmuch-show-last-message-p))) + (notmuch-show-mark-read-then-next-open-message) + (if last +- (notmuch-show-archive-thread)))))) ++ (notmuch-show-archive-thread-next-thread)))))) + + (defun notmuch-show-markup-citations-region (beg end depth) + (goto-char beg) +@@ -618,8 +665,9 @@ messages. Each time you navigate away from a message with + + You can add or remove tags from the current message with '+' and + '-'. You can also archive all messages in the current +-view, (remove the \"inbox\" tag from each), with +-`notmuch-show-archive-thread' (bound to 'a' by default). ++view, (remove the \"inbox\" tag from each), with either ++`notmuch-show-archive-thread-next-thread' (bound to 'a' by default) or ++`notmuch-show-archive-thread-kill-buffer' (bound to 'x' by default). + + \\{notmuch-show-mode-map}" + (interactive) +-- +1.6.5.2 + + diff --git a/test/corpora/default/foo/baz/cur/14:2, b/test/corpora/default/foo/baz/cur/14:2, new file mode 100644 index 00000000..d3fe78db --- /dev/null +++ b/test/corpora/default/foo/baz/cur/14:2, @@ -0,0 +1,39 @@ +From: "Jan Janak" <jan@ryngle.com> +To: notmuch@notmuchmail.org +Date: Tue, 17 Nov 2009 23:18:47 +0100 +Subject: [notmuch] [PATCH] Older versions of install do not support -C. +Message-ID: <1258496327-12086-1-git-send-email-jan@ryngle.com> + +Do not use -C cmdline option of install, older versions, commonly found in +distributions like Debian, do not seem to support it. Running make install +on such systems (tested on Debian Lenny) fails. + +Signed-off-by: Jan Janak <jan at ryngle.com> +--- + Makefile.local | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile.local b/Makefile.local +index f824bed..f51f1d1 100644 +--- a/Makefile.local ++++ b/Makefile.local +@@ -27,11 +27,11 @@ install: all notmuch.1.gz + for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(prefix)/share/man/man1 \ + $(DESTDIR)/etc/bash_completion.d/ ; \ + do \ +- install -C -d $$d ; \ ++ install -d $$d ; \ + done ; +- install -C notmuch $(DESTDIR)$(prefix)/bin/ +- install -C -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/ +- install -C notmuch-completion.bash \ ++ install notmuch $(DESTDIR)$(prefix)/bin/ ++ install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/ ++ install notmuch-completion.bash \ + $(DESTDIR)/etc/bash_completion.d/notmuch + + SRCS := $(SRCS) $(notmuch_client_srcs) +-- +1.6.3.3 + + diff --git a/test/corpora/default/foo/baz/new/15:2, b/test/corpora/default/foo/baz/new/15:2, new file mode 100644 index 00000000..6824d5ea --- /dev/null +++ b/test/corpora/default/foo/baz/new/15:2, @@ -0,0 +1,22 @@ +From: "Jan Janak" <jan@ryngle.com> +To: notmuch@notmuchmail.org +Date: Tue, 17 Nov 2009 23:35:30 +0100 +Subject: [notmuch] What a great idea! +Message-ID: <f35dbb950911171435ieecd458o853c873e35f4be95@mail.gmail.com> + +Hello, + +First of all, notmuch is a wonderful idea, both the cmdline tool and +the emacs interface! Thanks a lot for writing it, I was really excited +when I read the announcement today. + +Have you considered sending an announcement to the org-mode mailing list? +http://org-mode.org + +Various ways of searching/referencing emails from emacs were discussed +there several times and none of them were as elegant as notmuch (not +even close). Maybe notmuch would attract some of the developers +there.. + + -- Jan + diff --git a/test/corpora/default/foo/baz/new/16:2, b/test/corpora/default/foo/baz/new/16:2, new file mode 100644 index 00000000..f531eb93 --- /dev/null +++ b/test/corpora/default/foo/baz/new/16:2, @@ -0,0 +1,27 @@ +From: "Jan Janak" <jan@ryngle.com> +To: notmuch@notmuchmail.org +Date: Tue, 17 Nov 2009 23:38:47 +0100 +Subject: [notmuch] What a great idea! +In-Reply-To: <f35dbb950911171435ieecd458o853c873e35f4be95@mail.gmail.com> +References: <f35dbb950911171435ieecd458o853c873e35f4be95@mail.gmail.com> +Message-ID: <f35dbb950911171438k5df6eb56k77b6c0944e2e79ae@mail.gmail.com> + +On Tue, Nov 17, 2009 at 11:35 PM, Jan Janak <jan at ryngle.com> wrote: +> Hello, +> +> First of all, notmuch is a wonderful idea, both the cmdline tool and +> the emacs interface! Thanks a lot for writing it, I was really excited +> when I read the announcement today. +> +> Have you considered sending an announcement to the org-mode mailing list? +> http://org-mode.org + +Sorry, wrong URL, the correct one is: http://orgmode.org + +> Various ways of searching/referencing emails from emacs were discussed +> there several times and none of them were as elegant as notmuch (not +> even close). Maybe notmuch would attract some of the developers +> there.. + + -- Jan + diff --git a/test/corpora/default/foo/cur/07:2, b/test/corpora/default/foo/cur/07:2, new file mode 100644 index 00000000..7b1e2bbe --- /dev/null +++ b/test/corpora/default/foo/cur/07:2, @@ -0,0 +1,57 @@ +From: "Carl Worth" <cworth@cworth.org> +To: notmuch@notmuchmail.org +Date: Tue, 17 Nov 2009 09:13:27 -0800 +Subject: [notmuch] [PATCH 1/2] Close message file after parsing message + headers +In-Reply-To: <1258471718-6781-1-git-send-email-dottedmag@dottedmag.net> +References: <1258471718-6781-1-git-send-email-dottedmag@dottedmag.net> +Message-ID: <87lji5cbwo.fsf@yoom.home.cworth.org> + +On Tue, 17 Nov 2009 21:28:37 +0600, Mikhail Gusarov <dottedmag at dottedmag.net> wrote: +> Keeping unused files open helps to see "Too many open files" often. +> +> Signed-off-by: Mikhail Gusarov <dottedmag at dottedmag.net> +... +On Tue, 17 Nov 2009 21:28:38 +0600, Mikhail Gusarov <dottedmag at dottedmag.net> wrote: +> +> Signed-off-by: Mikhail Gusarov <dottedmag at dottedmag.net> +> --- +> lib/message.cc | 2 ++ +> 1 files changed, 2 insertions(+), 0 deletions(-) + +Hi Mikhail, + +Welcome to notmuch, and thanks for these patches! I've pushed both of +them out now. + +Keith ran into the same problem of "too many open files" and wrote a +more complex fix, (which included what you did here). His code can be +seen at: + + git://keithp.com/git/notmuch + +I didn't apply Keith's fix yet, because I think I'd rather just fix the +indexer to store the In-Reply-To header in a separate term prefix from +the term used for the References header[*]. That will then let us lookup +the in-reply-to value later for thread constructions without having to +open the original email file at all. + +-Carl + +[*] Yes, this is my first post to our new mailing list and I'm already +spouting off about "terms" and "prefixes" without any definitions. I +apologize for that. I hope that people will ask questions freely here on +the list whenever anything is not clear, and I'll be glad to explain +things as needed. (Then when can shove answers into a HACKING document.) + +PS. This reply is a great example of a feature that notmuch *almost* +supports already---repling to multiple messages at once. The "notmuch +reply" command line does everything necessary to make this work, but we +haven't yet hooked up any keybindings for this in the emacs client yet. +Obviously, 'r' from the search view could reply to the entire thread. +But when viewing a thread, anyone have a good keybinding suggestion? +(There's obviously 'R' as opposed to 'r', but I think we'll probably +want to distinguish "reply to sender" from "reply to all" before trying +to distinguish "reply to message" from "reply to thread" (which I +imagine is more rare of an operation). + diff --git a/test/corpora/default/foo/cur/08:2, b/test/corpora/default/foo/cur/08:2, new file mode 100644 index 00000000..baf34d1f --- /dev/null +++ b/test/corpora/default/foo/cur/08:2, @@ -0,0 +1,87 @@ +Date: Tue, 17 Nov 2009 15:33:01 -0500 +From: Lars Kellogg-Stedman <lars@seas.harvard.edu> +To: Mikhail Gusarov <dottedmag@dottedmag.net> +Message-ID: <20091117203301.GV3165@dottiness.seas.harvard.edu> +References: <20091117190054.GU3165@dottiness.seas.harvard.edu> + <87iqd9rn3l.fsf@vertex.dottedmag> +MIME-Version: 1.0 +In-Reply-To: <87iqd9rn3l.fsf@vertex.dottedmag> +User-Agent: Mutt/1.5.19 (2009-01-05) +Cc: notmuch@notmuchmail.org +Subject: Re: [notmuch] Working with Maildir storage? +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + <notmuch.notmuchmail.org> +List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe> +List-Archive: <http://notmuchmail.org/pipermail/notmuch> +List-Post: <mailto:notmuch@notmuchmail.org> +List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help> +List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=subscribe> +Content-Type: multipart/mixed; boundary="===============0063752545==" +Sender: notmuch-bounces@notmuchmail.org +Errors-To: notmuch-bounces@notmuchmail.org + + +--===============0063752545== +Content-Type: multipart/signed; micalg=pgp-sha256; + protocol="application/pgp-signature"; boundary="GGxZz/e2pmGePzrA" +Content-Disposition: inline + + +--GGxZz/e2pmGePzrA +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +Content-Transfer-Encoding: quoted-printable + +> See the patch just posted here. + +Is the list archived anywhere? The obvious archives +(http://notmuchmail.org/pipermail/notmuch/) aren't available, and I +think I subscribed too late to get the patch (I only just saw the +discussion about it). + +It doesn't look like the patch is in git yet. + +-- Lars + +--=20 +Lars Kellogg-Stedman <lars@seas.harvard.edu> +Senior Technologist, Computing and Information Technology +Harvard University School of Engineering and Applied Sciences + + +--GGxZz/e2pmGePzrA +Content-Type: application/pgp-signature +Content-Disposition: inline + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iQEcBAEBCAAGBQJLAwh9AAoJENdGlQYxQazYHJMIAI+XTPOyBTZIxEGTdgVKd2fR +k27ucKs6lXozfMIIGchNUDXQho+KmiuTfX1XFJeBkqOlhrd9zlGjBGoBM0YBq/Gs +aStPdonREzsHORjmyQCCpjg4AcqCRTXFbDXzAeXlxMPOrZ3P0XNPzTEM1mVksbmg +mBBDLdHncy4sSCfFgXwRGGgLv9z5Acqm8xGYr68c9PIXY939ozIKV9LVUhxiNz9g +We2a9rLDhfwxUqDlGdiNwZZimiKvD/fsYSrBZMDb5HgIYkeNZ4SD8Xu+OgB550wN +OFfwGi3o8WFK2AyDe5QJDh9Ub+euPNlVzePoGpkltZEHuCcLFJqCHv5XYpbxcjA= +=GO2Q +-----END PGP SIGNATURE----- + +--GGxZz/e2pmGePzrA-- + +--===============0063752545== +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Disposition: inline + +_______________________________________________ +notmuch mailing list +notmuch@notmuchmail.org +http://notmuchmail.org/mailman/listinfo/notmuch + +--===============0063752545==-- + diff --git a/test/corpora/default/foo/new/03:2, b/test/corpora/default/foo/new/03:2, new file mode 100644 index 00000000..c154ac5e --- /dev/null +++ b/test/corpora/default/foo/new/03:2, @@ -0,0 +1,93 @@ +Date: Tue, 17 Nov 2009 14:00:54 -0500 +From: Lars Kellogg-Stedman <lars@seas.harvard.edu> +To: notmuch@notmuchmail.org +Message-ID: <20091117190054.GU3165@dottiness.seas.harvard.edu> +MIME-Version: 1.0 +User-Agent: Mutt/1.5.19 (2009-01-05) +Subject: [notmuch] Working with Maildir storage? +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + <notmuch.notmuchmail.org> +List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe> +List-Archive: <http://notmuchmail.org/pipermail/notmuch> +List-Post: <mailto:notmuch@notmuchmail.org> +List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help> +List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=subscribe> +Content-Type: multipart/mixed; boundary="===============1685355122==" +Sender: notmuch-bounces@notmuchmail.org +Errors-To: notmuch-bounces@notmuchmail.org + + +--===============1685355122== +Content-Type: multipart/signed; micalg=pgp-sha256; + protocol="application/pgp-signature"; boundary="5Dr6Wqe9hdyl7LAI" +Content-Disposition: inline + + +--5Dr6Wqe9hdyl7LAI +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +Content-Transfer-Encoding: quoted-printable + +I saw the LWN article and decided to take a look at notmuch. I'm +currently using mutt and mairix to index and read a collection of +Maildir mail folders (around 40,000 messages total). + +notmuch indexed the messages without complaint, but my attempt at +searching bombed out. Running, for example: + + notmuch search storage + +Resulted in 4604 lines of errors along the lines of: + + Error opening + /home/lars/Mail/read-messages.2008/cur/1246413773.24928_27334.hostname,U= +=3D3026:2,S: + Too many open files + +I'm curious if this is expected behavior (i.e., notmuch does not work +with Maildir) or if something else is going on. + +Cheers, + +--=20 +Lars Kellogg-Stedman <lars@seas.harvard.edu> +Senior Technologist, Computing and Information Technology +Harvard University School of Engineering and Applied Sciences + + +--5Dr6Wqe9hdyl7LAI +Content-Type: application/pgp-signature +Content-Disposition: inline + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iQEcBAEBCAAGBQJLAvLmAAoJENdGlQYxQazYRtcH/0usClQ1Z+EoTsA+URwIK6hD +FsZUxFxRjMuOQRn2idZ/zhhg5jJj11ZaHjqxSkDvi2ywkTKUf1vX9LLzVy5hSR9M +E6XQUd5QWAQXo1VsTeKkukIL0YqsPjdgrT8+Yt+OS2NvhEncql23oxnL2/pHkIFq +r0NdTmVV5Jcar7w9J6X1Mi9m229a/9jV5FImsWISkIhIWznXU5SiU6zIw8xhP4E0 +xhvVSNJnFryjVHtva870aSQduhHfeLPzpYhqbkMPvlq+bcz6Q/Q2SwxJcGLNMPHa +os9s9FGhCvFKUhVzezHWPgXNCcNT8qK89rcUldb5Oq4jaJb8RCZCYABplfoyaFs= +=vO4s +-----END PGP SIGNATURE----- + +--5Dr6Wqe9hdyl7LAI-- + +--===============1685355122== +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Disposition: inline + +_______________________________________________ +notmuch mailing list +notmuch@notmuchmail.org +http://notmuchmail.org/mailman/listinfo/notmuch + +--===============1685355122==-- + diff --git a/test/corpora/default/foo/new/09:2, b/test/corpora/default/foo/new/09:2, new file mode 100644 index 00000000..26b51b1f --- /dev/null +++ b/test/corpora/default/foo/new/09:2, @@ -0,0 +1,33 @@ +From: "Mikhail Gusarov" <dottedmag@dottedmag.net> +To: notmuch@notmuchmail.org +Date: Wed, 18 Nov 2009 02:50:48 +0600 +Subject: [notmuch] Working with Maildir storage? +In-Reply-To: <20091117203301.GV3165@dottiness.seas.harvard.edu> (Lars + Kellogg-Stedman's message of "Tue, 17 Nov 2009 15:33:01 -0500") +References: <20091117190054.GU3165@dottiness.seas.harvard.edu> + <87iqd9rn3l.fsf@vertex.dottedmag> + <20091117203301.GV3165@dottiness.seas.harvard.edu> +Message-ID: <87fx8can9z.fsf@vertex.dottedmag> + + +Twas brillig at 15:33:01 17.11.2009 UTC-05 when lars at seas.harvard.edu did gyre and gimble: + + LK> Is the list archived anywhere? The obvious archives + LK> (http://notmuchmail.org/pipermail/notmuch/) aren't available, and I + LK> think I subscribed too late to get the patch (I only just saw the + LK> discussion about it). + + LK> It doesn't look like the patch is in git yet. + +Just has been pushed + +-- + http://fossarchy.blogspot.com/ +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: not available +Type: application/pgp-signature +Size: 834 bytes +Desc: not available +URL: <http://notmuchmail.org/pipermail/notmuch/attachments/20091118/0e33d964/attachment.pgp> + diff --git a/test/corpora/default/foo/new/10:2, b/test/corpora/default/foo/new/10:2, new file mode 100644 index 00000000..4211d734 --- /dev/null +++ b/test/corpora/default/foo/new/10:2, @@ -0,0 +1,54 @@ +From: "Mikhail Gusarov" <dottedmag@dottedmag.net> +To: notmuch@notmuchmail.org +Date: Wed, 18 Nov 2009 02:51:18 +0600 +Subject: [notmuch] [PATCH] Handle rename of message file +Message-ID: <1258491078-29658-1-git-send-email-dottedmag@dottedmag.net> + +If message file has been renamed, just update filename in the DB. + +Signed-off-by: Mikhail Gusarov <dottedmag at dottedmag.net> +--- + lib/database.cc | 21 ++++++++++++--------- + 1 files changed, 12 insertions(+), 9 deletions(-) + +diff --git a/lib/database.cc b/lib/database.cc +index 3c8d626..c4eb8b6 100644 +--- a/lib/database.cc ++++ b/lib/database.cc +@@ -925,20 +925,23 @@ notmuch_database_add_message (notmuch_database_t *notmuch, + if (private_status == NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND) { + _notmuch_message_set_filename (message, filename); + _notmuch_message_add_term (message, "type", "mail"); ++ ++ ret = _notmuch_database_link_message (notmuch, message, message_file); ++ if (ret) ++ goto DONE; ++ ++ date = notmuch_message_file_get_header (message_file, "date"); ++ _notmuch_message_set_date (message, date); ++ ++ _notmuch_message_index_file (message, filename); ++ } else if (strcmp(notmuch_message_get_filename(message), filename)) { ++ /* Message file has been moved/renamed */ ++ _notmuch_message_set_filename (message, filename); + } else { + ret = NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID; + goto DONE; + } + +- ret = _notmuch_database_link_message (notmuch, message, message_file); +- if (ret) +- goto DONE; +- +- date = notmuch_message_file_get_header (message_file, "date"); +- _notmuch_message_set_date (message, date); +- +- _notmuch_message_index_file (message, filename); +- + _notmuch_message_sync (message); + } catch (const Xapian::Error &error) { + fprintf (stderr, "A Xapian exception occurred: %s.\n", +-- +1.6.3.3 + + diff --git a/test/corpora/default/new/04:2, b/test/corpora/default/new/04:2, new file mode 100644 index 00000000..0ce678bf --- /dev/null +++ b/test/corpora/default/new/04:2, @@ -0,0 +1,84 @@ +From: Mikhail Gusarov <dottedmag@dottedmag.net> +To: notmuch@notmuchmail.org +References: <20091117190054.GU3165@dottiness.seas.harvard.edu> +Date: Wed, 18 Nov 2009 01:02:38 +0600 +In-Reply-To: <20091117190054.GU3165@dottiness.seas.harvard.edu> (Lars + Kellogg-Stedman's message of "Tue, 17 Nov 2009 14:00:54 -0500") +Message-ID: <87iqd9rn3l.fsf@vertex.dottedmag> +User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) +MIME-Version: 1.0 +Subject: Re: [notmuch] Working with Maildir storage? +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + <notmuch.notmuchmail.org> +List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe> +List-Archive: <http://notmuchmail.org/pipermail/notmuch> +List-Post: <mailto:notmuch@notmuchmail.org> +List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help> +List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=subscribe> +Content-Type: multipart/mixed; boundary="===============1958295626==" +Sender: notmuch-bounces@notmuchmail.org +Errors-To: notmuch-bounces@notmuchmail.org + +--===============1958295626== +Content-Type: multipart/signed; boundary="=-=-="; + micalg=pgp-sha1; protocol="application/pgp-signature" + +--=-=-= +Content-Transfer-Encoding: quoted-printable + + +Twas brillig at 14:00:54 17.11.2009 UTC-05 when lars@seas.harvard.edu did g= +yre and gimble: + + LK> Resulted in 4604 lines of errors along the lines of: + + LK> Error opening + LK> /home/lars/Mail/read-messages.2008/cur/1246413773.24928_27334.hostna= +me,U=3D3026:2,S: + LK> Too many open files + +See the patch just posted here. + +=2D-=20 + http://fossarchy.blogspot.com/ + +--=-=-= +Content-Type: application/pgp-signature + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iQIcBAEBAgAGBQJLAvNOAAoJEJ0g9lA+M4iIjLYQAKp0PXEgl3JMOEBisH52AsIK +CzzfP4Fzd41K9VH/c1EdQWDYR6FCAA4IUSNICnJhITsYUb0eC5AKJiey3JP0+rmd +s4qEFBKH2iuphv8Llltcv2Q8DyPuJBkVa3mO9XCCeABZ6v4UvnTSWRVG12csSEih +ScgienU8sMrM9LwvvVI1ZB2flm2TzsH2hWi30jIgmtBntIKJaTgbFXB50FYFwULa +gGL/oH3u+YpumedWzPZdCJrw2q7nMvYx8aQ29EDCNLZibAZe+6oDTa6Fv6/0ldpQ +U+DptR0nJGbJTWa26OTSvmyeIORjAfM+TEI68n7KO9VHYPmVh6awcf0MNKYh2xWk +eRQNBcKyQNWxeKyCCpT/rrTlpxBWahpvg+V8lkDH2W09wjRp6CUKvifK3Sz3am9m +5ZUMpvXbwkZD6Ci6l/QytbYK50e8UpvFSu5DBaxBz59ykoypuNg2ayO5Kdi6IF5d +T+Sw6wo8UKn9a33+vheIc0fkhZXbeSotEmDm7huazm6CgM3dcWXUpTuJvik1cSWp +4buv98gY6IKWKoUTXODWUr+7VR4gei8du8qOsKem+QDfNX7tmaIRjhrbB24B91Wy +td3MTJD7GjMNid0INqRY1CRMLo8YlPaq6NBZfcYtYgwa6gpJijz1/MAn8+GMrfhF +9LI8b9jopNP+pMYBohLA +=/ksP +-----END PGP SIGNATURE----- +--=-=-=-- + +--===============1958295626== +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Disposition: inline + +_______________________________________________ +notmuch mailing list +notmuch@notmuchmail.org +http://notmuchmail.org/mailman/listinfo/notmuch + +--===============1958295626==-- + diff --git a/test/corpora/duplicate/msg-1-1:2, b/test/corpora/duplicate/msg-1-1:2, new file mode 100644 index 00000000..bc7da06d --- /dev/null +++ b/test/corpora/duplicate/msg-1-1:2, @@ -0,0 +1,85 @@ +Return-path: <debian-science-maintainers-bounces+david=tethera.net@lists.alioth.debian.org> +Envelope-to: david@tethera.net +Delivery-date: Wed, 28 Nov 2012 18:41:46 -0400 +Received: from [199.188.72.155] (helo=yantan.tethera.net) + by tesseract.cs.unb.ca with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) + (Exim 4.72) + (envelope-from <debian-science-maintainers-bounces+david=tethera.net@lists.alioth.debian.org>) + id 1TdqKA-00017j-3c + for david@tethera.net; Wed, 28 Nov 2012 18:41:46 -0400 +Received: from wagner.debian.org ([217.196.43.132]) + by yantan.tethera.net with esmtp (Exim 4.72) + (envelope-from <debian-science-maintainers-bounces+david=tethera.net@lists.alioth.debian.org>) + id 1TdqK9-00072z-AF + for david@tethera.net; Wed, 28 Nov 2012 18:41:45 -0400 +Received: from localhost ([::1] helo=wagner.debian.org) + by wagner.debian.org with esmtp (Exim 4.72) + (envelope-from <debian-science-maintainers-bounces+david=tethera.net@lists.alioth.debian.org>) + id 1TdqK8-0007GZ-67 + for david@tethera.net; Wed, 28 Nov 2012 22:41:44 +0000 +Received: from vasks.debian.org ([217.196.43.140]) + by wagner.debian.org with esmtp (Exim 4.72) + (envelope-from <gladky-anton-guest@alioth.debian.org>) + id 1TdqIc-0006jm-OC; Wed, 28 Nov 2012 22:40:11 +0000 +Received: from gladky-anton-guest by vasks.debian.org with local (Exim 4.72) + (envelope-from <gladky-anton-guest@vasks.debian.org>) + id 1TdqIc-0003j1-DE; Wed, 28 Nov 2012 22:40:10 +0000 +Date: Wed, 28 Nov 2012 22:40:10 +0000 +From: Anton Gladky <gladky.anton@gmail.com> +To: 691896@bugs.debian.org, control@bugs.debian.org, + 691896-submitter@bugs.debian.org +Message-ID: <debian/2.6.1.dfsg-4-1-g87ea161@87ea161e851dfb1ea324af00e4ecfccc18875e15> +X-PTS-Approved: Yes +X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on wagner.debian.org +X-Spam-Level: +X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM + autolearn=ham version=3.3.1 +Subject: [87ea161] Fix for Bug#691896 committed to git +X-BeenThere: debian-science-maintainers@lists.alioth.debian.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: Mailing list for maintainer discussions and BTS messages + <debian-science-maintainers.lists.alioth.debian.org> +List-Unsubscribe: <http://lists.alioth.debian.org/cgi-bin/mailman/options/debian-science-maintainers>, + <mailto:debian-science-maintainers-request@lists.alioth.debian.org?subject=unsubscribe> +List-Archive: <http://lists.alioth.debian.org/pipermail/debian-science-maintainers> +List-Post: <mailto:debian-science-maintainers@lists.alioth.debian.org> +List-Help: <mailto:debian-science-maintainers-request@lists.alioth.debian.org?subject=help> +List-Subscribe: <http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers>, + <mailto:debian-science-maintainers-request@lists.alioth.debian.org?subject=subscribe> +MIME-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Sender: debian-science-maintainers-bounces+david=tethera.net@lists.alioth.debian.org +Errors-To: debian-science-maintainers-bounces+david=tethera.net@lists.alioth.debian.org +X-SA-Exim-Connect-IP: ::1 +X-SA-Exim-Mail-From: debian-science-maintainers-bounces+david=tethera.net@lists.alioth.debian.org +X-SA-Exim-Scanned: No (on wagner.debian.org); SAEximRunCond expanded to false +X-Spam-Score: 1.3 +X-Spam_bar: + + + +tags 691896 + pending +thanks + +Hello, + + The following change has been committed for this bug by + Anton Gladky <gladky.anton@gmail.com> on Wed, 31 Oct 2012 08:16:42 +0100. + The fix will be in the next upload. +==================================== +Minor fixes in README.Debian. (Closes: #691896) + + +==================================== + +You can check the diff of the fix at: + + ;a=commitdiff;h=87ea161 + + + +-- +debian-science-maintainers mailing list +debian-science-maintainers@lists.alioth.debian.org +http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers diff --git a/test/corpora/duplicate/msg-1-2:2, b/test/corpora/duplicate/msg-1-2:2, new file mode 100644 index 00000000..dc0476e7 --- /dev/null +++ b/test/corpora/duplicate/msg-1-2:2, @@ -0,0 +1,113 @@ +Return-path: <debian-science-maintainers-bounces+david=tethera.net@lists.alioth.debian.org> +Envelope-to: david@tethera.net +Delivery-date: Wed, 28 Nov 2012 18:42:39 -0400 +Received: from [199.188.72.155] (helo=yantan.tethera.net) + by tesseract.cs.unb.ca with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) + (Exim 4.72) + (envelope-from <debian-science-maintainers-bounces+david=tethera.net@lists.alioth.debian.org>) + id 1TdqL1-00017s-3b + for david@tethera.net; Wed, 28 Nov 2012 18:42:39 -0400 +Received: from wagner.debian.org ([217.196.43.132]) + by yantan.tethera.net with esmtp (Exim 4.72) + (envelope-from <debian-science-maintainers-bounces+david=tethera.net@lists.alioth.debian.org>) + id 1TdqL0-00073Z-Gw + for david@tethera.net; Wed, 28 Nov 2012 18:42:38 -0400 +Received: from localhost ([::1] helo=alioth.debian.org) + by wagner.debian.org with esmtp (Exim 4.72) + (envelope-from <debian-science-maintainers-bounces+david=tethera.net@lists.alioth.debian.org>) + id 1TdqKz-0007sR-PR + for david@tethera.net; Wed, 28 Nov 2012 22:42:37 +0000 +Received: from buxtehude.debian.org ([140.211.166.26]) + by wagner.debian.org with esmtp (Exim 4.72) + (envelope-from <debbugs@buxtehude.debian.org>) id 1TdqKU-0007SW-IG + for debian-science-maintainers@lists.alioth.debian.org; + Wed, 28 Nov 2012 22:42:07 +0000 +Received: from debbugs by buxtehude.debian.org with local (Exim 4.72) + (envelope-from <debbugs@buxtehude.debian.org>) + id 1TdqKR-0001dH-UL; Wed, 28 Nov 2012 22:42:03 +0000 +X-Loop: owner@bugs.debian.org +Resent-From: Anton Gladky <gladky.anton@gmail.com> +Resent-To: debian-bugs-dist@lists.debian.org +Resent-CC: Debian Science Maintainers + <debian-science-maintainers@lists.alioth.debian.org> +X-Loop: owner@bugs.debian.org +Resent-Date: Wed, 28 Nov 2012 22:42:02 +0000 +Resent-Message-ID: <handler.691896.B691896.13541424145158@bugs.debian.org> +X-Debian-PR-Message: followup 691896 +X-Debian-PR-Package: gmsh +X-Debian-PR-Keywords: pending +X-Debian-PR-Source: gmsh +Received: via spool by 691896-submit@bugs.debian.org id=B691896.13541424145158 + (code B ref 691896); Wed, 28 Nov 2012 22:42:02 +0000 +Received: (at 691896) by bugs.debian.org; 28 Nov 2012 22:40:14 +0000 +Received: from wagner.debian.org ([217.196.43.132]) + by buxtehude.debian.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) + (Exim 4.72) (envelope-from <gladky-anton-guest@alioth.debian.org>) + id 1TdqIg-0001Kh-Ba; Wed, 28 Nov 2012 22:40:14 +0000 +Received: from vasks.debian.org ([217.196.43.140]) + by wagner.debian.org with esmtp (Exim 4.72) + (envelope-from <gladky-anton-guest@alioth.debian.org>) + id 1TdqIc-0006jm-OC; Wed, 28 Nov 2012 22:40:11 +0000 +Received: from gladky-anton-guest by vasks.debian.org with local (Exim 4.72) + (envelope-from <gladky-anton-guest@vasks.debian.org>) + id 1TdqIc-0003j1-DE; Wed, 28 Nov 2012 22:40:10 +0000 +Date: Wed, 28 Nov 2012 22:40:10 +0000 +From: Anton Gladky <gladky.anton@gmail.com> +To: 691896@bugs.debian.org, control@bugs.debian.org, + 691896-submitter@bugs.debian.org +Message-ID: <debian/2.6.1.dfsg-4-1-g87ea161@87ea161e851dfb1ea324af00e4ecfccc18875e15> +X-PTS-Approved: Yes +Resent-Sender: Debian BTS <debbugs@buxtehude.debian.org> +X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on wagner.debian.org +X-Spam-Level: +X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,FREEMAIL_FROM, + RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 +Subject: Bug#691896: [87ea161] Fix for Bug#691896 committed to git +x-debian-approved: yes +X-BeenThere: debian-science-maintainers@lists.alioth.debian.org +X-Mailman-Version: 2.1.13 +Precedence: list +Reply-To: Anton Gladky <gladky.anton@gmail.com>, 691896@bugs.debian.org +List-Id: Mailing list for maintainer discussions and BTS messages + <debian-science-maintainers.lists.alioth.debian.org> +List-Unsubscribe: <http://lists.alioth.debian.org/cgi-bin/mailman/options/debian-science-maintainers>, + <mailto:debian-science-maintainers-request@lists.alioth.debian.org?subject=unsubscribe> +List-Archive: <http://lists.alioth.debian.org/pipermail/debian-science-maintainers> +List-Post: <mailto:debian-science-maintainers@lists.alioth.debian.org> +List-Help: <mailto:debian-science-maintainers-request@lists.alioth.debian.org?subject=help> +List-Subscribe: <http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers>, + <mailto:debian-science-maintainers-request@lists.alioth.debian.org?subject=subscribe> +MIME-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Sender: debian-science-maintainers-bounces+david=tethera.net@lists.alioth.debian.org +Errors-To: debian-science-maintainers-bounces+david=tethera.net@lists.alioth.debian.org +X-SA-Exim-Connect-IP: ::1 +X-SA-Exim-Mail-From: debian-science-maintainers-bounces+david=tethera.net@lists.alioth.debian.org +X-SA-Exim-Scanned: No (on wagner.debian.org); SAEximRunCond expanded to false +X-Spam-Score: 1.3 +X-Spam_bar: + + + +tags 691896 + pending +thanks + +Hello, + + The following change has been committed for this bug by + Anton Gladky <gladky.anton@gmail.com> on Wed, 31 Oct 2012 08:16:42 +0100. + The fix will be in the next upload. +==================================== +Minor fixes in README.Debian. (Closes: #691896) + + +==================================== + +You can check the diff of the fix at: + + ;a=commitdiff;h=87ea161 + +-- +debian-science-maintainers mailing list +debian-science-maintainers@lists.alioth.debian.org +http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers diff --git a/test/corpora/duplicate/msg-2-1:2, b/test/corpora/duplicate/msg-2-1:2, new file mode 100644 index 00000000..e118d784 --- /dev/null +++ b/test/corpora/duplicate/msg-2-1:2, @@ -0,0 +1,43 @@ +From: David Bremner <bremner@debian.org> +To: Samuel Bronson <naesten@gmail.com>, 695159@bugs.debian.org, Debian Bug Tracking System <submit@bugs.debian.org> +Subject: Re: Bug#695159: debian-el: Shouldn't put downloaded bugs loose in ~/ +In-Reply-To: <87vcch7hxy.fsf@naesten.dyndns.org> +References: <87vcch7hxy.fsf@naesten.dyndns.org> +Date: Thu, 25 Oct 2018 10:41:38 -0300 +Message-ID: <87r2geywh9.fsf@tethera.net> +MIME-Version: 1.0 +Content-Type: text/plain + + +Control: severity -1 minor +Control: tag -1 moreinfo + +Samuel Bronson <naesten@gmail.com> writes: + +> Package: debian-el +> Version: 35.2+nmu1 +> Severity: normal +> File: /usr/share/emacs/site-lisp/debian-el/debian-bug.el +> +> Dear Maintainer, +> +> After being mildly annoyed with this for ages, it finally occurred to me +> to file a bug about it: +> +> It's rather rude of `getdebian-bug-get-bug-as-email' to default to +> sticking downloaded mbox files loose in ~/, isn't it? +> +> (And might it not make sense to try and use the same files as the bts(1) +> command from the devscripts package?) +> + +Hi Samuel + +There is already a variable "debian-bug-download-directory" which can be +customized. Is there an obviously better default? I guess we could put +things in /tmp by default, with a minor privacy leak on multiuser +systems. + +d + +# body 1 diff --git a/test/corpora/duplicate/msg-2-2:2, b/test/corpora/duplicate/msg-2-2:2, new file mode 100644 index 00000000..a7549c47 --- /dev/null +++ b/test/corpora/duplicate/msg-2-2:2, @@ -0,0 +1,140 @@ +Return-path: <bounces+20181025-bremner=debian.org@tracker.debian.org> +Envelope-to: david@tethera.net +Delivery-date: Thu, 25 Oct 2018 09:45:10 -0400 +Received: from muffat.debian.org ([2607:f8f0:614:1::1274:33]) + by fethera.tethera.net with esmtp (Exim 4.89) + (envelope-from <bounces+20181025-bremner=debian.org@tracker.debian.org>) + id 1gFfwj-0004Y9-69 + for david@tethera.net; Thu, 25 Oct 2018 09:45:10 -0400 +Received: from ticharich.debian.org ([2001:41c8:1000:21::21:23]) + from C=NA,ST=NA,L=Ankh Morpork,O=Debian SMTP,OU=Debian SMTP CA,CN=ticharich.debian.org,EMAIL=hostmaster@ticharich.debian.org (verified) + by muffat.debian.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) + (Exim 4.89) + (envelope-from <bounces+20181025-bremner=debian.org@tracker.debian.org>) + id 1gFfwi-0004A1-J6 + for david@tethera.net; Thu, 25 Oct 2018 13:45:08 +0000 +Received: from localhost ([::1] helo=ticharich.debian.org) + by ticharich.debian.org with esmtp (Exim 4.89) + (envelope-from <bounces+20181025-bremner=debian.org@tracker.debian.org>) + id 1gFfwh-0002Ex-6w + for david@tethera.net; Thu, 25 Oct 2018 13:45:07 +0000 +Received: from mailly.debian.org ([2001:41b8:202:deb:6564:a62:52c3:4b72]) + from C=NA,ST=NA,L=Ankh Morpork,O=Debian SMTP,OU=Debian SMTP CA,CN=mailly.debian.org,EMAIL=hostmaster@mailly.debian.org (verified) + by ticharich.debian.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) + (Exim 4.89) + (envelope-from <debbugs@buxtehude.debian.org>) + id 1gFfwg-0002Em-NI + for dispatch+emacs-goodies-el@tracker.debian.org; Thu, 25 Oct 2018 13:45:06 +0000 +Received: from quantz.debian.org ([2001:41c8:1000:21::21:28]) + from C=NA,ST=NA,L=Ankh Morpork,O=Debian SMTP,OU=Debian SMTP CA,CN=quantz.debian.org,EMAIL=hostmaster@quantz.debian.org (verified) + by mailly.debian.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) + (Exim 4.89) + (envelope-from <debbugs@buxtehude.debian.org>) + id 1gFfwg-0004h1-AC + for dispatch+emacs-goodies-el@tracker.debian.org; Thu, 25 Oct 2018 13:45:06 +0000 +Received: from qa by quantz.debian.org with local (Exim 4.89) + (envelope-from <debbugs@buxtehude.debian.org>) + id 1gFfwf-0007Lg-TQ + for dispatch+emacs-goodies-el@tracker.debian.org; Thu, 25 Oct 2018 13:45:05 +0000 +Received: from buxtehude.debian.org ([2607:f8f0:614:1::1274:39]) + from C=NA,ST=NA,L=Ankh Morpork,O=Debian SMTP,OU=Debian SMTP CA,CN=buxtehude.debian.org,EMAIL=hostmaster@buxtehude.debian.org (verified) + by quantz.debian.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) + (Exim 4.89) + (envelope-from <debbugs@buxtehude.debian.org>) + id 1gFfwf-0007J0-3r; Thu, 25 Oct 2018 13:45:05 +0000 +Received: from debbugs by buxtehude.debian.org with local (Exim 4.89) + (envelope-from <debbugs@buxtehude.debian.org>) + id 1gFfwc-0003jj-VU; Thu, 25 Oct 2018 13:45:02 +0000 +X-Loop: owner@bugs.debian.org +Subject: Bug#695159: debian-el: Shouldn't put downloaded bugs loose in ~/ +Reply-To: David Bremner <bremner@debian.org>, 695159@bugs.debian.org +Resent-From: David Bremner <bremner@debian.org> +Resent-To: debian-bugs-dist@lists.debian.org +Resent-CC: Debian Emacsen team <debian-emacsen@lists.debian.org> +X-Loop: owner@bugs.debian.org +Resent-Date: Thu, 25 Oct 2018 13:45:01 +0000 +Resent-Message-ID: <handler.695159.B.154047490313415@bugs.debian.org> +X-Debian-PR-Message: followup 695159 +X-Debian-PR-Package: debian-el +X-Debian-PR-Keywords: +References: <87vcch7hxy.fsf@naesten.dyndns.org> <87vcch7hxy.fsf@naesten.dyndns.org> +X-Debian-PR-Source: debian-el, emacs-goodies-el +Received: via spool by submit@bugs.debian.org id=B.154047490313415 + (code B); Thu, 25 Oct 2018 13:45:01 +0000 +Received: (at submit) by bugs.debian.org; 25 Oct 2018 13:41:43 +0000 +X-Spam-Checker-Version: SpamAssassin 3.4.1-bugs.debian.org_2005_01_02 + (2015-04-28) on buxtehude.debian.org +X-Spam-Level: +X-Spam-Status: No, score=-19.5 required=4.0 tests=BAYES_00,FROMDEVELOPER,GMAIL, + HAS_BUG_NUMBER,TXREP autolearn=ham autolearn_force=no + version=3.4.1-bugs.debian.org_2005_01_02 +X-Spam-Bayes: score:0.0000 Tokens: new, 16; hammy, 110; neutral, 41; spammy, + 2. spammytokens:0.971-+--privacy, 0.857-+--customized + hammytokens:0.000-+--UD:el, 0.000-+--H*F:U*bremner, 0.000-+--Maintainer, + 0.000-+--sitelisp, 0.000-+--site-lisp +Received: from fethera.tethera.net ([2607:5300:60:c5::1]) + by buxtehude.debian.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) + (Exim 4.89) + (envelope-from <bremner@debian.org>) + id 1gFftO-0003U6-RV; Thu, 25 Oct 2018 13:41:42 +0000 +Received: from remotemail by fethera.tethera.net with local (Exim 4.89) + (envelope-from <bremner@debian.org>) + id 1gFftL-0004VK-V8; Thu, 25 Oct 2018 09:41:39 -0400 +Received: (nullmailer pid 477 invoked by uid 1000); + Thu, 25 Oct 2018 13:41:38 -0000 +From: David Bremner <bremner@debian.org> +To: Samuel Bronson <naesten@gmail.com>, 695159@bugs.debian.org, Debian Bug Tracking System <submit@bugs.debian.org> +In-Reply-To: <87vcch7hxy.fsf@naesten.dyndns.org> +Date: Thu, 25 Oct 2018 10:41:38 -0300 +Message-ID: <87r2geywh9.fsf@tethera.net> +MIME-Version: 1.0 +Content-Type: text/plain +Delivered-To: submit@bugs.debian.org +Delivered-To: emacs-goodies-el@packages.qa.debian.org +Delivered-To: dispatch+emacs-goodies-el@tracker.debian.org +X-Loop: dispatch@tracker.debian.org +X-Distro-Tracker-Keyword: bts +X-Distro-Tracker-Package: emacs-goodies-el +List-Id: <emacs-goodies-el.tracker.debian.org> +X-Debian: tracker.debian.org +X-Debian-Package: emacs-goodies-el +X-PTS-Package: emacs-goodies-el +X-PTS-Keyword: bts +X-Distro-Tracker-Team: emacsen +X-Spam_score: -2.3 +X-Spam_score_int: -22 +X-Spam_bar: -- + + +Control: severity -1 minor +Control: tag -1 moreinfo + +Samuel Bronson <naesten@gmail.com> writes: + +> Package: debian-el +> Version: 35.2+nmu1 +> Severity: normal +> File: /usr/share/emacs/site-lisp/debian-el/debian-bug.el +> +> Dear Maintainer, +> +> After being mildly annoyed with this for ages, it finally occurred to me +> to file a bug about it: +> +> It's rather rude of `getdebian-bug-get-bug-as-email' to default to +> sticking downloaded mbox files loose in ~/, isn't it? +> +> (And might it not make sense to try and use the same files as the bts(1) +> command from the devscripts package?) +> + +Hi Samuel + +There is already a variable "debian-bug-download-directory" which can be +customized. Is there an obviously better default? I guess we could put +things in /tmp by default, with a minor privacy leak on multiuser +systems. + +d + +# body 2 diff --git a/test/corpora/duplicate/msg-3-1:2, b/test/corpora/duplicate/msg-3-1:2, new file mode 100644 index 00000000..8bb6a8c2 --- /dev/null +++ b/test/corpora/duplicate/msg-3-1:2, @@ -0,0 +1,183 @@ +Return-path: <pkg-emacsen-addons-bounces+bremner=debian.org@alioth-lists.debian.net> +Envelope-to: david@tethera.net +Delivery-date: Thu, 20 Dec 2018 13:27:11 -0500 +Received: from muffat.debian.org ([2607:f8f0:614:1::1274:33]) + by fethera.tethera.net with esmtp (Exim 4.89) + (envelope-from <pkg-emacsen-addons-bounces+bremner=debian.org@alioth-lists.debian.net>) + id 1ga32M-0005ae-Ko + for david@tethera.net; Thu, 20 Dec 2018 13:27:11 -0500 +Received: from alioth-lists-01.debian.net ([2001:ba8:0:2c77:0:4:0:1]) + by muffat.debian.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) + (Exim 4.89) + (envelope-from <pkg-emacsen-addons-bounces+bremner=debian.org@alioth-lists.debian.net>) + id 1ga32K-0008PT-Nm + for david@tethera.net; Thu, 20 Dec 2018 18:27:08 +0000 +Received: from localhost ([::1] helo=alioth-lists-01.debian.net) + by alioth-lists-01.debian.net with esmtp (Exim 4.89) + (envelope-from <pkg-emacsen-addons-bounces+bremner=debian.org@alioth-lists.debian.net>) + id 1ga32I-0003to-Kn + for bremner@debian.org; Thu, 20 Dec 2018 18:27:06 +0000 +Received: from buxtehude.debian.org ([2607:f8f0:614:1::1274:39]) + by alioth-lists-01.debian.net with esmtps + (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) + (envelope-from <debbugs@buxtehude.debian.org>) id 1ga32H-0003tO-29 + for pkg-emacsen-addons@lists.alioth.debian.org; Thu, 20 Dec 2018 18:27:05 +0000 +Received: from debbugs by buxtehude.debian.org with local (Exim 4.89) + (envelope-from <debbugs@buxtehude.debian.org>) + id 1ga32F-0005PP-9m; Thu, 20 Dec 2018 18:27:03 +0000 +X-Loop: owner@bugs.debian.org +Resent-From: Sean Whitton <spwhitton@spwhitton.name> +Resent-To: debian-bugs-dist@lists.debian.org +Resent-CC: Debian Emacs addons team + <pkg-emacsen-addons@lists.alioth.debian.org> +X-Loop: owner@bugs.debian.org +Resent-Date: Thu, 20 Dec 2018 18:27:02 +0000 +Resent-Message-ID: <handler.916805.B916805.154533033319811@bugs.debian.org> +X-Debian-PR-Message: followup 916805 +X-Debian-PR-Package: src:assess-el +X-Debian-PR-Keywords: ftbfs +References: <87k1k6h43h.fsf@zephyr.silentflame.com> +X-Debian-PR-Source: assess-el +Received: via spool by 916805-submit@bugs.debian.org id=B916805.154533033319811 + (code B ref 916805); Thu, 20 Dec 2018 18:27:02 +0000 +Received: (at 916805) by bugs.debian.org; 20 Dec 2018 18:25:33 +0000 +X-Spam-Checker-Version: SpamAssassin 3.4.2-bugs.debian.org_2005_01_02 + (2018-09-13) on buxtehude.debian.org +X-Spam-Level: +X-Spam-Status: No, score=-8.8 required=4.0 tests=BAYES_00,DKIM_SIGNED, + DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,PGPSIGNATURE,RCVD_IN_DNSWL_LOW, + SORTED_RECIPS,SPF_HELO_PASS,SPF_PASS,SUSPICIOUS_RECIPS,TXREP + autolearn=ham autolearn_force=no + version=3.4.2-bugs.debian.org_2005_01_02 +X-Spam-Bayes: score:0.0000 Tokens: new, 32; hammy, 83; neutral, 22; spammy, 1. + spammytokens:0.902-+--emails + hammytokens:0.000-+--HX-ME-Sender:xms, + 0.000-+--H*RU:10.202.2.43, + 0.000-+--Hx-spam-relays-external:10.202.2.43, 0.000-+--H*F:U*spwhitton, + 0.000-+--H*F:D*spwhitton.name +Received: from wout2-smtp.messagingengine.com ([64.147.123.25]) + by buxtehude.debian.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) + (Exim 4.89) (envelope-from <spwhitton@spwhitton.name>) + id 1ga30m-00059C-Kv; Thu, 20 Dec 2018 18:25:32 +0000 +Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) + by mailout.west.internal (Postfix) with ESMTP id C50B712F6; + Thu, 20 Dec 2018 13:25:30 -0500 (EST) +Received: from mailfrontend1 ([10.202.2.162]) + by compute3.internal (MEProxy); Thu, 20 Dec 2018 13:25:31 -0500 +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=spwhitton.name; + h=from:to:subject:date:message-id:mime-version:content-type; s= + fm1; bh=jAd0CK1DR6lBA7NSLH5FsHIYQv3lqnNZlsr/mb10zqE=; b=X9S4kI14 + zxdg9IKMIyALL2Eao3GTyyojuATJkgCqJvZWd8RWpty6RBStZfyeOqR1L3Gr5m3/ + EVeiHQyFNnPor2xjMDmblfPS/u09JxVlc0KMpT0XXRfNWsVQn+U40nNRX15kXzZ/ + D1rYhxpxzKRzU2tByUULCgbGlXAwJQtOXMDw3mpj1BxcoO13H/0H/KQTQ+AcpiOw + BV3JFKL/jA+mH8uAPIgNM2mUYZz5REO89eh3lPhLyc7tw745X+4ywZlo/Piqa0+6 + BCldY9/nDR3csAUKx1+3hkpJPdqFALBWvG3SelGt44BqcoLsOJLB8QH6trCro39o + fEnBaUBTAkTAHA== +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= + messagingengine.com; h=content-type:date:from:message-id + :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender + :x-me-sender:x-sasl-enc; s=fm1; bh=jAd0CK1DR6lBA7NSLH5FsHIYQv3lq + nNZlsr/mb10zqE=; b=QYqLjUBZtfbO0DUlagvXRP2BPnpTgkvIna9/uCewkdoIH + /LuPW6DZUNWQa55qiDquqKXcs0tTODTEzYgeIDgqC+DDBTHnFQvXdWyS1X3o4sLL + 8dTKk8lv7M1/zKFxyg/ycNvPJGS9m4ZucGbxjwdgAcozhg7W1Qztxt9eVhPVnenS + 5sdeJ9mjIE7lYkKX4QVsXPOi86j6QlfMNyi/OnBfX2+95QiA/xPE/wEq4MYlLNm7 + Av1P/8OrI4ImDKkOEivarktL+isYL7OXyGB4GfUTsydiy9dhP7RKPxrai1kJRu5S + b2470KXNatu2WkyMFrsdcwrSqyKIe096k5xPfVI2A== +X-ME-Sender: <xms:mt4bXHFFQvAGVxMhHQP5DBif075kRubHE1KJQrR0OsDN2ClFFtlRXw> +X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtkedrudejfedguddugecutefuodetggdotefrod + ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthenuceurghilhhouhhtmecu + fedttdenucfuohhrthgvugcurhgvtghiphhsucdlgedtmdenucfjughrpefhvffufffkgg + gtsehgtderredttddtnecuhfhrohhmpefuvggrnhcuhghhihhtthhonhcuoehsphifhhhi + thhtohhnsehsphifhhhithhtohhnrdhnrghmvgeqnecurfgrrhgrmhepmhgrihhlfhhroh + hmpehsphifhhhithhtohhnsehsphifhhhithhtohhnrdhnrghmvgenucevlhhushhtvghr + ufhiiigvpedt +X-ME-Proxy: <xmx:mt4bXGqtKYX8StS4oLrucVpNHp3EoaoH6jbQkd2mTFzupx7FwIJ2dQ> + <xmx:mt4bXH457xpOO1PnlqWQoPt1r7kL_P9ta064wZO_JDW1QAycFDjIsg> + <xmx:mt4bXPQaOrPjDseNXftuMgX1Y9gyHDbVUCYSYNdX6oXwBQhAGwzqIw> + <xmx:mt4bXLbmA2mCpvakWE26qsCvS2IOX4eN0KdeU2tQi-SXYEBMLVpE3A> +From: Sean Whitton <spwhitton@spwhitton.name> +To: 916805@bugs.debian.org, 916807@bugs.debian.org, 916808@bugs.debian.org, + 916809@bugs.debian.org, 916811@bugs.debian.org, 916867@bugs.debian.org, + 916869@bugs.debian.org, 916872@bugs.debian.org, 916875@bugs.debian.org, + 916876@bugs.debian.org +Date: Thu, 20 Dec 2018 18:25:26 +0000 +Message-ID: <87r2ecrr6x.fsf@zephyr.silentflame.com> +MIME-Version: 1.0 +Received-SPF: pass client-ip=2607:f8f0:614:1::1274:39; + envelope-from=debbugs@buxtehude.debian.org; helo=buxtehude.debian.org +x-debian-approved: yes +Subject: [Pkg-emacsen-addons] Bug#916805: Increase severity to 'serious' +X-BeenThere: pkg-emacsen-addons@alioth-lists.debian.net +X-Mailman-Version: 2.1.23 +Precedence: list +List-Id: Maintainers list for Emacs addon packages + <pkg-emacsen-addons.alioth-lists.debian.net> +List-Unsubscribe: <https://alioth-lists.debian.net/cgi-bin/mailman/options/pkg-emacsen-addons>, + <mailto:pkg-emacsen-addons-request@alioth-lists.debian.net?subject=unsubscribe> +List-Archive: <http://alioth-lists.debian.net/pipermail/pkg-emacsen-addons/> +List-Post: <mailto:pkg-emacsen-addons@alioth-lists.debian.net> +List-Help: <mailto:pkg-emacsen-addons-request@alioth-lists.debian.net?subject=help> +List-Subscribe: <https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-emacsen-addons>, + <mailto:pkg-emacsen-addons-request@alioth-lists.debian.net?subject=subscribe> +Reply-To: Sean Whitton <spwhitton@spwhitton.name>, 916805@bugs.debian.org +Content-Type: multipart/mixed; boundary="===============5317466403067656157==" +Errors-To: pkg-emacsen-addons-bounces+bremner=debian.org@alioth-lists.debian.net +Sender: "Pkg-emacsen-addons" + <pkg-emacsen-addons-bounces+bremner=debian.org@alioth-lists.debian.net> +X-Spam_score: 2.8 +X-Spam_score_int: 28 +X-Spam_bar: ++ + +--===============5317466403067656157== +Content-Type: multipart/signed; boundary="=-=-="; + micalg=pgp-sha512; protocol="application/pgp-signature" + +--=-=-= +Content-Type: text/plain +Content-Transfer-Encoding: quoted-printable + +control: severity -1 serious + +Hello, + +Emacs 26.1 has reached Debian unstable (sooner than expected; sorry for +all the e-mails). + +=2D-=20 +Sean Whitton + +--=-=-= +Content-Type: application/pgp-signature; name="signature.asc" + +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCgAdFiEEm5FwB64DDjbk/CSLaVt65L8GYkAFAlwb3pYACgkQaVt65L8G +YkDLrhAAhORxZzZDE5vlXRm89JYA3jd9OyleioZvDDRCrpEd7CQ5AHiMMJizW1lU +gn6OBIoW4O04TZ5oOuUnDHK/rS0G4zgNCJUyNf06zVECmdvkzspNNpQ3J5aOi4t2 +lhjRIFOKA9ifGsEqYLwP2dork1xFuyHEqHkDH8zpCTvdzkWky1bwAD/Pj5dArd7t +FeQGsPm7/64H1/rHk8pSP2pQgRsMDX6rIdx3vuQ7r+NssdRq+II4e479l02TiCDi +FBOX+n3nPXxREPdZ9EKL4SauL/AnRqpeC9GX6fC9OOnQeQ1xVTzNWKa6ixrqkFoH +TI/vy51p16jFNgdkLkyLtZA8Tq72TIAKWbZC0GFzWJVNASWu7WDIoMn5pgoi454w +TgsvK9MOnEYeABiDUa1ppaoMiP4+3j5yT0eWttTMSkcKjk1Ap1o+RfUxlIGl0Rog +ShbG2y6Mv8FERtjzPVQ7VMLDN9zRIbtlSJFm7CboPNSAygzzzaA/RIN/e8MdbZoM +a8AT9KiAVHEEcw+nWFAatAew5VP9iRZVgrVdWBszuaWOolxnYvpAL45WanqG0eab +VMe66+rZ8momI0MsM9JcqBwXO+fOf8CrPSO9PL8VFEJXFLZQS7asFStJf2l8msWE +3IYhvk4B6Nf1R96XzpXLlkOnoGtcnPVAvotrGU/rDfk5i/WF810= +=mWfF +-----END PGP SIGNATURE----- +--=-=-=-- + + +--===============5317466403067656157== +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: base64 +Content-Disposition: inline + +X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KUGtnLWVtYWNz +ZW4tYWRkb25zIG1haWxpbmcgbGlzdApQa2ctZW1hY3Nlbi1hZGRvbnNAYWxpb3RoLWxpc3RzLmRl +Ymlhbi5uZXQKaHR0cHM6Ly9hbGlvdGgtbGlzdHMuZGViaWFuLm5ldC9jZ2ktYmluL21haWxtYW4v +bGlzdGluZm8vcGtnLWVtYWNzZW4tYWRkb25zCg== + +--===============5317466403067656157==-- + diff --git a/test/corpora/duplicate/msg-3-2:2, b/test/corpora/duplicate/msg-3-2:2, new file mode 100644 index 00000000..292d515f --- /dev/null +++ b/test/corpora/duplicate/msg-3-2:2, @@ -0,0 +1,184 @@ +Return-path: <pkg-emacsen-addons-bounces+bremner=debian.org@alioth-lists.debian.net> +Envelope-to: david@tethera.net +Delivery-date: Thu, 20 Dec 2018 13:27:12 -0500 +Received: from mailly.debian.org ([2001:41b8:202:deb:6564:a62:52c3:4b72]) + by fethera.tethera.net with esmtp (Exim 4.89) + (envelope-from <pkg-emacsen-addons-bounces+bremner=debian.org@alioth-lists.debian.net>) + id 1ga32O-0005ap-Hn + for david@tethera.net; Thu, 20 Dec 2018 13:27:12 -0500 +Received: from alioth-lists-01.debian.net ([2001:ba8:0:2c77:0:4:0:1]) + by mailly.debian.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) + (Exim 4.89) + (envelope-from <pkg-emacsen-addons-bounces+bremner=debian.org@alioth-lists.debian.net>) + id 1ga32O-0004V7-4x + for david@tethera.net; Thu, 20 Dec 2018 18:27:12 +0000 +Received: from localhost ([::1] helo=alioth-lists-01.debian.net) + by alioth-lists-01.debian.net with esmtp (Exim 4.89) + (envelope-from <pkg-emacsen-addons-bounces+bremner=debian.org@alioth-lists.debian.net>) + id 1ga32N-0003wA-Sc + for bremner@debian.org; Thu, 20 Dec 2018 18:27:11 +0000 +Received: from buxtehude.debian.org ([2607:f8f0:614:1::1274:39]) + by alioth-lists-01.debian.net with esmtps + (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) + (envelope-from <debbugs@buxtehude.debian.org>) id 1ga32M-0003vQ-Q9 + for pkg-emacsen-addons@lists.alioth.debian.org; Thu, 20 Dec 2018 18:27:10 +0000 +Received: from debbugs by buxtehude.debian.org with local (Exim 4.89) + (envelope-from <debbugs@buxtehude.debian.org>) + id 1ga32K-0005Sn-7B; Thu, 20 Dec 2018 18:27:08 +0000 +X-Loop: owner@bugs.debian.org +Resent-From: Sean Whitton <spwhitton@spwhitton.name> +Resent-To: debian-bugs-dist@lists.debian.org +Resent-CC: Debian Emacs addons team + <pkg-emacsen-addons@lists.alioth.debian.org> +X-Loop: owner@bugs.debian.org +Resent-Date: Thu, 20 Dec 2018 18:27:06 +0000 +Resent-Message-ID: <handler.916808.B916808.154533033319830@bugs.debian.org> +X-Debian-PR-Message: followup 916808 +X-Debian-PR-Package: src:hydra-el +X-Debian-PR-Keywords: ftbfs +References: <87bm5ih3w5.fsf@zephyr.silentflame.com> +X-Debian-PR-Source: hydra-el +Received: via spool by 916808-submit@bugs.debian.org id=B916808.154533033319830 + (code B ref 916808); Thu, 20 Dec 2018 18:27:06 +0000 +Received: (at 916808) by bugs.debian.org; 20 Dec 2018 18:25:33 +0000 +X-Spam-Checker-Version: SpamAssassin 3.4.2-bugs.debian.org_2005_01_02 + (2018-09-13) on buxtehude.debian.org +X-Spam-Level: +X-Spam-Status: No, score=-11.3 required=4.0 tests=BAYES_00,DKIM_SIGNED, + DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,PGPSIGNATURE,RCVD_IN_DNSWL_LOW, + SORTED_RECIPS,SPF_HELO_PASS,SPF_PASS,SUSPICIOUS_RECIPS,TXREP + autolearn=unavailable autolearn_force=no + version=3.4.2-bugs.debian.org_2005_01_02 +X-Spam-Bayes: score:0.0000 Tokens: new, 0; hammy, 115; neutral, 22; spammy, 1. + spammytokens:0.902-+--emails + hammytokens:0.000-+--HX-ME-Sender:xms, + 0.000-+--H*RU:10.202.2.43, + 0.000-+--Hx-spam-relays-external:10.202.2.43, 0.000-+--H*F:U*spwhitton, + 0.000-+--H*F:D*spwhitton.name +Received: from wout2-smtp.messagingengine.com ([64.147.123.25]) + by buxtehude.debian.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) + (Exim 4.89) (envelope-from <spwhitton@spwhitton.name>) + id 1ga30m-00059C-Kv; Thu, 20 Dec 2018 18:25:32 +0000 +Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) + by mailout.west.internal (Postfix) with ESMTP id C50B712F6; + Thu, 20 Dec 2018 13:25:30 -0500 (EST) +Received: from mailfrontend1 ([10.202.2.162]) + by compute3.internal (MEProxy); Thu, 20 Dec 2018 13:25:31 -0500 +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=spwhitton.name; + h=from:to:subject:date:message-id:mime-version:content-type; s= + fm1; bh=jAd0CK1DR6lBA7NSLH5FsHIYQv3lqnNZlsr/mb10zqE=; b=X9S4kI14 + zxdg9IKMIyALL2Eao3GTyyojuATJkgCqJvZWd8RWpty6RBStZfyeOqR1L3Gr5m3/ + EVeiHQyFNnPor2xjMDmblfPS/u09JxVlc0KMpT0XXRfNWsVQn+U40nNRX15kXzZ/ + D1rYhxpxzKRzU2tByUULCgbGlXAwJQtOXMDw3mpj1BxcoO13H/0H/KQTQ+AcpiOw + BV3JFKL/jA+mH8uAPIgNM2mUYZz5REO89eh3lPhLyc7tw745X+4ywZlo/Piqa0+6 + BCldY9/nDR3csAUKx1+3hkpJPdqFALBWvG3SelGt44BqcoLsOJLB8QH6trCro39o + fEnBaUBTAkTAHA== +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= + messagingengine.com; h=content-type:date:from:message-id + :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender + :x-me-sender:x-sasl-enc; s=fm1; bh=jAd0CK1DR6lBA7NSLH5FsHIYQv3lq + nNZlsr/mb10zqE=; b=QYqLjUBZtfbO0DUlagvXRP2BPnpTgkvIna9/uCewkdoIH + /LuPW6DZUNWQa55qiDquqKXcs0tTODTEzYgeIDgqC+DDBTHnFQvXdWyS1X3o4sLL + 8dTKk8lv7M1/zKFxyg/ycNvPJGS9m4ZucGbxjwdgAcozhg7W1Qztxt9eVhPVnenS + 5sdeJ9mjIE7lYkKX4QVsXPOi86j6QlfMNyi/OnBfX2+95QiA/xPE/wEq4MYlLNm7 + Av1P/8OrI4ImDKkOEivarktL+isYL7OXyGB4GfUTsydiy9dhP7RKPxrai1kJRu5S + b2470KXNatu2WkyMFrsdcwrSqyKIe096k5xPfVI2A== +X-ME-Sender: <xms:mt4bXHFFQvAGVxMhHQP5DBif075kRubHE1KJQrR0OsDN2ClFFtlRXw> +X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtkedrudejfedguddugecutefuodetggdotefrod + ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthenuceurghilhhouhhtmecu + fedttdenucfuohhrthgvugcurhgvtghiphhsucdlgedtmdenucfjughrpefhvffufffkgg + gtsehgtderredttddtnecuhfhrohhmpefuvggrnhcuhghhihhtthhonhcuoehsphifhhhi + thhtohhnsehsphifhhhithhtohhnrdhnrghmvgeqnecurfgrrhgrmhepmhgrihhlfhhroh + hmpehsphifhhhithhtohhnsehsphifhhhithhtohhnrdhnrghmvgenucevlhhushhtvghr + ufhiiigvpedt +X-ME-Proxy: <xmx:mt4bXGqtKYX8StS4oLrucVpNHp3EoaoH6jbQkd2mTFzupx7FwIJ2dQ> + <xmx:mt4bXH457xpOO1PnlqWQoPt1r7kL_P9ta064wZO_JDW1QAycFDjIsg> + <xmx:mt4bXPQaOrPjDseNXftuMgX1Y9gyHDbVUCYSYNdX6oXwBQhAGwzqIw> + <xmx:mt4bXLbmA2mCpvakWE26qsCvS2IOX4eN0KdeU2tQi-SXYEBMLVpE3A> +From: Sean Whitton <spwhitton@spwhitton.name> +To: 916805@bugs.debian.org, 916807@bugs.debian.org, 916808@bugs.debian.org, + 916809@bugs.debian.org, 916811@bugs.debian.org, 916867@bugs.debian.org, + 916869@bugs.debian.org, 916872@bugs.debian.org, 916875@bugs.debian.org, + 916876@bugs.debian.org +Date: Thu, 20 Dec 2018 18:25:26 +0000 +Message-ID: <87r2ecrr6x.fsf@zephyr.silentflame.com> +MIME-Version: 1.0 +X-CrossAssassin-Score: 3 +Received-SPF: pass client-ip=2607:f8f0:614:1::1274:39; + envelope-from=debbugs@buxtehude.debian.org; helo=buxtehude.debian.org +x-debian-approved: yes +Subject: [Pkg-emacsen-addons] Bug#916808: Increase severity to 'serious' +X-BeenThere: pkg-emacsen-addons@alioth-lists.debian.net +X-Mailman-Version: 2.1.23 +Precedence: list +List-Id: Maintainers list for Emacs addon packages + <pkg-emacsen-addons.alioth-lists.debian.net> +List-Unsubscribe: <https://alioth-lists.debian.net/cgi-bin/mailman/options/pkg-emacsen-addons>, + <mailto:pkg-emacsen-addons-request@alioth-lists.debian.net?subject=unsubscribe> +List-Archive: <http://alioth-lists.debian.net/pipermail/pkg-emacsen-addons/> +List-Post: <mailto:pkg-emacsen-addons@alioth-lists.debian.net> +List-Help: <mailto:pkg-emacsen-addons-request@alioth-lists.debian.net?subject=help> +List-Subscribe: <https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-emacsen-addons>, + <mailto:pkg-emacsen-addons-request@alioth-lists.debian.net?subject=subscribe> +Reply-To: Sean Whitton <spwhitton@spwhitton.name>, 916808@bugs.debian.org +Content-Type: multipart/mixed; boundary="===============8231894308137086149==" +Errors-To: pkg-emacsen-addons-bounces+bremner=debian.org@alioth-lists.debian.net +Sender: "Pkg-emacsen-addons" + <pkg-emacsen-addons-bounces+bremner=debian.org@alioth-lists.debian.net> +X-Spam_score: 2.8 +X-Spam_score_int: 28 +X-Spam_bar: ++ + +--===============8231894308137086149== +Content-Type: multipart/signed; boundary="=-=-="; + micalg=pgp-sha512; protocol="application/pgp-signature" + +--=-=-= +Content-Type: text/plain +Content-Transfer-Encoding: quoted-printable + +control: severity -1 serious + +Hello, + +Emacs 26.1 has reached Debian unstable (sooner than expected; sorry for +all the e-mails). + +=2D-=20 +Sean Whitton + +--=-=-= +Content-Type: application/pgp-signature; name="signature.asc" + +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCgAdFiEEm5FwB64DDjbk/CSLaVt65L8GYkAFAlwb3pYACgkQaVt65L8G +YkDLrhAAhORxZzZDE5vlXRm89JYA3jd9OyleioZvDDRCrpEd7CQ5AHiMMJizW1lU +gn6OBIoW4O04TZ5oOuUnDHK/rS0G4zgNCJUyNf06zVECmdvkzspNNpQ3J5aOi4t2 +lhjRIFOKA9ifGsEqYLwP2dork1xFuyHEqHkDH8zpCTvdzkWky1bwAD/Pj5dArd7t +FeQGsPm7/64H1/rHk8pSP2pQgRsMDX6rIdx3vuQ7r+NssdRq+II4e479l02TiCDi +FBOX+n3nPXxREPdZ9EKL4SauL/AnRqpeC9GX6fC9OOnQeQ1xVTzNWKa6ixrqkFoH +TI/vy51p16jFNgdkLkyLtZA8Tq72TIAKWbZC0GFzWJVNASWu7WDIoMn5pgoi454w +TgsvK9MOnEYeABiDUa1ppaoMiP4+3j5yT0eWttTMSkcKjk1Ap1o+RfUxlIGl0Rog +ShbG2y6Mv8FERtjzPVQ7VMLDN9zRIbtlSJFm7CboPNSAygzzzaA/RIN/e8MdbZoM +a8AT9KiAVHEEcw+nWFAatAew5VP9iRZVgrVdWBszuaWOolxnYvpAL45WanqG0eab +VMe66+rZ8momI0MsM9JcqBwXO+fOf8CrPSO9PL8VFEJXFLZQS7asFStJf2l8msWE +3IYhvk4B6Nf1R96XzpXLlkOnoGtcnPVAvotrGU/rDfk5i/WF810= +=mWfF +-----END PGP SIGNATURE----- +--=-=-=-- + + +--===============8231894308137086149== +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: base64 +Content-Disposition: inline + +X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KUGtnLWVtYWNz +ZW4tYWRkb25zIG1haWxpbmcgbGlzdApQa2ctZW1hY3Nlbi1hZGRvbnNAYWxpb3RoLWxpc3RzLmRl +Ymlhbi5uZXQKaHR0cHM6Ly9hbGlvdGgtbGlzdHMuZGViaWFuLm5ldC9jZ2ktYmluL21haWxtYW4v +bGlzdGluZm8vcGtnLWVtYWNzZW4tYWRkb25zCg== + +--===============8231894308137086149==-- + diff --git a/test/corpora/duplicate/msg-3-3:2, b/test/corpora/duplicate/msg-3-3:2, new file mode 100644 index 00000000..bff2473c --- /dev/null +++ b/test/corpora/duplicate/msg-3-3:2, @@ -0,0 +1,178 @@ +Return-path: <bounces+20181220-bremner=debian.org@tracker.debian.org> +Envelope-to: david@tethera.net +Delivery-date: Thu, 20 Dec 2018 13:27:16 -0500 +Received: from muffat.debian.org ([2607:f8f0:614:1::1274:33]) + by fethera.tethera.net with esmtp (Exim 4.89) + (envelope-from <bounces+20181220-bremner=debian.org@tracker.debian.org>) + id 1ga32S-0005aw-5h + for david@tethera.net; Thu, 20 Dec 2018 13:27:16 -0500 +Received: from ticharich.debian.org ([2001:41c8:1000:21::21:23]) + from C=NA,ST=NA,L=Ankh Morpork,O=Debian SMTP,OU=Debian SMTP CA,CN=ticharich.debian.org,EMAIL=hostmaster@ticharich.debian.org (verified) + by muffat.debian.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) + (Exim 4.89) + (envelope-from <bounces+20181220-bremner=debian.org@tracker.debian.org>) + id 1ga32R-0008QQ-PL + for david@tethera.net; Thu, 20 Dec 2018 18:27:15 +0000 +Received: from localhost ([::1] helo=ticharich.debian.org) + by ticharich.debian.org with esmtp (Exim 4.89) + (envelope-from <bounces+20181220-bremner=debian.org@tracker.debian.org>) + id 1ga32Q-0008BB-Ad + for david@tethera.net; Thu, 20 Dec 2018 18:27:14 +0000 +Received: from muffat.debian.org ([2607:f8f0:614:1::1274:33]) + from C=NA,ST=NA,L=Ankh Morpork,O=Debian SMTP,OU=Debian SMTP CA,CN=muffat.debian.org,EMAIL=hostmaster@muffat.debian.org (verified) + by ticharich.debian.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) + (Exim 4.89) + (envelope-from <debbugs@buxtehude.debian.org>) + id 1ga32Q-0008Ai-2N + for dispatch+haskell-mode@tracker.debian.org; Thu, 20 Dec 2018 18:27:14 +0000 +Received: from quantz.debian.org ([2001:41c8:1000:21::21:28]) + from C=NA,ST=NA,L=Ankh Morpork,O=Debian SMTP,OU=Debian SMTP CA,CN=quantz.debian.org,EMAIL=hostmaster@quantz.debian.org (verified) + by muffat.debian.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) + (Exim 4.89) + (envelope-from <debbugs@buxtehude.debian.org>) + id 1ga32O-0008QE-Eo + for dispatch+haskell-mode@tracker.debian.org; Thu, 20 Dec 2018 18:27:12 +0000 +Received: from qa by quantz.debian.org with local (Exim 4.89) + (envelope-from <debbugs@buxtehude.debian.org>) + id 1ga32M-0006hb-Vn + for dispatch+haskell-mode@tracker.debian.org; Thu, 20 Dec 2018 18:27:10 +0000 +Received: from buxtehude.debian.org ([2607:f8f0:614:1::1274:39]) + from C=NA,ST=NA,L=Ankh Morpork,O=Debian SMTP,OU=Debian SMTP CA,CN=buxtehude.debian.org,EMAIL=hostmaster@buxtehude.debian.org (verified) + by quantz.debian.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) + (Exim 4.89) + (envelope-from <debbugs@buxtehude.debian.org>) + id 1ga32J-0006gG-1x + for haskell-mode@packages.qa.debian.org; Thu, 20 Dec 2018 18:27:07 +0000 +Received: from debbugs by buxtehude.debian.org with local (Exim 4.89) + (envelope-from <debbugs@buxtehude.debian.org>) + id 1ga32H-0005SF-MF; Thu, 20 Dec 2018 18:27:05 +0000 +X-Loop: owner@bugs.debian.org +Subject: Bug#916807: Increase severity to 'serious' +Reply-To: Sean Whitton <spwhitton@spwhitton.name>, 916807@bugs.debian.org +Resent-From: Sean Whitton <spwhitton@spwhitton.name> +Resent-To: debian-bugs-dist@lists.debian.org +Resent-CC: Debian Emacs addons team <pkg-emacsen-addons@lists.alioth.debian.org> +X-Loop: owner@bugs.debian.org +Resent-Date: Thu, 20 Dec 2018 18:27:04 +0000 +Resent-Message-ID: <handler.916807.B916807.154533033319820@bugs.debian.org> +X-Debian-PR-Message: followup 916807 +X-Debian-PR-Package: src:haskell-mode +X-Debian-PR-Keywords: ftbfs +References: <87efaeh3zr.fsf@zephyr.silentflame.com> +X-Debian-PR-Source: haskell-mode +Received: via spool by 916807-submit@bugs.debian.org id=B916807.154533033319820 + (code B ref 916807); Thu, 20 Dec 2018 18:27:04 +0000 +Received: (at 916807) by bugs.debian.org; 20 Dec 2018 18:25:33 +0000 +X-Spam-Checker-Version: SpamAssassin 3.4.2-bugs.debian.org_2005_01_02 + (2018-09-13) on buxtehude.debian.org +X-Spam-Level: +X-Spam-Status: No, score=-11.3 required=4.0 tests=BAYES_00,DKIM_SIGNED, + DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,PGPSIGNATURE,RCVD_IN_DNSWL_LOW, + SORTED_RECIPS,SPF_HELO_PASS,SPF_PASS,SUSPICIOUS_RECIPS,TXREP + autolearn=unavailable autolearn_force=no + version=3.4.2-bugs.debian.org_2005_01_02 +X-Spam-Bayes: score:0.0000 Tokens: new, 0; hammy, 115; neutral, 22; spammy, 1. + spammytokens:0.902-+--emails hammytokens:0.000-+--HX-ME-Sender:xms, + 0.000-+--H*RU:10.202.2.43, + 0.000-+--Hx-spam-relays-external:10.202.2.43, + 0.000-+--H*F:D*spwhitton.name, 0.000-+--H*F:U*spwhitton +Received: from wout2-smtp.messagingengine.com ([64.147.123.25]) + by buxtehude.debian.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) + (Exim 4.89) + (envelope-from <spwhitton@spwhitton.name>) + id 1ga30m-00059C-Kv; Thu, 20 Dec 2018 18:25:32 +0000 +Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) + by mailout.west.internal (Postfix) with ESMTP id C50B712F6; + Thu, 20 Dec 2018 13:25:30 -0500 (EST) +Received: from mailfrontend1 ([10.202.2.162]) + by compute3.internal (MEProxy); Thu, 20 Dec 2018 13:25:31 -0500 +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=spwhitton.name; + h=from:to:subject:date:message-id:mime-version:content-type; s= + fm1; bh=jAd0CK1DR6lBA7NSLH5FsHIYQv3lqnNZlsr/mb10zqE=; b=X9S4kI14 + zxdg9IKMIyALL2Eao3GTyyojuATJkgCqJvZWd8RWpty6RBStZfyeOqR1L3Gr5m3/ + EVeiHQyFNnPor2xjMDmblfPS/u09JxVlc0KMpT0XXRfNWsVQn+U40nNRX15kXzZ/ + D1rYhxpxzKRzU2tByUULCgbGlXAwJQtOXMDw3mpj1BxcoO13H/0H/KQTQ+AcpiOw + BV3JFKL/jA+mH8uAPIgNM2mUYZz5REO89eh3lPhLyc7tw745X+4ywZlo/Piqa0+6 + BCldY9/nDR3csAUKx1+3hkpJPdqFALBWvG3SelGt44BqcoLsOJLB8QH6trCro39o + fEnBaUBTAkTAHA== +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= + messagingengine.com; h=content-type:date:from:message-id + :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender + :x-me-sender:x-sasl-enc; s=fm1; bh=jAd0CK1DR6lBA7NSLH5FsHIYQv3lq + nNZlsr/mb10zqE=; b=QYqLjUBZtfbO0DUlagvXRP2BPnpTgkvIna9/uCewkdoIH + /LuPW6DZUNWQa55qiDquqKXcs0tTODTEzYgeIDgqC+DDBTHnFQvXdWyS1X3o4sLL + 8dTKk8lv7M1/zKFxyg/ycNvPJGS9m4ZucGbxjwdgAcozhg7W1Qztxt9eVhPVnenS + 5sdeJ9mjIE7lYkKX4QVsXPOi86j6QlfMNyi/OnBfX2+95QiA/xPE/wEq4MYlLNm7 + Av1P/8OrI4ImDKkOEivarktL+isYL7OXyGB4GfUTsydiy9dhP7RKPxrai1kJRu5S + b2470KXNatu2WkyMFrsdcwrSqyKIe096k5xPfVI2A== +X-ME-Sender: <xms:mt4bXHFFQvAGVxMhHQP5DBif075kRubHE1KJQrR0OsDN2ClFFtlRXw> +X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtkedrudejfedguddugecutefuodetggdotefrod + ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthenuceurghilhhouhhtmecu + fedttdenucfuohhrthgvugcurhgvtghiphhsucdlgedtmdenucfjughrpefhvffufffkgg + gtsehgtderredttddtnecuhfhrohhmpefuvggrnhcuhghhihhtthhonhcuoehsphifhhhi + thhtohhnsehsphifhhhithhtohhnrdhnrghmvgeqnecurfgrrhgrmhepmhgrihhlfhhroh + hmpehsphifhhhithhtohhnsehsphifhhhithhtohhnrdhnrghmvgenucevlhhushhtvghr + ufhiiigvpedt +X-ME-Proxy: <xmx:mt4bXGqtKYX8StS4oLrucVpNHp3EoaoH6jbQkd2mTFzupx7FwIJ2dQ> + <xmx:mt4bXH457xpOO1PnlqWQoPt1r7kL_P9ta064wZO_JDW1QAycFDjIsg> + <xmx:mt4bXPQaOrPjDseNXftuMgX1Y9gyHDbVUCYSYNdX6oXwBQhAGwzqIw> + <xmx:mt4bXLbmA2mCpvakWE26qsCvS2IOX4eN0KdeU2tQi-SXYEBMLVpE3A> +From: Sean Whitton <spwhitton@spwhitton.name> +To: 916805@bugs.debian.org, 916807@bugs.debian.org, 916808@bugs.debian.org, 916809@bugs.debian.org, 916811@bugs.debian.org, 916867@bugs.debian.org, 916869@bugs.debian.org, 916872@bugs.debian.org, 916875@bugs.debian.org, 916876@bugs.debian.org +Date: Thu, 20 Dec 2018 18:25:26 +0000 +Message-ID: <87r2ecrr6x.fsf@zephyr.silentflame.com> +MIME-Version: 1.0 +Content-Type: multipart/signed; boundary="=-=-="; + micalg=pgp-sha512; protocol="application/pgp-signature" +X-CrossAssassin-Score: 2 +Delivered-To: haskell-mode@packages.qa.debian.org +Delivered-To: dispatch+haskell-mode@tracker.debian.org +X-Loop: dispatch@tracker.debian.org +X-Distro-Tracker-Keyword: bts +X-Distro-Tracker-Package: haskell-mode +List-Id: <haskell-mode.tracker.debian.org> +X-Debian: tracker.debian.org +X-Debian-Package: haskell-mode +X-PTS-Package: haskell-mode +X-PTS-Keyword: bts +Precedence: list +List-Unsubscribe: <mailto:control@tracker.debian.org?body=unsubscribe%20haskell-mode> +X-Spam_score: 2.8 +X-Spam_score_int: 28 +X-Spam_bar: ++ + +--=-=-= +Content-Type: text/plain +Content-Transfer-Encoding: quoted-printable + +control: severity -1 serious + +Hello, + +Emacs 26.1 has reached Debian unstable (sooner than expected; sorry for +all the e-mails). + +=2D-=20 +Sean Whitton + +--=-=-= +Content-Type: application/pgp-signature; name="signature.asc" + +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCgAdFiEEm5FwB64DDjbk/CSLaVt65L8GYkAFAlwb3pYACgkQaVt65L8G +YkDLrhAAhORxZzZDE5vlXRm89JYA3jd9OyleioZvDDRCrpEd7CQ5AHiMMJizW1lU +gn6OBIoW4O04TZ5oOuUnDHK/rS0G4zgNCJUyNf06zVECmdvkzspNNpQ3J5aOi4t2 +lhjRIFOKA9ifGsEqYLwP2dork1xFuyHEqHkDH8zpCTvdzkWky1bwAD/Pj5dArd7t +FeQGsPm7/64H1/rHk8pSP2pQgRsMDX6rIdx3vuQ7r+NssdRq+II4e479l02TiCDi +FBOX+n3nPXxREPdZ9EKL4SauL/AnRqpeC9GX6fC9OOnQeQ1xVTzNWKa6ixrqkFoH +TI/vy51p16jFNgdkLkyLtZA8Tq72TIAKWbZC0GFzWJVNASWu7WDIoMn5pgoi454w +TgsvK9MOnEYeABiDUa1ppaoMiP4+3j5yT0eWttTMSkcKjk1Ap1o+RfUxlIGl0Rog +ShbG2y6Mv8FERtjzPVQ7VMLDN9zRIbtlSJFm7CboPNSAygzzzaA/RIN/e8MdbZoM +a8AT9KiAVHEEcw+nWFAatAew5VP9iRZVgrVdWBszuaWOolxnYvpAL45WanqG0eab +VMe66+rZ8momI0MsM9JcqBwXO+fOf8CrPSO9PL8VFEJXFLZQS7asFStJf2l8msWE +3IYhvk4B6Nf1R96XzpXLlkOnoGtcnPVAvotrGU/rDfk5i/WF810= +=mWfF +-----END PGP SIGNATURE----- +--=-=-=-- + diff --git a/test/corpora/duplicate/msg-3-4:2, b/test/corpora/duplicate/msg-3-4:2, new file mode 100644 index 00000000..861719d1 --- /dev/null +++ b/test/corpora/duplicate/msg-3-4:2, @@ -0,0 +1,184 @@ +Return-path: <pkg-emacsen-addons-bounces+bremner=debian.org@alioth-lists.debian.net> +Envelope-to: david@tethera.net +Delivery-date: Thu, 20 Dec 2018 13:27:16 -0500 +Received: from mailly.debian.org ([2001:41b8:202:deb:6564:a62:52c3:4b72]) + by fethera.tethera.net with esmtp (Exim 4.89) + (envelope-from <pkg-emacsen-addons-bounces+bremner=debian.org@alioth-lists.debian.net>) + id 1ga32S-0005ax-Kz + for david@tethera.net; Thu, 20 Dec 2018 13:27:16 -0500 +Received: from alioth-lists-01.debian.net ([2001:ba8:0:2c77:0:4:0:1]) + by mailly.debian.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) + (Exim 4.89) + (envelope-from <pkg-emacsen-addons-bounces+bremner=debian.org@alioth-lists.debian.net>) + id 1ga32S-0004W6-8i + for david@tethera.net; Thu, 20 Dec 2018 18:27:16 +0000 +Received: from localhost ([::1] helo=alioth-lists-01.debian.net) + by alioth-lists-01.debian.net with esmtp (Exim 4.89) + (envelope-from <pkg-emacsen-addons-bounces+bremner=debian.org@alioth-lists.debian.net>) + id 1ga32S-0003xQ-0U + for bremner@debian.org; Thu, 20 Dec 2018 18:27:16 +0000 +Received: from buxtehude.debian.org ([2607:f8f0:614:1::1274:39]) + by alioth-lists-01.debian.net with esmtps + (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) + (envelope-from <debbugs@buxtehude.debian.org>) id 1ga32Q-0003wj-1x + for pkg-emacsen-addons@lists.alioth.debian.org; Thu, 20 Dec 2018 18:27:14 +0000 +Received: from debbugs by buxtehude.debian.org with local (Exim 4.89) + (envelope-from <debbugs@buxtehude.debian.org>) + id 1ga32O-0005Te-Sa; Thu, 20 Dec 2018 18:27:12 +0000 +X-Loop: owner@bugs.debian.org +Resent-From: Sean Whitton <spwhitton@spwhitton.name> +Resent-To: debian-bugs-dist@lists.debian.org +Resent-CC: Debian Emacs addons team + <pkg-emacsen-addons@lists.alioth.debian.org> +X-Loop: owner@bugs.debian.org +Resent-Date: Thu, 20 Dec 2018 18:27:11 +0000 +Resent-Message-ID: <handler.916811.B916811.154533033319851@bugs.debian.org> +X-Debian-PR-Message: followup 916811 +X-Debian-PR-Package: src:weechat-el +X-Debian-PR-Keywords: ftbfs +References: <8736quh3la.fsf@zephyr.silentflame.com> +X-Debian-PR-Source: weechat-el +Received: via spool by 916811-submit@bugs.debian.org id=B916811.154533033319851 + (code B ref 916811); Thu, 20 Dec 2018 18:27:11 +0000 +Received: (at 916811) by bugs.debian.org; 20 Dec 2018 18:25:33 +0000 +X-Spam-Checker-Version: SpamAssassin 3.4.2-bugs.debian.org_2005_01_02 + (2018-09-13) on buxtehude.debian.org +X-Spam-Level: +X-Spam-Status: No, score=-15.2 required=4.0 tests=BAYES_00,DKIM_SIGNED, + DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,PGPSIGNATURE,RCVD_IN_DNSWL_LOW, + SORTED_RECIPS,SPF_HELO_PASS,SPF_PASS,SUSPICIOUS_RECIPS,TXREP + autolearn=unavailable autolearn_force=no + version=3.4.2-bugs.debian.org_2005_01_02 +X-Spam-Bayes: score:0.0000 Tokens: new, 0; hammy, 115; neutral, 22; spammy, 1. + spammytokens:0.902-+--emails + hammytokens:0.000-+--HX-ME-Sender:xms, + 0.000-+--H*RU:10.202.2.43, + 0.000-+--Hx-spam-relays-external:10.202.2.43, + 0.000-+--H*F:D*spwhitton.name, 0.000-+--H*F:U*spwhitton +Received: from wout2-smtp.messagingengine.com ([64.147.123.25]) + by buxtehude.debian.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) + (Exim 4.89) (envelope-from <spwhitton@spwhitton.name>) + id 1ga30m-00059C-Kv; Thu, 20 Dec 2018 18:25:32 +0000 +Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) + by mailout.west.internal (Postfix) with ESMTP id C50B712F6; + Thu, 20 Dec 2018 13:25:30 -0500 (EST) +Received: from mailfrontend1 ([10.202.2.162]) + by compute3.internal (MEProxy); Thu, 20 Dec 2018 13:25:31 -0500 +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=spwhitton.name; + h=from:to:subject:date:message-id:mime-version:content-type; s= + fm1; bh=jAd0CK1DR6lBA7NSLH5FsHIYQv3lqnNZlsr/mb10zqE=; b=X9S4kI14 + zxdg9IKMIyALL2Eao3GTyyojuATJkgCqJvZWd8RWpty6RBStZfyeOqR1L3Gr5m3/ + EVeiHQyFNnPor2xjMDmblfPS/u09JxVlc0KMpT0XXRfNWsVQn+U40nNRX15kXzZ/ + D1rYhxpxzKRzU2tByUULCgbGlXAwJQtOXMDw3mpj1BxcoO13H/0H/KQTQ+AcpiOw + BV3JFKL/jA+mH8uAPIgNM2mUYZz5REO89eh3lPhLyc7tw745X+4ywZlo/Piqa0+6 + BCldY9/nDR3csAUKx1+3hkpJPdqFALBWvG3SelGt44BqcoLsOJLB8QH6trCro39o + fEnBaUBTAkTAHA== +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= + messagingengine.com; h=content-type:date:from:message-id + :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender + :x-me-sender:x-sasl-enc; s=fm1; bh=jAd0CK1DR6lBA7NSLH5FsHIYQv3lq + nNZlsr/mb10zqE=; b=QYqLjUBZtfbO0DUlagvXRP2BPnpTgkvIna9/uCewkdoIH + /LuPW6DZUNWQa55qiDquqKXcs0tTODTEzYgeIDgqC+DDBTHnFQvXdWyS1X3o4sLL + 8dTKk8lv7M1/zKFxyg/ycNvPJGS9m4ZucGbxjwdgAcozhg7W1Qztxt9eVhPVnenS + 5sdeJ9mjIE7lYkKX4QVsXPOi86j6QlfMNyi/OnBfX2+95QiA/xPE/wEq4MYlLNm7 + Av1P/8OrI4ImDKkOEivarktL+isYL7OXyGB4GfUTsydiy9dhP7RKPxrai1kJRu5S + b2470KXNatu2WkyMFrsdcwrSqyKIe096k5xPfVI2A== +X-ME-Sender: <xms:mt4bXHFFQvAGVxMhHQP5DBif075kRubHE1KJQrR0OsDN2ClFFtlRXw> +X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtkedrudejfedguddugecutefuodetggdotefrod + ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthenuceurghilhhouhhtmecu + fedttdenucfuohhrthgvugcurhgvtghiphhsucdlgedtmdenucfjughrpefhvffufffkgg + gtsehgtderredttddtnecuhfhrohhmpefuvggrnhcuhghhihhtthhonhcuoehsphifhhhi + thhtohhnsehsphifhhhithhtohhnrdhnrghmvgeqnecurfgrrhgrmhepmhgrihhlfhhroh + hmpehsphifhhhithhtohhnsehsphifhhhithhtohhnrdhnrghmvgenucevlhhushhtvghr + ufhiiigvpedt +X-ME-Proxy: <xmx:mt4bXGqtKYX8StS4oLrucVpNHp3EoaoH6jbQkd2mTFzupx7FwIJ2dQ> + <xmx:mt4bXH457xpOO1PnlqWQoPt1r7kL_P9ta064wZO_JDW1QAycFDjIsg> + <xmx:mt4bXPQaOrPjDseNXftuMgX1Y9gyHDbVUCYSYNdX6oXwBQhAGwzqIw> + <xmx:mt4bXLbmA2mCpvakWE26qsCvS2IOX4eN0KdeU2tQi-SXYEBMLVpE3A> +From: Sean Whitton <spwhitton@spwhitton.name> +To: 916805@bugs.debian.org, 916807@bugs.debian.org, 916808@bugs.debian.org, + 916809@bugs.debian.org, 916811@bugs.debian.org, 916867@bugs.debian.org, + 916869@bugs.debian.org, 916872@bugs.debian.org, 916875@bugs.debian.org, + 916876@bugs.debian.org +Date: Thu, 20 Dec 2018 18:25:26 +0000 +Message-ID: <87r2ecrr6x.fsf@zephyr.silentflame.com> +MIME-Version: 1.0 +X-CrossAssassin-Score: 5 +Received-SPF: pass client-ip=2607:f8f0:614:1::1274:39; + envelope-from=debbugs@buxtehude.debian.org; helo=buxtehude.debian.org +x-debian-approved: yes +Subject: [Pkg-emacsen-addons] Bug#916811: Increase severity to 'serious' +X-BeenThere: pkg-emacsen-addons@alioth-lists.debian.net +X-Mailman-Version: 2.1.23 +Precedence: list +List-Id: Maintainers list for Emacs addon packages + <pkg-emacsen-addons.alioth-lists.debian.net> +List-Unsubscribe: <https://alioth-lists.debian.net/cgi-bin/mailman/options/pkg-emacsen-addons>, + <mailto:pkg-emacsen-addons-request@alioth-lists.debian.net?subject=unsubscribe> +List-Archive: <http://alioth-lists.debian.net/pipermail/pkg-emacsen-addons/> +List-Post: <mailto:pkg-emacsen-addons@alioth-lists.debian.net> +List-Help: <mailto:pkg-emacsen-addons-request@alioth-lists.debian.net?subject=help> +List-Subscribe: <https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-emacsen-addons>, + <mailto:pkg-emacsen-addons-request@alioth-lists.debian.net?subject=subscribe> +Reply-To: Sean Whitton <spwhitton@spwhitton.name>, 916811@bugs.debian.org +Content-Type: multipart/mixed; boundary="===============5359377007738902760==" +Errors-To: pkg-emacsen-addons-bounces+bremner=debian.org@alioth-lists.debian.net +Sender: "Pkg-emacsen-addons" + <pkg-emacsen-addons-bounces+bremner=debian.org@alioth-lists.debian.net> +X-Spam_score: 2.8 +X-Spam_score_int: 28 +X-Spam_bar: ++ + +--===============5359377007738902760== +Content-Type: multipart/signed; boundary="=-=-="; + micalg=pgp-sha512; protocol="application/pgp-signature" + +--=-=-= +Content-Type: text/plain +Content-Transfer-Encoding: quoted-printable + +control: severity -1 serious + +Hello, + +Emacs 26.1 has reached Debian unstable (sooner than expected; sorry for +all the e-mails). + +=2D-=20 +Sean Whitton + +--=-=-= +Content-Type: application/pgp-signature; name="signature.asc" + +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCgAdFiEEm5FwB64DDjbk/CSLaVt65L8GYkAFAlwb3pYACgkQaVt65L8G +YkDLrhAAhORxZzZDE5vlXRm89JYA3jd9OyleioZvDDRCrpEd7CQ5AHiMMJizW1lU +gn6OBIoW4O04TZ5oOuUnDHK/rS0G4zgNCJUyNf06zVECmdvkzspNNpQ3J5aOi4t2 +lhjRIFOKA9ifGsEqYLwP2dork1xFuyHEqHkDH8zpCTvdzkWky1bwAD/Pj5dArd7t +FeQGsPm7/64H1/rHk8pSP2pQgRsMDX6rIdx3vuQ7r+NssdRq+II4e479l02TiCDi +FBOX+n3nPXxREPdZ9EKL4SauL/AnRqpeC9GX6fC9OOnQeQ1xVTzNWKa6ixrqkFoH +TI/vy51p16jFNgdkLkyLtZA8Tq72TIAKWbZC0GFzWJVNASWu7WDIoMn5pgoi454w +TgsvK9MOnEYeABiDUa1ppaoMiP4+3j5yT0eWttTMSkcKjk1Ap1o+RfUxlIGl0Rog +ShbG2y6Mv8FERtjzPVQ7VMLDN9zRIbtlSJFm7CboPNSAygzzzaA/RIN/e8MdbZoM +a8AT9KiAVHEEcw+nWFAatAew5VP9iRZVgrVdWBszuaWOolxnYvpAL45WanqG0eab +VMe66+rZ8momI0MsM9JcqBwXO+fOf8CrPSO9PL8VFEJXFLZQS7asFStJf2l8msWE +3IYhvk4B6Nf1R96XzpXLlkOnoGtcnPVAvotrGU/rDfk5i/WF810= +=mWfF +-----END PGP SIGNATURE----- +--=-=-=-- + + +--===============5359377007738902760== +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: base64 +Content-Disposition: inline + +X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KUGtnLWVtYWNz +ZW4tYWRkb25zIG1haWxpbmcgbGlzdApQa2ctZW1hY3Nlbi1hZGRvbnNAYWxpb3RoLWxpc3RzLmRl +Ymlhbi5uZXQKaHR0cHM6Ly9hbGlvdGgtbGlzdHMuZGViaWFuLm5ldC9jZ2ktYmluL21haWxtYW4v +bGlzdGluZm8vcGtnLWVtYWNzZW4tYWRkb25zCg== + +--===============5359377007738902760==-- + diff --git a/test/corpora/duplicate/msg-3-5:2, b/test/corpora/duplicate/msg-3-5:2, new file mode 100644 index 00000000..af26374d --- /dev/null +++ b/test/corpora/duplicate/msg-3-5:2, @@ -0,0 +1,179 @@ +Return-path: <debian-science-maintainers-bounces+david=tethera.net@alioth-lists.debian.net> +Envelope-to: david@tethera.net +Delivery-date: Thu, 20 Dec 2018 13:27:21 -0500 +Received: from alioth-lists-01.debian.net ([2001:ba8:0:2c77:0:4:0:1]) + by fethera.tethera.net with esmtp (Exim 4.89) + (envelope-from <debian-science-maintainers-bounces+david=tethera.net@alioth-lists.debian.net>) + id 1ga32X-0005bA-Go + for david@tethera.net; Thu, 20 Dec 2018 13:27:21 -0500 +Received: from localhost ([::1] helo=alioth-lists-01.debian.net) + by alioth-lists-01.debian.net with esmtp (Exim 4.89) + (envelope-from <debian-science-maintainers-bounces+david=tethera.net@alioth-lists.debian.net>) + id 1ga32U-0003yc-Ai + for david@tethera.net; Thu, 20 Dec 2018 18:27:18 +0000 +Received: from buxtehude.debian.org ([2607:f8f0:614:1::1274:39]) + by alioth-lists-01.debian.net with esmtps + (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) + (envelope-from <debbugs@buxtehude.debian.org>) id 1ga32S-0003xN-6J + for debian-science-maintainers@lists.alioth.debian.org; + Thu, 20 Dec 2018 18:27:16 +0000 +Received: from debbugs by buxtehude.debian.org with local (Exim 4.89) + (envelope-from <debbugs@buxtehude.debian.org>) + id 1ga32R-0005U9-0Z; Thu, 20 Dec 2018 18:27:15 +0000 +X-Loop: owner@bugs.debian.org +Subject: Bug#916867: Increase severity to 'serious' +Resent-From: Sean Whitton <spwhitton@spwhitton.name> +Resent-To: debian-bugs-dist@lists.debian.org +Resent-CC: Debian Science Maintainers + <debian-science-maintainers@lists.alioth.debian.org> +X-Loop: owner@bugs.debian.org +Resent-Date: Thu, 20 Dec 2018 18:27:13 +0000 +Resent-Message-ID: <handler.916867.B916867.154533033319861@bugs.debian.org> +X-Debian-PR-Message: followup 916867 +X-Debian-PR-Package: src:hkl +X-Debian-PR-Keywords: ftbfs +References: <87sgyt2xyg.fsf@zephyr.silentflame.com> +X-Debian-PR-Source: hkl +Received: via spool by 916867-submit@bugs.debian.org id=B916867.154533033319861 + (code B ref 916867); Thu, 20 Dec 2018 18:27:13 +0000 +Received: (at 916867) by bugs.debian.org; 20 Dec 2018 18:25:33 +0000 +X-Spam-Checker-Version: SpamAssassin 3.4.2-bugs.debian.org_2005_01_02 + (2018-09-13) on buxtehude.debian.org +X-Spam-Level: +X-Spam-Status: No, score=-13.0 required=4.0 tests=BAYES_00,DKIM_SIGNED, + DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,PGPSIGNATURE,RCVD_IN_DNSWL_LOW, + SORTED_RECIPS,SPF_HELO_PASS,SPF_PASS,SUSPICIOUS_RECIPS,TXREP + autolearn=unavailable autolearn_force=no + version=3.4.2-bugs.debian.org_2005_01_02 +X-Spam-Bayes: score:0.0000 Tokens: new, 0; hammy, 115; neutral, 22; spammy, 1. + spammytokens:0.902-+--emails + hammytokens:0.000-+--HX-ME-Sender:xms, + 0.000-+--H*RU:10.202.2.43, + 0.000-+--Hx-spam-relays-external:10.202.2.43, + 0.000-+--H*F:D*spwhitton.name, 0.000-+--H*F:U*spwhitton +Received: from wout2-smtp.messagingengine.com ([64.147.123.25]) + by buxtehude.debian.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) + (Exim 4.89) (envelope-from <spwhitton@spwhitton.name>) + id 1ga30m-00059C-Kv; Thu, 20 Dec 2018 18:25:32 +0000 +Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) + by mailout.west.internal (Postfix) with ESMTP id C50B712F6; + Thu, 20 Dec 2018 13:25:30 -0500 (EST) +Received: from mailfrontend1 ([10.202.2.162]) + by compute3.internal (MEProxy); Thu, 20 Dec 2018 13:25:31 -0500 +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=spwhitton.name; + h=from:to:subject:date:message-id:mime-version:content-type; s= + fm1; bh=jAd0CK1DR6lBA7NSLH5FsHIYQv3lqnNZlsr/mb10zqE=; b=X9S4kI14 + zxdg9IKMIyALL2Eao3GTyyojuATJkgCqJvZWd8RWpty6RBStZfyeOqR1L3Gr5m3/ + EVeiHQyFNnPor2xjMDmblfPS/u09JxVlc0KMpT0XXRfNWsVQn+U40nNRX15kXzZ/ + D1rYhxpxzKRzU2tByUULCgbGlXAwJQtOXMDw3mpj1BxcoO13H/0H/KQTQ+AcpiOw + BV3JFKL/jA+mH8uAPIgNM2mUYZz5REO89eh3lPhLyc7tw745X+4ywZlo/Piqa0+6 + BCldY9/nDR3csAUKx1+3hkpJPdqFALBWvG3SelGt44BqcoLsOJLB8QH6trCro39o + fEnBaUBTAkTAHA== +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= + messagingengine.com; h=content-type:date:from:message-id + :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender + :x-me-sender:x-sasl-enc; s=fm1; bh=jAd0CK1DR6lBA7NSLH5FsHIYQv3lq + nNZlsr/mb10zqE=; b=QYqLjUBZtfbO0DUlagvXRP2BPnpTgkvIna9/uCewkdoIH + /LuPW6DZUNWQa55qiDquqKXcs0tTODTEzYgeIDgqC+DDBTHnFQvXdWyS1X3o4sLL + 8dTKk8lv7M1/zKFxyg/ycNvPJGS9m4ZucGbxjwdgAcozhg7W1Qztxt9eVhPVnenS + 5sdeJ9mjIE7lYkKX4QVsXPOi86j6QlfMNyi/OnBfX2+95QiA/xPE/wEq4MYlLNm7 + Av1P/8OrI4ImDKkOEivarktL+isYL7OXyGB4GfUTsydiy9dhP7RKPxrai1kJRu5S + b2470KXNatu2WkyMFrsdcwrSqyKIe096k5xPfVI2A== +X-ME-Sender: <xms:mt4bXHFFQvAGVxMhHQP5DBif075kRubHE1KJQrR0OsDN2ClFFtlRXw> +X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtkedrudejfedguddugecutefuodetggdotefrod + ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthenuceurghilhhouhhtmecu + fedttdenucfuohhrthgvugcurhgvtghiphhsucdlgedtmdenucfjughrpefhvffufffkgg + gtsehgtderredttddtnecuhfhrohhmpefuvggrnhcuhghhihhtthhonhcuoehsphifhhhi + thhtohhnsehsphifhhhithhtohhnrdhnrghmvgeqnecurfgrrhgrmhepmhgrihhlfhhroh + hmpehsphifhhhithhtohhnsehsphifhhhithhtohhnrdhnrghmvgenucevlhhushhtvghr + ufhiiigvpedt +X-ME-Proxy: <xmx:mt4bXGqtKYX8StS4oLrucVpNHp3EoaoH6jbQkd2mTFzupx7FwIJ2dQ> + <xmx:mt4bXH457xpOO1PnlqWQoPt1r7kL_P9ta064wZO_JDW1QAycFDjIsg> + <xmx:mt4bXPQaOrPjDseNXftuMgX1Y9gyHDbVUCYSYNdX6oXwBQhAGwzqIw> + <xmx:mt4bXLbmA2mCpvakWE26qsCvS2IOX4eN0KdeU2tQi-SXYEBMLVpE3A> +From: Sean Whitton <spwhitton@spwhitton.name> +To: 916805@bugs.debian.org, 916807@bugs.debian.org, 916808@bugs.debian.org, + 916809@bugs.debian.org, 916811@bugs.debian.org, 916867@bugs.debian.org, + 916869@bugs.debian.org, 916872@bugs.debian.org, 916875@bugs.debian.org, + 916876@bugs.debian.org +Date: Thu, 20 Dec 2018 18:25:26 +0000 +Message-ID: <87r2ecrr6x.fsf@zephyr.silentflame.com> +MIME-Version: 1.0 +X-CrossAssassin-Score: 6 +Received-SPF: pass client-ip=2607:f8f0:614:1::1274:39; + envelope-from=debbugs@buxtehude.debian.org; helo=buxtehude.debian.org +x-debian-approved: yes +X-BeenThere: debian-science-maintainers@alioth-lists.debian.net +X-Mailman-Version: 2.1.23 +Precedence: list +List-Id: Mailing list for maintainer discussions and BTS messages + <debian-science-maintainers.alioth-lists.debian.net> +List-Unsubscribe: <https://alioth-lists.debian.net/cgi-bin/mailman/options/debian-science-maintainers>, + <mailto:debian-science-maintainers-request@alioth-lists.debian.net?subject=unsubscribe> +List-Archive: <http://alioth-lists.debian.net/pipermail/debian-science-maintainers/> +List-Post: <mailto:debian-science-maintainers@alioth-lists.debian.net> +List-Help: <mailto:debian-science-maintainers-request@alioth-lists.debian.net?subject=help> +List-Subscribe: <https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers>, + <mailto:debian-science-maintainers-request@alioth-lists.debian.net?subject=subscribe> +Reply-To: Sean Whitton <spwhitton@spwhitton.name>, 916867@bugs.debian.org +Content-Type: multipart/mixed; boundary="===============7686561040995282884==" +Errors-To: debian-science-maintainers-bounces+david=tethera.net@alioth-lists.debian.net +Sender: "debian-science-maintainers" + <debian-science-maintainers-bounces+david=tethera.net@alioth-lists.debian.net> +X-Spam_score: 2.8 +X-Spam_score_int: 28 +X-Spam_bar: ++ + +--===============7686561040995282884== +Content-Type: multipart/signed; boundary="=-=-="; + micalg=pgp-sha512; protocol="application/pgp-signature" + +--=-=-= +Content-Type: text/plain +Content-Transfer-Encoding: quoted-printable + +control: severity -1 serious + +Hello, + +Emacs 26.1 has reached Debian unstable (sooner than expected; sorry for +all the e-mails). + +=2D-=20 +Sean Whitton + +--=-=-= +Content-Type: application/pgp-signature; name="signature.asc" + +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCgAdFiEEm5FwB64DDjbk/CSLaVt65L8GYkAFAlwb3pYACgkQaVt65L8G +YkDLrhAAhORxZzZDE5vlXRm89JYA3jd9OyleioZvDDRCrpEd7CQ5AHiMMJizW1lU +gn6OBIoW4O04TZ5oOuUnDHK/rS0G4zgNCJUyNf06zVECmdvkzspNNpQ3J5aOi4t2 +lhjRIFOKA9ifGsEqYLwP2dork1xFuyHEqHkDH8zpCTvdzkWky1bwAD/Pj5dArd7t +FeQGsPm7/64H1/rHk8pSP2pQgRsMDX6rIdx3vuQ7r+NssdRq+II4e479l02TiCDi +FBOX+n3nPXxREPdZ9EKL4SauL/AnRqpeC9GX6fC9OOnQeQ1xVTzNWKa6ixrqkFoH +TI/vy51p16jFNgdkLkyLtZA8Tq72TIAKWbZC0GFzWJVNASWu7WDIoMn5pgoi454w +TgsvK9MOnEYeABiDUa1ppaoMiP4+3j5yT0eWttTMSkcKjk1Ap1o+RfUxlIGl0Rog +ShbG2y6Mv8FERtjzPVQ7VMLDN9zRIbtlSJFm7CboPNSAygzzzaA/RIN/e8MdbZoM +a8AT9KiAVHEEcw+nWFAatAew5VP9iRZVgrVdWBszuaWOolxnYvpAL45WanqG0eab +VMe66+rZ8momI0MsM9JcqBwXO+fOf8CrPSO9PL8VFEJXFLZQS7asFStJf2l8msWE +3IYhvk4B6Nf1R96XzpXLlkOnoGtcnPVAvotrGU/rDfk5i/WF810= +=mWfF +-----END PGP SIGNATURE----- +--=-=-=-- + + +--===============7686561040995282884== +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: base64 +Content-Disposition: inline + +LS0gCmRlYmlhbi1zY2llbmNlLW1haW50YWluZXJzIG1haWxpbmcgbGlzdApkZWJpYW4tc2NpZW5j +ZS1tYWludGFpbmVyc0BhbGlvdGgtbGlzdHMuZGViaWFuLm5ldApodHRwczovL2FsaW90aC1saXN0 +cy5kZWJpYW4ubmV0L2NnaS1iaW4vbWFpbG1hbi9saXN0aW5mby9kZWJpYW4tc2NpZW5jZS1tYWlu +dGFpbmVycw== + +--===============7686561040995282884==-- + diff --git a/test/corpora/html/attribute-text b/test/corpora/html/attribute-text new file mode 100644 index 00000000..6dae8194 --- /dev/null +++ b/test/corpora/html/attribute-text @@ -0,0 +1,15 @@ +From: David Bremner <david@example.net> +To: David Bremner <david@example.net> +Subject: test html attachment +Date: Tue, 17 Nov 2009 21:28:38 +0600 +Message-ID: <87d1dajhgf.fsf@example.net> +MIME-Version: 1.0 +Content-Type: text/html +Content-Disposition: inline; filename=test.html + +<html> + <body> + <input value="a>swordfish"> + </body> + hunter2 +</html> diff --git a/test/corpora/html/embedded-image b/test/corpora/html/embedded-image new file mode 100644 index 00000000..40851530 --- /dev/null +++ b/test/corpora/html/embedded-image @@ -0,0 +1,69 @@ +From: =?utf-8?b?bWFsbW9ib3Jn?= <daemon@lublin.se> +To: =?utf-8?b?Ym9lbmRlLm1hbG1vYm9yZw==?= <daemon@lublin.se> +Date: Tue, 19 Jul 2016 11:54:24 +0200 +X-Feed2Imap-Version: 1.2.5 +Message-Id: <boendemalmoborg-1834@eltanin.uberspace.de> +Subject: =?utf-8?b?VGFjayBhbGxhIHRyYWZpa2FudGVyIG9jaCBmb3Rnw6RuZ2FyZSE=?= +Content-Type: multipart/alternative; boundary="=-1468922508-176605-12427-9500-21-=" +MIME-Version: 1.0 + + +--=-1468922508-176605-12427-9500-21-= +Content-Type: text/plain; charset=utf-8; format=flowed +Content-Transfer-Encoding: 8bit + +<http://malmoborg.se/2016/07/tack-alla-trafikanter-och-fotgangare/> + +Malmö 2016-07-09 + +I skrivande stund är vi i färd med att avetablera vÃ¥r entreprenad pÃ¥ +Tigern 3, Regementsgatan 6 i Malmö. Fastigheten har genomgÃ¥tt ett större +dräneringsarbete som i sin tur har inneburit vissa +trafikbegränsningar pÃ¥ Regementsgatan samt Davidshallsgatan under nÃ¥gra +veckors tid. Fastighetsägaren är mycket nöjd med vÃ¥r arbetsinsats och vi +kan glatt meddela att bÃ¥da vägfilerna kommer att öppnas inom kort. Nu +kommer den vackra fastigheten att klara sig torrskodd under mÃ¥nga Ã¥r +framöver [A] + + + +[A] http://malmoborg.se/wp-includes/images/smilies/icon_smile.gif +-- +Feed: Förvaltnings AB Malmöborg +<http://malmoborg.se> +Item: Tack alla trafikanter och fotgängare! +<http://malmoborg.se/2016/07/tack-alla-trafikanter-och-fotgangare/> +Date: 2016-07-19 11:54:24 +0200 +Author: malmoborg +Filed under: Nyheter + +--=-1468922508-176605-12427-9500-21-= +Content-Type: text/html; charset=utf-8 +Content-Transfer-Encoding: 8bit + +<table border="1" width="100%" cellpadding="0" cellspacing="0" borderspacing="0"><tr><td> +<table width="100%" bgcolor="#EDEDED" cellpadding="4" cellspacing="2"> +<tr><td align="right"><b>Feed:</b></td> +<td width="100%"><a href="http://malmoborg.se"> +<b>Förvaltnings AB Malmöborg</b> +</a> +</td></tr><tr><td align="right"><b>Item:</b></td> +<td width="100%"><a href="http://malmoborg.se/2016/07/tack-alla-trafikanter-och-fotgangare/"><b>Tack alla trafikanter och fotgängare!</b> +</a> +</td></tr></table></td></tr></table> + +<p>Malmö 2016-07-09</p> +<p>I skrivande stund är vi i färd med att avetablera vÃ¥r entreprenad pÃ¥ Tigern 3, Regementsgatan 6 i Malmö. Fastigheten har genomgÃ¥tt ett större dräneringsarbete som i sin tur har inneburit vissa trafikbegränsningar pÃ¥ Regementsgatan samt Davidshallsgatan under nÃ¥gra veckors tid. Fastighetsägaren är mycket nöjd med vÃ¥r arbetsinsats och vi kan glatt meddela att bÃ¥da vägfilerna kommer att öppnas inom kort. Nu kommer den vackra fastigheten att klara sig torrskodd under mÃ¥nga Ã¥r framöver <img src="data:image/gif;base64,R0lGODlhDwAPALMOAP/qAEVFRQAAAP/OAP/JAP+0AP6dAP/+k//9E/////// +xzMzM///6//lAAAAAAAAACH5BAEAAA4ALAAAAAAPAA8AAARb0EkZap3YVabO +GRcWcAgCnIMRTEEnCCfwpqt2mHEOagoOnz+CKnADxoKFyiHHBBCSAdOiCVg8 +KwPZa7sVrgJZQWI8FhB2msGgwTXTWGqCXP4WBQr4wjDDstQmEQA7 +" alt=":-)" class="wp-smiley" /> </p> +<p> </p> +<hr width="100%"/> +<table width="100%" cellpadding="0" cellspacing="0"> +<tr><td align="right"><font color="#ababab">Date:</font> </td><td><font color="#ababab">2016-07-19 11:54:24 +0200</font></td></tr> +<tr><td align="right"><font color="#ababab">Author:</font> </td><td><font color="#ababab">malmoborg</font></td></tr> +<tr><td align="right"><font color="#ababab">Filed under:</font> </td><td><font color="#ababab">Nyheter</font></td></tr> +</table> + +--=-1468922508-176605-12427-9500-21-=-- diff --git a/test/corpora/indexing/PATCH-1-2-system_data_types.7-srcfix.txt:2,S b/test/corpora/indexing/PATCH-1-2-system_data_types.7-srcfix.txt:2,S new file mode 100644 index 00000000..1361c6f2 --- /dev/null +++ b/test/corpora/indexing/PATCH-1-2-system_data_types.7-srcfix.txt:2,S @@ -0,0 +1,282 @@ +From mboxrd@z Thu Jan 1 00:00:00 1970 +Return-Path: <SRS0=/pzd=DH=vger.kernel.org=linux-man-owner@kernel.org> +X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on + aws-us-west-2-korg-lkml-1.web.codeaurora.org +X-Spam-Level: +X-Spam-Status: No, score=-8.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, + DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, + HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, + SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no + version=3.4.0 +Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) + by smtp.lore.kernel.org (Postfix) with ESMTP id AFE3FC4727E + for <linux-man@archiver.kernel.org>; Wed, 30 Sep 2020 10:12:21 +0000 (UTC) +Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) + by mail.kernel.org (Postfix) with ESMTP id 4E0D62074A + for <linux-man@archiver.kernel.org>; Wed, 30 Sep 2020 10:12:21 +0000 (UTC) +Authentication-Results: mail.kernel.org; + dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Osm9Pn67" +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1725823AbgI3KMU (ORCPT <rfc822;linux-man@archiver.kernel.org>); + Wed, 30 Sep 2020 06:12:20 -0400 +Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50038 "EHLO + lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1725779AbgI3KMU (ORCPT + <rfc822;linux-man@vger.kernel.org>); Wed, 30 Sep 2020 06:12:20 -0400 +Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) + by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5026DC061755 + for <linux-man@vger.kernel.org>; Wed, 30 Sep 2020 03:12:20 -0700 (PDT) +Received: by mail-pf1-x443.google.com with SMTP id b124so832681pfg.13 + for <linux-man@vger.kernel.org>; Wed, 30 Sep 2020 03:12:20 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=gmail.com; s=20161025; + h=date:from:to:cc:subject:message-id:references:mime-version + :content-disposition:in-reply-to:user-agent; + bh=qR1FJVXOhU6/g+m4SoSco3vMtV+CNvRvNyXS1xuG+T4=; + b=Osm9Pn67G380QiA1ORltntJShSHlKg/KZZfKV8ebvfEXJw9893EO0N6J6GDR+zkmHi + TOQuIe7x9y95Pipm54rWWEW33U3gwoXRHsPc2Kivm6L8Ixb+f0T0rMPKw/FOkL8OGo9t + WmmSvnlErAXHqBq9aRAJJsf2bSlDgdAyYY1Qe6PSq2hKi2rg+sOy1Vaj4RqZ6jTK/DWY + tX28Ql0XS3kKWp0Lc8MNsSP+SXlcdwHQYll5LeReAg1oi++hICgWphuMmo3OH+2B1WtO + hMH7VuUONqbuE1aLoZ6PyyUlCeN1soJd8bKY0cmY0TKCsw0Jvkuh/XzYDVNi6wOSM6Ez + okpA== +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20161025; + h=x-gm-message-state:date:from:to:cc:subject:message-id:references + :mime-version:content-disposition:in-reply-to:user-agent; + bh=qR1FJVXOhU6/g+m4SoSco3vMtV+CNvRvNyXS1xuG+T4=; + b=TJU+duGLhruSES/5sJy4y1wfcltfokDpA58edkSUJyasvsooUo67VNtOB3ZK49iHm5 + C/cjy0ExxTECB0aM6p+B1jcePdWoPUaVBY9bVd/Q5DNhm4KhTO8ON96gB43d2rLWLOiK + /Y1vCu+MwOpY0JQTojbC140s/JYccR/KPapTmbUkRzrpmeoYqw8CbBPV60rQxYCn9GUu + FeCXJY5q9OfaYW1viQZoBL5n1IMMpJDVa61Q8gZ33b3wRCvQv/x1eZCsVlYpjcqf7Umc + /Amx3i27cxvo8pSvvwiTzrlJHJv0Gkytz13i7s+zW+XKzZRyzy3yirtU2DFTGat6FeMn + H8Ig== +X-Gm-Message-State: AOAM530Yon7xNOW6kiuy6bVpbpwbzR/9pldRB49OtZaSAHAZg7Gyf7qE + JXgAH20rZzYlwqOZyeZCeAwtWh09PeI= +X-Google-Smtp-Source: ABdhPJxzyZAVDBtMwQ5+dUqVg37y/LgZByrSaTxvhS6wnx6sJuG8ROItw0CwDAg939XUVADeje/nZQ== +X-Received: by 2002:a63:c547:: with SMTP id g7mr1563654pgd.234.1601460739764; + Wed, 30 Sep 2020 03:12:19 -0700 (PDT) +Received: from localhost.localdomain ([1.129.172.177]) + by smtp.gmail.com with ESMTPSA id k14sm1804437pjd.45.2020.09.30.03.12.17 + (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); + Wed, 30 Sep 2020 03:12:19 -0700 (PDT) +Date: Wed, 30 Sep 2020 20:12:15 +1000 +From: "G. Branden Robinson" <g.branden.robinson@gmail.com> +To: "Michael Kerrisk (man-pages)" <mtk.manpages@gmail.com> +Cc: Jakub Wilk <jwilk@jwilk.net>, linux-man@vger.kernel.org +Subject: Re: [PATCH 1/2] system_data_types.7: srcfix +Message-ID: <20200930101213.2m2pt3jrspvcrxfx@localhost.localdomain> +References: <20200925080330.184303-1-colomar.6.4.3@gmail.com> + <20200927061015.4obt73pdhyh7wecu@localhost.localdomain> + <20200928132959.x4koforqnzohxh5u@jwilk.net> + <9b8303fe-969e-c9f0-e3cd-0590b342d5bf@gmail.com> +MIME-Version: 1.0 +Content-Type: multipart/signed; micalg=pgp-sha256; + protocol="application/pgp-signature"; boundary="jg2hlfugxpumieke" +Content-Disposition: inline +In-Reply-To: <9b8303fe-969e-c9f0-e3cd-0590b342d5bf@gmail.com> +User-Agent: NeoMutt/20180716 +Precedence: bulk +List-ID: <linux-man.vger.kernel.org> +X-Mailing-List: linux-man@vger.kernel.org + + +--jg2hlfugxpumieke +Content-Type: multipart/mixed; boundary="wl6i3r6gpq7ibouc" +Content-Disposition: inline + + +--wl6i3r6gpq7ibouc +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +Content-Transfer-Encoding: quoted-printable + +Hi Jakub and Michael, + +At 2020-09-29T14:13:26+0200, Michael Kerrisk (man-pages) wrote: +> On 9/28/20 3:29 PM, Jakub Wilk wrote: +> > Hi Branden! +> >=20 +> > In groff_man_style(7) you wrote: +> >> Unused macro arguments are more often simply omitted, or good style +> >> suggests that a more appropriate macro be chosen, that earlier +> >> arguments are more important than later ones, or that arguments +> >> have identical significance such that skipping any is superfluous. +> >=20 +> > After 15 minutes of gawking at this sentence, I still don't +> > understand what are you trying to say here. The sentence should be +> > either thoroughly rephrased or removed. +>=20 +> I must say that I too found it hard to parse. I presume, Branden, +> that you mean: +>=20 +> [[ +> Unused macro arguments are more often simply omitted, or good style=20 +> suggests +> EITHER (1)=20 +> that a more appropriate macro be chosen,=20 +> (2) +> that earlier arguments are more important than later ones, or +> (3) +> that arguments have=20 +> identical significance such that skipping any is superfluous. +> ]] + +You got it. But it was too much work. + +> But it takes a few scans to work that out. Perhaps break this into +> smaller pieces, or add some explicit structuring elements to the +> sentence? + +I was trying to be comprehensive with respect to several anti-patterns I +had in mind. However, using the anti-patterns concretely is premature +at that point in the page. So I both expanded and relocated the +material. + +I'm attaching what I've just committed to groff git. + +Further feedback is welcome, of course; revision of documentation is a +process that is never completed, only abandoned. And I haven't given up +yet. :) + +Thank you both for your reviews. + +Regards, +Branden + +--wl6i3r6gpq7ibouc +Content-Type: text/x-diff; charset=us-ascii +Content-Disposition: attachment; filename="excise_standardese.diff" +Content-Transfer-Encoding: quoted-printable + +commit dd2c4cf05a659ae7127e342924668ff0fa0deaa1 +Author: G. Branden Robinson <g.branden.robinson@gmail.com> +Date: Wed Sep 30 19:56:38 2020 +1000 + + groff_man_style(7): Clarify empty macro arguments. + =20 + Rewrite some ersatz standardese I had managed to concoct regarding why + empty macro arguments are usually not needed. Put an expanded + discussion, with anti-patterns and remedies, in section "Notes", with + forward reference from subsection "Macro reference preliminaries". + =20 + Thanks to Jakub Wilk and Michael Kerrisk for the critique. + +diff --git a/tmac/groff_man.7.man.in b/tmac/groff_man.7.man.in +index c62d97ba..b96cbaf4 100644 +--- a/tmac/groff_man.7.man.in ++++ b/tmac/groff_man.7.man.in +@@ -281,23 +281,8 @@ but the + package is designed such that this should seldom be necessary. + _ifstyle()dnl + . +-Unused macro arguments are more often simply omitted, +-.\" antipattern: '.TP ""' (just '.TP' will do) +-or good style suggests that a more appropriate macro be chosen, +-.\" antipattern: '.BI "" italic bold' (use '.IB' instead) +-that earlier arguments are more important than later ones, +-.\" antipattern: '.TH foo 1 "" "foo "1.2.3"' (don't skip the date!) +-.\" antipattern: '.IP "" 4n' (use .TP or .RS/.RE, depending on needs) +-or that arguments have identical significance such that skipping any is +-superfluous. +-.\" antipattern: '.B one two "" three' (pointless) +-.\" Technically, the above has a side-effect of additional space +-.\" between "two" and "three", but there are much more obvious ways of +-.\" getting it if desired. +-.\" .B "one two three" +-.\" .B one "two " three +-.\" .B one two " three" +-.\" .B one two\~ three ++See section \(lqNotes\(rq below for examples of cases where better ++alternatives to empty arguments in macro calls are available. + _endif()dnl + . + Most macro arguments are strings that will be output as text; +@@ -3235,6 +3220,63 @@ Some tips on troubleshooting your man pages follow. + . + . + .TP ++\(bu Do I ever need to use an empty macro argument ("")? ++Probably not. ++. ++When this seems necessary, ++often a shorter or clearer alternative is available. ++. ++.\" antipattern: '.TP ""' (just '.TP' will do) ++.\" antipattern: '.BI "" italic bold' (use '.IB' instead) ++.\" antipattern: '.TH foo 1 "" "foo 1.2.3"' (don't skip the date!) ++.\" antipattern: '.IP "" 4n' (use .TP or .RS/.RE, depending on needs) ++.\" antipattern: '.B one two "" three' (pointless) ++.\" Technically, the above has a side-effect of additional space ++.\" between "two" and "three", but there are much more obvious ways of ++.\" getting it if desired. ++.\" .B "one two three" ++.\" .B one "two " three ++.\" .B one two " three" ++.\" .B one two\~ three ++.TS ++c c ++lfCB lfCB. ++Instead of.\|.\. .\|.\|.do this. ++_ ++\&.TP \(dq\(dq .TP ++\&.BI \(dq\(dq italic-text bold-text .IB italic-text bold-text ++\&.TH foo 1 \(dq\(dq \(dqfoo 1.2.3\(dq .TH foo 1 \ ++\f(CIyyyy\fP-\f(CImm\fP-\f(CIdd\fP \(dqfoo 1.2.3\(dq ++\&.IP \(dq\(dq 4n .TP 4n ++\&.B one two \(dq\(dq three .B one two three ++.TE ++. ++. ++.IP ++In the title heading ++.RB ( .TH ), ++the date of the page's last revision is more important than packaging ++information; ++it should not be omitted. ++. ++Ideally, ++a page maintainer will keep both up to date. ++. ++. ++.IP ++In the last example, ++the empty argument does have a subtly different effect than its ++suggested replacement; ++the empty argument becomes an additional space character\(embut it is a ++regular breaking space, ++so it can be discarded at the end of an output line. ++. ++It is better not to be subtle, ++particularly with space, ++which can be overlooked in source and rendered forms. ++. ++. ++.TP + .RB \(bu " .RS" " doesn't indent relative to my indented paragraph" + The + .B .RS + +--wl6i3r6gpq7ibouc-- + +--jg2hlfugxpumieke +Content-Type: application/pgp-signature; name="signature.asc" + +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEh3PWHWjjDgcrENwa0Z6cfXEmbc4FAl90WfUACgkQ0Z6cfXEm +bc5raQ/9GhXG/5U7McaEEu+aW1IgaTYTMbsMpew5u3tBlj3/IenGzsy8wDO912BD +aHPSedYoc485k1Vh/Kowyx569RhyIXiMtH7uINCEtheMSUNgITNFqXo8mhaqVMlU +3JoV12btQddOIqHnGX6c5V9Z38KXFmVctD6CxjLaWGLp/Bu9tSKwSaHOOmtUYyOv +fYpMzr0amd4z9f+O8PPnToqBhwUitEvis1ZHYU6gIj8VwOjD0gNsWjA9HR3uC3c9 +GK/R5przMANrNejzSgofm0/yAL6a61WhqhYEtzLUYu2NFnsyNJWzITNsNnoxzgQ5 +liKL0Onmw0YWjOo4Z9Zht9Iyd6JhJxW0uRwlpFhE6UlCkFHK8nbv3NbHT2xlx/po +rxY5jDC3Ap3+mdYHY8k5o8vFd4QOXc2bSTuDRZoWtFZQsjnl4Fpkqks1W54Txq4y +o3Vu9aOPx//Jfi8sDc/qD/mFnyUu+AMFWjIj8UxQN4HmbrbXg/DEczRfP68DjOiX +ssy/0Rmm/H1cu7oBMoSss63mpk/NvPTSzzCR+VhU4PHQ7rxSZYS105tzkBVfe37e +hSS00rQVWe2YnI1KkfJHFjzveHiPXf+IxC0Z4PpJuLhl+pIZ/FgxJ5yEkX0XVUIy +aYRzKI3JaJktYl6WvulKSBPzQxIyOgrqVkZW4lv/uTh64pE6E5w= +=oeam +-----END PGP SIGNATURE----- + +--jg2hlfugxpumieke-- + diff --git a/test/corpora/indexing/fake-pdf:2,S b/test/corpora/indexing/fake-pdf:2,S new file mode 100644 index 00000000..60a7a47f --- /dev/null +++ b/test/corpora/indexing/fake-pdf:2,S @@ -0,0 +1,11 @@ +From: David Bremner <david@tethera.net> +To: example@example.com +Subject: attachment content type +Date: Thu, 05 Jan 2023 08:02:36 -0400 +Message-ID: <871qo9p4tf.fsf@tethera.net> +MIME-Version: 1.0 +Content-Type: application/pdf +Content-Disposition: attachment; filename=fake.pdf +Content-Transfer-Encoding: base64 + +dGhpcyBpcyBub3QgcmVhbGx5IFBERgo=
\ No newline at end of file diff --git a/test/corpora/insert/mbox-attachment.eml b/test/corpora/insert/mbox-attachment.eml new file mode 100644 index 00000000..98a8fc91 --- /dev/null +++ b/test/corpora/insert/mbox-attachment.eml @@ -0,0 +1,83 @@ +From david@tethera.net Sat Feb 5 09:19:10 2022 +From: David Bremner <david@tethera.net> +To: David Bremner <david@tethera.net> +Subject: Re: [RFC PATCH v2 12/12] emacs: whitespace cleanup for keybindings +Date: Sat, 05 Feb 2022 10:19:09 -0400 +Message-ID: <87k0e9o0pu.fsf@tethera.net> +MIME-Version: 1.0 +Content-Type: multipart/mixed; boundary="=-=-=" + +--=-=-= +Content-Type: text/plain +Content-Disposition: inline + + +I figured out the race condition in the tests. The previous test was +still running when the failing test started, the joys of using a shared +emacs for running all of the tests in one file. + +The attached diff is split into the the commits that introduce the tests +in question in my working series, but you should be able to just apply +it on top of the posted series if you want. + + +--=-=-= +Content-Type: text/x-diff +Content-Disposition: inline; filename=0001-test-fixups.patch + +From fc88cba7f1f37b9cf3b296eace2422dd0e173502 Mon Sep 17 00:00:00 2001 +From: David Bremner <david@tethera.net> +Date: Thu, 3 Feb 2022 21:05:05 -0400 +Subject: [PATCH] test fixups + +--- + test/T315-emacs-tagging.sh | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/test/T315-emacs-tagging.sh b/test/T315-emacs-tagging.sh +index c9e3e53a..c26413ce 100755 +--- a/test/T315-emacs-tagging.sh ++++ b/test/T315-emacs-tagging.sh +@@ -119,7 +119,8 @@ for mode in search show tree unthreaded; do + (notmuch-$mode \"$os_x_darwin_thread\") + (notmuch-test-wait) + (execute-kbd-macro \"+tag-to-be-undone-$mode\") +- (notmuch-tag-undo))" ++ (notmuch-tag-undo) ++ (notmuch-test-wait))" + count=$(notmuch count "tag:tag-to-be-undone-$mode") + test_expect_equal "$count" "0" + +@@ -128,9 +129,7 @@ for mode in search show tree unthreaded; do + (notmuch-$mode \"$os_x_darwin_thread\") + (notmuch-test-wait) + (execute-kbd-macro \"+one-$mode\") +- (notmuch-test-wait) + (execute-kbd-macro \"+two-$mode\") +- (notmuch-test-wait) + (notmuch-tag-undo) + (notmuch-test-wait) + (execute-kbd-macro \"+three-$mode\"))" +@@ -143,7 +142,6 @@ for mode in search show tree unthreaded; do + (notmuch-$mode \"$os_x_darwin_thread\") + (notmuch-test-wait) + (execute-kbd-macro \"+one-$mode\") +- (notmuch-test-wait) + (execute-kbd-macro \"+two-$mode\") + (notmuch-tag-undo) + (notmuch-test-wait) +@@ -159,7 +157,8 @@ for mode in search show tree unthreaded; do + (notmuch-$mode \"$os_x_darwin_thread\") + (notmuch-test-wait) + (execute-kbd-macro \"+tag-to-be-undone-$mode\") +- (execute-kbd-macro (kbd \"C-x u\")))" ++ (execute-kbd-macro (kbd \"C-x u\")) ++ (notmuch-test-wait))" + count=$(notmuch count "tag:tag-to-be-undone-$mode") + test_expect_equal "$count" "0" + done +-- +2.30.2 + + +--=-=-=-- diff --git a/test/corpora/lkml/cur/1354585346.000260:2, b/test/corpora/lkml/cur/1354585346.000260:2, new file mode 100644 index 00000000..04664e52 --- /dev/null +++ b/test/corpora/lkml/cur/1354585346.000260:2, @@ -0,0 +1,99 @@ +Return-Path: <stefan@datenfreihafen.org> +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 055BC431FBF + for <notmuch@notmuchmail.org>; Sat, 21 Nov 2009 16:11:31 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id Vz+mNzdau2Gh for <notmuch@notmuchmail.org>; + Sat, 21 Nov 2009 16:11:30 -0800 (PST) +Received: from sirius.lasnet.de (sirius.lasnet.de [78.47.116.19]) + by olra.theworths.org (Postfix) with ESMTP id CFD61431FAE + for <notmuch@notmuchmail.org>; Sat, 21 Nov 2009 16:11:29 -0800 (PST) +Received: from p5b034af6.dip.t-dialin.net ([91.3.74.246] helo=excalibur) + by sirius.lasnet.de with esmtpsa + (Cipher TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.63 #1) + id 1NC032-0000td-2v by authid <stefan@sostec.de> with cram_md5; + Sun, 22 Nov 2009 01:11:28 +0100 +Received: from stefan by excalibur with local (Exim 4.69) + (envelope-from <stefan@excalibur.local>) + id 1NC031-0001Dm-H7; Sun, 22 Nov 2009 01:11:23 +0100 +From: Stefan Schmidt <stefan@datenfreihafen.org> +To: notmuch@notmuchmail.org +Date: Sun, 22 Nov 2009 01:11:01 +0100 +Message-Id: <1258848661-4660-2-git-send-email-stefan@datenfreihafen.org> +X-Mailer: git-send-email 1.6.5.3 +In-Reply-To: <1258848661-4660-1-git-send-email-stefan@datenfreihafen.org> +References: <yes> <1258848661-4660-1-git-send-email-stefan@datenfreihafen.org> +Subject: [notmuch] [PATCH 2/2] notmuch-new: Tag mails not as unread when the + seen flag in the maildir is set. +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + <notmuch.notmuchmail.org> +List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe> +List-Archive: <http://notmuchmail.org/pipermail/notmuch> +List-Post: <mailto:notmuch@notmuchmail.org> +List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help> +List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=subscribe> +X-List-Received-Date: Sun, 22 Nov 2009 00:11:31 -0000 + +With the new notmuch_message_get_flags() function we can get the information if +a message was already flagged as seen in maildir by another mailer or tool. This +gives a more realistic picture instead of flagging all as unread. + +Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org> +--- + Makefile | 2 +- + notmuch-new.c | 16 +++++++++++++++- + 2 files changed, 16 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 3fedcf1..dfcfc70 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,6 +1,6 @@ + # Default FLAGS, (can be overridden by user such as "make CFLAGS=-O2") + WARN_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings -Wswitch-enum +-CFLAGS=-O2 ++CFLAGS=-O0 -ggdb3 + + # Additional flags that we will append to whatever the user set. + # These aren't intended for the user to manipulate. +diff --git a/notmuch-new.c b/notmuch-new.c +index bc35b4e..ef4429d 100644 +--- a/notmuch-new.c ++++ b/notmuch-new.c +@@ -41,8 +41,22 @@ handle_sigint (unused (int sig)) + static void + tag_inbox_and_unread (notmuch_message_t *message) + { +- notmuch_message_add_tag (message, "inbox"); ++ char *buf; ++ int i; ++ ++ buf = notmuch_message_get_flags (message); ++ for (i = 0; i < strlen (buf); i++) { ++ /* If the S flag is set the message can be tagged as read */ ++ if (buf[i] == 'S') { ++ notmuch_message_add_tag (message, "read"); ++ goto inbox; ++ } ++ } ++ + notmuch_message_add_tag (message, "unread"); ++ ++inbox: ++ notmuch_message_add_tag (message, "inbox"); + } + + static void +-- +1.6.5.3 + + diff --git a/test/corpora/lkml/cur/1354585346.000261:2, b/test/corpora/lkml/cur/1354585346.000261:2, new file mode 100644 index 00000000..5ca81323 --- /dev/null +++ b/test/corpora/lkml/cur/1354585346.000261:2, @@ -0,0 +1,131 @@ +Return-Path: <stefan@datenfreihafen.org> +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id E4203431FBF + for <notmuch@notmuchmail.org>; Sat, 21 Nov 2009 16:11:31 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id k6PahtnYXl0O for <notmuch@notmuchmail.org>; + Sat, 21 Nov 2009 16:11:30 -0800 (PST) +Received: from sirius.lasnet.de (sirius.lasnet.de [78.47.116.19]) + by olra.theworths.org (Postfix) with ESMTP id 1BAB6431FBC + for <notmuch@notmuchmail.org>; Sat, 21 Nov 2009 16:11:30 -0800 (PST) +Received: from p5b034af6.dip.t-dialin.net ([91.3.74.246] helo=excalibur) + by sirius.lasnet.de with esmtpsa + (Cipher TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.63 #1) + id 1NC02v-0000t5-LF by authid <stefan@sostec.de> with cram_md5; + Sun, 22 Nov 2009 01:11:29 +0100 +Received: from stefan by excalibur with local (Exim 4.69) + (envelope-from <stefan@excalibur.local>) + id 1NC02u-0001Dj-V9; Sun, 22 Nov 2009 01:11:16 +0100 +From: Stefan Schmidt <stefan@datenfreihafen.org> +To: notmuch@notmuchmail.org +Date: Sun, 22 Nov 2009 01:11:00 +0100 +Message-Id: <1258848661-4660-1-git-send-email-stefan@datenfreihafen.org> +X-Mailer: git-send-email 1.6.5.3 +In-Reply-To: <yes> +References: <yes> +Subject: [notmuch] [PATCH 1/2] lib/message: Add function to get maildir + flags. +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + <notmuch.notmuchmail.org> +List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe> +List-Archive: <http://notmuchmail.org/pipermail/notmuch> +List-Post: <mailto:notmuch@notmuchmail.org> +List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help> +List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=subscribe> +X-List-Received-Date: Sun, 22 Nov 2009 00:11:32 -0000 + +With notmuch_message_get_flags() we gain the information if the message was +flagged as read, draft, trashed, etc. Handy for big mail spooles that were used +with another mailer. + +Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org> +--- + lib/message.cc | 26 ++++++++++++++++++++++++++ + lib/notmuch.h | 10 ++++++++++ + 2 files changed, 36 insertions(+), 0 deletions(-) + +diff --git a/lib/message.cc b/lib/message.cc +index 069cedb..9bec61e 100644 +--- a/lib/message.cc ++++ b/lib/message.cc +@@ -35,6 +35,7 @@ struct _notmuch_message { + char *thread_id; + char *in_reply_to; + char *filename; ++ char *flags; + notmuch_message_file_t *message_file; + notmuch_message_list_t *replies; + +@@ -114,6 +115,7 @@ _notmuch_message_create (const void *talloc_owner, + message->thread_id = NULL; + message->in_reply_to = NULL; + message->filename = NULL; ++ message->flags = NULL; + message->message_file = NULL; + + message->replies = _notmuch_message_list_create (message); +@@ -438,6 +440,30 @@ notmuch_message_get_filename (notmuch_message_t *message) + return message->filename; + } + ++const char * ++notmuch_message_get_flags (notmuch_message_t *message) ++{ ++ std::string filename_str, flags; ++ size_t position; ++ const char *db_path; ++ ++ if (message->flags) ++ return message->flags; ++ ++ filename_str = message->doc.get_data (); ++ db_path = notmuch_database_get_path (message->notmuch); ++ ++ if (filename_str[0] != '/') ++ filename_str.insert (0, db_path); ++ ++ /* Flags are everything behind ":" */ ++ position = filename_str.find (":"); ++ flags = filename_str.substr (position + 3); /* We don't want :2, */ ++ message->flags = talloc_strdup (message, flags.c_str ()); ++ ++ return message->flags; ++} ++ + time_t + notmuch_message_get_date (notmuch_message_t *message) + { +diff --git a/lib/notmuch.h b/lib/notmuch.h +index a61cd02..1da5dfd 100644 +--- a/lib/notmuch.h ++++ b/lib/notmuch.h +@@ -694,6 +694,16 @@ notmuch_message_get_replies (notmuch_message_t *message); + const char * + notmuch_message_get_filename (notmuch_message_t *message); + ++/* Get the maildir flags for the email corresponding to 'message'. ++ * ++ * The returned flags will be a string of ascii format flags. ++ * ++ * The returned string belongs to the message so should not be ++ * modified or freed by the caller (nor should it be referenced after ++ * the message is destroyed). */ ++const char * ++notmuch_message_get_flags (notmuch_message_t *message); ++ + /* Get the date of 'message' as a time_t value. + * + * For the original textual representation of the Date header from the +-- +1.6.5.3 + + diff --git a/test/corpora/lkml/cur/1354585346.000265:2, b/test/corpora/lkml/cur/1354585346.000265:2, new file mode 100644 index 00000000..7f3acd48 --- /dev/null +++ b/test/corpora/lkml/cur/1354585346.000265:2, @@ -0,0 +1,85 @@ +Return-Path: <keithp@keithp.com> +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 5656D431FBC + for <notmuch@notmuchmail.org>; Sat, 21 Nov 2009 16:28:35 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id Dam69vzNZiE1 for <notmuch@notmuchmail.org>; + Sat, 21 Nov 2009 16:28:34 -0800 (PST) +Received: from keithp.com (home.keithp.com [63.227.221.253]) + by olra.theworths.org (Postfix) with ESMTP id AA991431FAE + for <notmuch@notmuchmail.org>; Sat, 21 Nov 2009 16:28:34 -0800 (PST) +Received: from localhost (localhost [127.0.0.1]) + by keithp.com (Postfix) with ESMTP id 18FC076012A; + Sat, 21 Nov 2009 16:28:34 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at keithp.com +Received: from keithp.com ([127.0.0.1]) + by localhost (keithp.com [127.0.0.1]) (amavisd-new, port 10024) + with LMTP id tw1iDvWYNGRC; Sat, 21 Nov 2009 16:28:31 -0800 (PST) +Received: by keithp.com (Postfix, from userid 1033) + id 60F3176012B; Sat, 21 Nov 2009 16:28:31 -0800 (PST) +Received: from keithp.com (localhost [127.0.0.1]) + by keithp.com (Postfix) with ESMTP id 5330D76012A; + Sat, 21 Nov 2009 16:28:31 -0800 (PST) +From: Keith Packard <keithp@keithp.com> +To: Stefan Schmidt <stefan@datenfreihafen.org>, notmuch@notmuchmail.org +In-Reply-To: <1258848661-4660-1-git-send-email-stefan@datenfreihafen.org> +References: <yes> <1258848661-4660-1-git-send-email-stefan@datenfreihafen.org> +Date: Sat, 21 Nov 2009 16:28:30 -0800 +Message-ID: <yunvdh3pfm9.fsf@aiko.keithp.com> +MIME-Version: 1.0 +Content-Type: multipart/signed; boundary="=-=-="; + micalg=pgp-sha1; protocol="application/pgp-signature" +Subject: Re: [notmuch] [PATCH 1/2] lib/message: Add function to get maildir + flags. +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + <notmuch.notmuchmail.org> +List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe> +List-Archive: <http://notmuchmail.org/pipermail/notmuch> +List-Post: <mailto:notmuch@notmuchmail.org> +List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help> +List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=subscribe> +X-List-Received-Date: Sun, 22 Nov 2009 00:28:35 -0000 + +--=-=-= +Content-Transfer-Encoding: quoted-printable + +On Sun, 22 Nov 2009 01:11:00 +0100, Stefan Schmidt <stefan@datenfreihafen.o= +rg> wrote: + +> +const char * +> +notmuch_message_get_flags (notmuch_message_t *message) + +This function should interpret the flags that it finds and return a +suitable set of notmuch tags. I'd suggest that 'unread' messages get +both 'unread' and 'inbox' tags, as Maildir doesn't distinguish between +'don't show this to be by default again please' and 'I've read this +message'. It seems best to hide the maildir-specific details inside the +library instead of exposing them. + +Also, we have only the 'unread' tag; we don't have a 'read' tag, which +would simply be the inverse of 'unread'. + +=2D-=20 +keith.packard@intel.com + +--=-=-= +Content-Type: application/pgp-signature + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.10 (GNU/Linux) + +iD8DBQFLCIWuQp8BWwlsTdMRAvcTAKDXHYc6MTuuZFMzHvZFs1omBbr9CACdEY/b +jqyT/QmmgoA/GtIcs/DfLMY= +=LVlh +-----END PGP SIGNATURE----- +--=-=-=-- + diff --git a/test/corpora/lkml/cur/1354585346.000323:2, b/test/corpora/lkml/cur/1354585346.000323:2, new file mode 100644 index 00000000..b7fc28fb --- /dev/null +++ b/test/corpora/lkml/cur/1354585346.000323:2, @@ -0,0 +1,105 @@ +Return-Path: <stefan@datenfreihafen.org> +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 912FF431FBF + for <notmuch@notmuchmail.org>; Sun, 22 Nov 2009 10:33:44 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id 9T+Abdbhab0i for <notmuch@notmuchmail.org>; + Sun, 22 Nov 2009 10:33:43 -0800 (PST) +Received: from sirius.lasnet.de (sirius.lasnet.de [78.47.116.19]) + by olra.theworths.org (Postfix) with ESMTP id 39D1C431FAE + for <notmuch@notmuchmail.org>; Sun, 22 Nov 2009 10:33:43 -0800 (PST) +Received: from p5b0353d3.dip.t-dialin.net ([91.3.83.211] helo=excalibur) + by sirius.lasnet.de with esmtpsa + (Cipher TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.63 #1) + id 1NCHFh-0000dR-It by authid <stefan@sostec.de> with cram_md5; + Sun, 22 Nov 2009 19:33:40 +0100 +Received: from stefan by excalibur with local (Exim 4.69) + (envelope-from <stefan@excalibur.local>) + id 1NCHFi-0002ot-2C; Sun, 22 Nov 2009 19:33:38 +0100 +Date: Sun, 22 Nov 2009 19:33:38 +0100 +From: Stefan Schmidt <stefan@datenfreihafen.org> +To: Keith Packard <keithp@keithp.com> +Message-ID: <20091122183338.GB5735@excalibur.local> +References: <yes> <1258848661-4660-1-git-send-email-stefan@datenfreihafen.org> + <yunvdh3pfm9.fsf@aiko.keithp.com> +MIME-Version: 1.0 +Content-Type: multipart/signed; micalg=pgp-sha1; + protocol="application/pgp-signature"; boundary="C7zPtVaVf+AK4Oqc" +Content-Disposition: inline +In-Reply-To: <yunvdh3pfm9.fsf@aiko.keithp.com> +X-Mailer: Mutt http://www.mutt.org/ +X-KeyID: 0xDDF51665 +X-Website: http://www.datenfreihafen.org/ +User-Agent: Mutt/1.5.20 (2009-06-14) +Cc: notmuch@notmuchmail.org +Subject: Re: [notmuch] [PATCH 1/2] lib/message: Add function to get maildir + flags. +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + <notmuch.notmuchmail.org> +List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe> +List-Archive: <http://notmuchmail.org/pipermail/notmuch> +List-Post: <mailto:notmuch@notmuchmail.org> +List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help> +List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=subscribe> +X-List-Received-Date: Sun, 22 Nov 2009 18:33:44 -0000 + + +--C7zPtVaVf+AK4Oqc +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +Content-Transfer-Encoding: quoted-printable + +Hello. + +On Sat, 2009-11-21 at 16:28, Keith Packard wrote: +> On Sun, 22 Nov 2009 01:11:00 +0100, Stefan Schmidt <stefan@datenfreihafen= +=2Eorg> wrote: +>=20 +> > +const char * +> > +notmuch_message_get_flags (notmuch_message_t *message) +>=20 +> This function should interpret the flags that it finds and return a +> suitable set of notmuch tags. I'd suggest that 'unread' messages get +> both 'unread' and 'inbox' tags, as Maildir doesn't distinguish between +> 'don't show this to be by default again please' and 'I've read this +> message'. It seems best to hide the maildir-specific details inside the +> library instead of exposing them. + +Thanks for the review. On a second thought the interface was really a bit u= +gly. +:) + +I'm just back to my box and going through the outstanding mails shows me th= +at +Michiel Buddingh has a more complete patch on the +convert-maildir-flags-into-tags issue which Carl has tagged for review. Will +wait what comes out of it and if anything is left for me to. :) + +regards +Stefan Schmidt + +--C7zPtVaVf+AK4Oqc +Content-Type: application/pgp-signature; name="signature.asc" +Content-Description: Digital signature +Content-Disposition: inline + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.10 (GNU/Linux) +Comment: http://www.datenfreihafen.org/contact.html + +iEYEARECAAYFAksJhAIACgkQbNSsvd31FmWDDgCgswbE3BE2XeExPzBBJf86efDw +aFwAoMc3vaBmTjB2kG5ORUmk1E/ICBXK +=k8v5 +-----END PGP SIGNATURE----- + +--C7zPtVaVf+AK4Oqc-- + diff --git a/test/corpora/lkml/cur/1354585346.000324:2, b/test/corpora/lkml/cur/1354585346.000324:2, new file mode 100644 index 00000000..a72ef9a7 --- /dev/null +++ b/test/corpora/lkml/cur/1354585346.000324:2, @@ -0,0 +1,71 @@ +Return-Path: <michiel@michielbuddingh.net> +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id B580E431FBC + for <notmuch@notmuchmail.org>; Sun, 22 Nov 2009 10:55:27 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id JHZeV0d6+Q8a for <notmuch@notmuchmail.org>; + Sun, 22 Nov 2009 10:55:26 -0800 (PST) +Received: from aegir.org.uk (aegir.org.uk [87.238.170.13]) + by olra.theworths.org (Postfix) with ESMTP id C6AAC431FAE + for <notmuch@notmuchmail.org>; Sun, 22 Nov 2009 10:55:26 -0800 (PST) +Received: from localhost.localdomain (109-9-ftth.onsnetstudenten.nl + [145.120.9.109]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by aegir.org.uk (Postfix) with ESMTPSA id 48CE72E02A; + Sun, 22 Nov 2009 19:55:26 +0100 (CET) +Date: Sun, 22 Nov 2009 19:55:26 +0100 +From: Michiel Buddingh' <michiel@michielbuddingh.net> +To: notmuch@notmuchmail.org, stefan@datenfreihafen.org, + keithp@keithp.com +Message-ID: <4b09891e.YhJ/aJZOBwneOaFr%michiel@michielbuddingh.net> +References: <yes> <1258848661-4660-1-git-send-email-stefan@datenfreihafen.org> + <yunvdh3pfm9.fsf@aiko.keithp.com> + <20091122183338.GB5735@excalibur.local> +In-Reply-To: <20091122183338.GB5735@excalibur.local> +User-Agent: Heirloom mailx 12.4 7/29/08 +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Content-Transfer-Encoding: 7bit +Subject: Re: [notmuch] [PATCH 1/2] lib/message: Add function to get maildir + flags. +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + <notmuch.notmuchmail.org> +List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe> +List-Archive: <http://notmuchmail.org/pipermail/notmuch> +List-Post: <mailto:notmuch@notmuchmail.org> +List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help> +List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=subscribe> +X-List-Received-Date: Sun, 22 Nov 2009 18:55:27 -0000 + +Stefan Schmidt <stefan@datenfreihafen.org> wrote: +> > This function should interpret the flags that it finds and return a +> > suitable set of notmuch tags. I'd suggest that 'unread' messages get +> > both 'unread' and 'inbox' tags, as Maildir doesn't distinguish between +> > 'don't show this to be by default again please' and 'I've read this +> > message'. It seems best to hide the maildir-specific details inside the +> > library instead of exposing them. +> +> Thanks for the review. On a second thought the interface was really a bit ugly. +> :) +> +> I'm just back to my box and going through the outstanding mails shows me that +> Michiel Buddingh has a more complete patch on the +> convert-maildir-flags-into-tags issue which Carl has tagged for review. Will +> wait what comes out of it and if anything is left for me to. :) + +Apologies. In my haste to cover up my appalling and incorrect first patch, I +neglected to review the archives to see if someone had already done this. Sorry +for stealing your thunder. + +Michiel + diff --git a/test/corpora/lkml/cur/1354585346.000325:2, b/test/corpora/lkml/cur/1354585346.000325:2, new file mode 100644 index 00000000..fc2da165 --- /dev/null +++ b/test/corpora/lkml/cur/1354585346.000325:2, @@ -0,0 +1,86 @@ +Return-Path: <stefan@datenfreihafen.org> +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id B2DE3431FBC + for <notmuch@notmuchmail.org>; Sun, 22 Nov 2009 11:52:54 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id TrLH7uZhkvFU for <notmuch@notmuchmail.org>; + Sun, 22 Nov 2009 11:52:53 -0800 (PST) +Received: from sirius.lasnet.de (sirius.lasnet.de [78.47.116.19]) + by olra.theworths.org (Postfix) with ESMTP id 7024B431FAE + for <notmuch@notmuchmail.org>; Sun, 22 Nov 2009 11:52:53 -0800 (PST) +Received: from p5b0353d3.dip.t-dialin.net ([91.3.83.211] helo=excalibur) + by sirius.lasnet.de with esmtpsa + (Cipher TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.63 #1) + id 1NCIUJ-0002QO-OM by authid <stefan@sostec.de> with cram_md5; + Sun, 22 Nov 2009 20:52:50 +0100 +Received: from stefan by excalibur with local (Exim 4.69) + (envelope-from <stefan@excalibur.local>) + id 1NCIUI-0003ON-Sr; Sun, 22 Nov 2009 20:52:46 +0100 +Date: Sun, 22 Nov 2009 20:52:46 +0100 +From: Stefan Schmidt <stefan@datenfreihafen.org> +To: Michiel Buddingh' <michiel@michielbuddingh.net> +Message-ID: <20091122195246.GC5735@excalibur.local> +References: <yes> <1258848661-4660-1-git-send-email-stefan@datenfreihafen.org> + <yunvdh3pfm9.fsf@aiko.keithp.com> + <20091122183338.GB5735@excalibur.local> + <4b09891e.YhJ/aJZOBwneOaFr%michiel@michielbuddingh.net> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +In-Reply-To: <4b09891e.YhJ/aJZOBwneOaFr%michiel@michielbuddingh.net> +X-Mailer: Mutt http://www.mutt.org/ +X-KeyID: 0xDDF51665 +X-Website: http://www.datenfreihafen.org/ +User-Agent: Mutt/1.5.20 (2009-06-14) +Cc: notmuch@notmuchmail.org +Subject: Re: [notmuch] [PATCH 1/2] lib/message: Add function to get maildir + flags. +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + <notmuch.notmuchmail.org> +List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe> +List-Archive: <http://notmuchmail.org/pipermail/notmuch> +List-Post: <mailto:notmuch@notmuchmail.org> +List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help> +List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=subscribe> +X-List-Received-Date: Sun, 22 Nov 2009 19:52:54 -0000 + +Hello. + +On Sun, 2009-11-22 at 19:55, Michiel Buddingh' wrote: +> Stefan Schmidt <stefan@datenfreihafen.org> wrote: +> > > This function should interpret the flags that it finds and return a +> > > suitable set of notmuch tags. I'd suggest that 'unread' messages get +> > > both 'unread' and 'inbox' tags, as Maildir doesn't distinguish between +> > > 'don't show this to be by default again please' and 'I've read this +> > > message'. It seems best to hide the maildir-specific details inside the +> > > library instead of exposing them. +> > +> > Thanks for the review. On a second thought the interface was really a bit ugly. +> > :) +> > +> > I'm just back to my box and going through the outstanding mails shows me that +> > Michiel Buddingh has a more complete patch on the +> > convert-maildir-flags-into-tags issue which Carl has tagged for review. Will +> > wait what comes out of it and if anything is left for me to. :) +> +> Apologies. In my haste to cover up my appalling and incorrect first patch, I +> neglected to review the archives to see if someone had already done this. Sorry +> for stealing your thunder. + +No need to be sorry. I'm interestecd in having this itch scratched, but don't +care who is doing it. :) + +Just go ahead and get it in after Carl's review. + +regards +Stefan Schmidt + diff --git a/test/corpora/lkml/cur/1354585346.000539:2, b/test/corpora/lkml/cur/1354585346.000539:2, new file mode 100644 index 00000000..daa5673f --- /dev/null +++ b/test/corpora/lkml/cur/1354585346.000539:2, @@ -0,0 +1,81 @@ +Return-Path: <ingmar@exherbo.org> +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id BAA52431FBC + for <notmuch@notmuchmail.org>; Thu, 26 Nov 2009 00:43:44 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id 0U+OLchDCS5T for <notmuch@notmuchmail.org>; + Thu, 26 Nov 2009 00:43:44 -0800 (PST) +Received: from bach.exherbo.org (bach.exherbo.org [78.47.197.147]) + by olra.theworths.org (Postfix) with ESMTP id 05223431FAE + for <notmuch@notmuchmail.org>; Thu, 26 Nov 2009 00:43:43 -0800 (PST) +Received: from [83.101.72.69] (helo=localhost) + by bach.exherbo.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.69) + (envelope-from <ingmar@exherbo.org>) id 1NDZx1-0000VV-3u + for notmuch@notmuchmail.org; Thu, 26 Nov 2009 08:43:43 +0000 +Content-Type: text/plain; charset=utf8 +From: Ingmar Vanhassel <ingmar@exherbo.org> +To: notmuch <notmuch@notmuchmail.org> +In-reply-to: <1259223435-29656-1-git-send-email-stefan@datenfreihafen.org> +References: <yes> <1259223435-29656-1-git-send-email-stefan@datenfreihafen.org> +Date: Thu, 26 Nov 2009 09:43:42 +0100 +Message-Id: <1259224970-sup-5259@cannonball> +User-Agent: Sup/git +Content-Transfer-Encoding: 8bit +Subject: Re: [notmuch] [PATCH] Makefile: Enable backslash escapes for echo. +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + <notmuch.notmuchmail.org> +List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe> +List-Archive: <http://notmuchmail.org/pipermail/notmuch> +List-Post: <mailto:notmuch@notmuchmail.org> +List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help> +List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=subscribe> +X-List-Received-Date: Thu, 26 Nov 2009 08:43:44 -0000 + +Excerpts from Stefan Schmidt's message of Thu Nov 26 09:17:15 +0100 2009: +> This fixes a visual glitch during a silent compile. +> Before: +> Use "make V=1" to see the verbose compile lines.\n CC debugger.o +> CC gmime-filter-reply.o +> +> After: +> Use "make V=1" to see the verbose compile lines. +> CC debugger.o +> CC gmime-filter-reply.o +> +> Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org> + +Looks right, works here with bash, dash & zsh, so: + +Reviewed-by: Ingmar Vanhassel <ingmar@exherbo.org> + +Thanks! + +> --- +> Makefile | 2 +- +> 1 files changed, 1 insertions(+), 1 deletions(-) +> +> diff --git a/Makefile b/Makefile +> index 2cd1b1b..2d19a6e 100644 +> --- a/Makefile +> +++ b/Makefile +> @@ -41,7 +41,7 @@ include Makefile.config +> # user how to enable verbose compiles. +> ifeq ($(V),) +> quiet_DOC := "Use \"$(MAKE) V=1\" to see the verbose compile lines.\n" +> -quiet = @echo $(quiet_DOC)$(eval quiet_DOC:=)" $1 $@"; $($1) +> +quiet = @echo -e $(quiet_DOC)$(eval quiet_DOC:=)" $1 $@"; $($1) +> endif +> # The user has explicitly enabled quiet compilation. +> ifeq ($(V),0) +-- +Exherbo KDE, X.org maintainer + diff --git a/test/corpora/lkml/cur/1354585346.000541:2, b/test/corpora/lkml/cur/1354585346.000541:2, new file mode 100644 index 00000000..3e70055f --- /dev/null +++ b/test/corpora/lkml/cur/1354585346.000541:2, @@ -0,0 +1,64 @@ +Return-Path: <kha@treskal.com> +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 54307431FBC + for <notmuch@notmuchmail.org>; Thu, 26 Nov 2009 03:41:18 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id TBdvxm5kBScu for <notmuch@notmuchmail.org>; + Thu, 26 Nov 2009 03:41:13 -0800 (PST) +Received: from mail1.space2u.com (mail1.space2u.com [62.20.1.135]) + by olra.theworths.org (Postfix) with ESMTP id 80538431FAE + for <notmuch@notmuchmail.org>; Thu, 26 Nov 2009 03:41:13 -0800 (PST) +Received: from mail-bw0-f224.google.com (mail-bw0-f224.google.com + [209.85.218.224]) (authenticated bits=0) + by mail1.space2u.com (8.14.3/8.14.3) with ESMTP id nAQBf0Ar018995 + (version=TLSv1/SSLv3 cipher=DES-CBC3-SHA bits=168 verify=NOT) + for <notmuch@notmuchmail.org>; Thu, 26 Nov 2009 12:41:01 +0100 +Received: by bwz24 with SMTP id 24so480173bwz.30 + for <notmuch@notmuchmail.org>; Thu, 26 Nov 2009 03:41:11 -0800 (PST) +MIME-Version: 1.0 +Received: by 10.204.153.3 with SMTP id i3mr2263267bkw.26.1259235670122; Thu, + 26 Nov 2009 03:41:10 -0800 (PST) +In-Reply-To: <20091126110505.GI25119@ryngle.com> +References: <1259223435-29656-1-git-send-email-stefan@datenfreihafen.org> + <20091126110505.GI25119@ryngle.com> +Date: Thu, 26 Nov 2009 12:41:10 +0100 +Message-ID: <b8197bcb0911260341o480edc2bof8a30f0b724dd96@mail.gmail.com> +From: Karl Wiberg <kha@treskal.com> +To: Jan Janak <jan@ryngle.com> +Content-Type: text/plain; charset=UTF-8 +Cc: notmuch@notmuchmail.org +Subject: Re: [notmuch] [PATCH] Makefile: Enable backslash escapes for echo. +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + <notmuch.notmuchmail.org> +List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe> +List-Archive: <http://notmuchmail.org/pipermail/notmuch> +List-Post: <mailto:notmuch@notmuchmail.org> +List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help> +List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=subscribe> +X-List-Received-Date: Thu, 26 Nov 2009 11:41:18 -0000 + +On Thu, Nov 26, 2009 at 12:05 PM, Jan Janak <jan@ryngle.com> wrote: + +> I sent exactly the same patch a couple of days ago and it was +> rejected because it does not work everywhere, see: +> +> http://notmuchmail.org/pipermail/notmuch/2009/000370.html + +And as I said in that thread, I believe you should use printf instead. +(http://www.in-ulm.de/~mascheck/various/echo+printf/ seems like a good +reference in this matter.) + +-- +Karl Wiberg, kha@treskal.com + subrabbit.wordpress.com + www.treskal.com/kalle + diff --git a/test/corpora/lkml/cur/1382298587.001724:2, b/test/corpora/lkml/cur/1382298587.001724:2, new file mode 100644 index 00000000..69c794c7 --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.001724:2, @@ -0,0 +1,104 @@ +From: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +Subject: [RFC][PATCH 10/10] cifs: add mount option to enable local caching +Date: Tue, 22 Jun 2010 20:55:09 +0530 +Lines: 66 +Message-ID: <1277220309-3757-1-git-send-email-sjayaraman@suse.de> +References: <yes> +Cc: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +To: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Tue Jun 22 17:25:29 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1OR5Ls-0004PS-BM + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Tue, 22 Jun 2010 17:25:28 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1755015Ab0FVPZ1 (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Tue, 22 Jun 2010 11:25:27 -0400 +Received: from victor.provo.novell.com ([137.65.250.26]:48639 "EHLO + victor.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1754070Ab0FVPZ1 (ORCPT + <rfc822;groupwise-SJayaraman-Et1tbQHTxzrQT0dZR+AlfA@public.gmane.org:0:0>); + Tue, 22 Jun 2010 11:25:27 -0400 +X-Greylist: delayed 316 seconds by postgrey-1.27 at vger.kernel.org; Tue, 22 Jun 2010 11:25:26 EDT +Received: from localhost (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) + by victor.provo.novell.com with ESMTP; Tue, 22 Jun 2010 09:25:11 -0600 +X-Mailer: git-send-email 1.6.4.2 +In-Reply-To: <yes> +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1001750> + +Add a mount option 'fsc' to enable local caching on CIFS. + +As the cifs-utils (userspace) changes are not done yet, this patch enables +'fsc' by default to assist testing. + +Signed-off-by: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +--- + fs/cifs/cifs_fs_sb.h | 1 + + fs/cifs/connect.c | 8 ++++++++ + 2 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/fs/cifs/cifs_fs_sb.h b/fs/cifs/cifs_fs_sb.h +index 246a167..9e77145 100644 +--- a/fs/cifs/cifs_fs_sb.h ++++ b/fs/cifs/cifs_fs_sb.h +@@ -35,6 +35,7 @@ + #define CIFS_MOUNT_DYNPERM 0x1000 /* allow in-memory only mode setting */ + #define CIFS_MOUNT_NOPOSIXBRL 0x2000 /* mandatory not posix byte range lock */ + #define CIFS_MOUNT_NOSSYNC 0x4000 /* don't do slow SMBflush on every sync*/ ++#define CIFS_MOUNT_FSCACHE 0x8000 /* local caching enabled */ + + struct cifs_sb_info { + struct cifsTconInfo *tcon; /* primary mount */ +diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c +index 4844dbd..6c6ff3c 100644 +--- a/fs/cifs/connect.c ++++ b/fs/cifs/connect.c +@@ -98,6 +98,7 @@ struct smb_vol { + bool noblocksnd:1; + bool noautotune:1; + bool nostrictsync:1; /* do not force expensive SMBflush on every sync */ ++ bool fsc:1; /* enable fscache */ + unsigned int rsize; + unsigned int wsize; + bool sockopt_tcp_nodelay:1; +@@ -843,6 +844,9 @@ cifs_parse_mount_options(char *options, const char *devname, + /* default to using server inode numbers where available */ + vol->server_ino = 1; + ++ /* XXX: default to fsc for testing until mount.cifs pieces are done */ ++ vol->fsc = 1; ++ + if (!options) + return 1; + +@@ -1332,6 +1336,8 @@ cifs_parse_mount_options(char *options, const char *devname, + printk(KERN_WARNING "CIFS: Mount option noac not " + "supported. Instead set " + "/proc/fs/cifs/LookupCacheEnabled to 0\n"); ++ } else if (strnicmp(data, "fsc", 3) == 0) { ++ vol->fsc = true; + } else + printk(KERN_WARNING "CIFS: Unknown mount option %s\n", + data); +@@ -2405,6 +2411,8 @@ static void setup_cifs_sb(struct smb_vol *pvolume_info, + cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_OVERR_GID; + if (pvolume_info->dynperm) + cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_DYNPERM; ++ if (pvolume_info->fsc) ++ cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_FSCACHE; + if (pvolume_info->direct_io) { + cFYI(1, "mounting share using direct i/o"); + cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_DIRECT_IO; +-- +1.6.4.2 + + + diff --git a/test/corpora/lkml/cur/1382298587.001730:2, b/test/corpora/lkml/cur/1382298587.001730:2, new file mode 100644 index 00000000..840be2ee --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.001730:2, @@ -0,0 +1,103 @@ +From: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +Subject: [RFC][PATCH 00/10] cifs: local caching support using FS-Cache +Date: Tue, 22 Jun 2010 20:50:05 +0530 +Lines: 66 +Message-ID: <1277220005-3322-1-git-send-email-sjayaraman@suse.de> +References: <yes> +Cc: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +To: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Tue Jun 22 17:40:38 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1OR5aY-00055O-BD + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Tue, 22 Jun 2010 17:40:38 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1751889Ab0FVPkf (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Tue, 22 Jun 2010 11:40:35 -0400 +Received: from victor.provo.novell.com ([137.65.250.26]:50040 "EHLO + victor.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1751554Ab0FVPkf (ORCPT + <rfc822;groupwise-SJayaraman-Et1tbQHTxzrQT0dZR+AlfA@public.gmane.org:0:0>); + Tue, 22 Jun 2010 11:40:35 -0400 +Received: from localhost (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) + by victor.provo.novell.com with ESMTP; Tue, 22 Jun 2010 09:20:07 -0600 +X-Mailer: git-send-email 1.6.4.2 +In-Reply-To: <yes> +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1001756> + +This patchset is a first stab at adding persistent, local caching facility for +CIFS using the FS-Cache interface. + +The index hierarchy which is mainly used to locate a file object or discard +a certain subset of the files cached, currently has three levels: + - Server + - Share + - File + +The server index object is keyed by hostname of the server. The superblock +index object is keyed by the sharename and the inode object is keyed by the +UniqueId. The cache coherency is ensured by checking the 'LastWriteTime' and +size of file. + +To use this, apply this patchset in order, mount the share with rsize=4096 and +try copying a huge file (say few hundred MBs) from mount point to local +filesystem. During the first time, the cache will be initialized. When you copy +the second time, it should read from the local cache. + +To reduce the impact of page cache and see the local caching in action +readily, try doing a sync and drop the caches by doing: + sync; echo 3 > /proc/sys/vm/drop_caches + +Known issues +------------- + - the cache coherency check may not be reliable always as some + CIFS servers are known not to update mtime until the filehandle is + closed. + - not all the Servers under all circumstances provide a unique + 'UniqueId'. + +Todo's +------- + - improvements to avoid potential key collisions + - address the above known issues + +This set is lightly tested and all the bugs seen during my testing have been +fixed. However, this can be considered as an RFC for now. + +Any Comments or Suggestions are welcome. + +Suresh Jayaraman (10) + cifs: add kernel config option for CIFS Client caching support + cifs: guard cifsglob.h against multiple inclusion + cifs: register CIFS for caching + cifs: define server-level cache index objects and register them with FS-Cache + cifs: define superblock-level cache index objects and register them + cifs: define inode-level cache object and register them + cifs: FS-Cache page management + cifs: store pages into local cache + cifs: read pages from FS-Cache + cifs: add mount option to enable local caching + + Kconfig | 9 ++ + Makefile | 2 + cache.c | 251 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + cifs_fs_sb.h | 1 + cifsfs.c | 15 +++ + cifsglob.h | 14 +++ + connect.c | 16 +++ + file.c | 51 +++++++++++ + fscache.c | 244 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + fscache.h | 135 +++++++++++++++++++++++++++++++ + inode.c | 4 + 11 files changed, 742 insertions(+) + + + diff --git a/test/corpora/lkml/cur/1382298587.001731:2, b/test/corpora/lkml/cur/1382298587.001731:2, new file mode 100644 index 00000000..d8b3168c --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.001731:2, @@ -0,0 +1,67 @@ +From: Suresh Jayaraman <sjayaraman@suse.de> +Subject: [RFC][PATCH 01/10] cifs: add kernel config option for CIFS Client caching support +Date: Tue, 22 Jun 2010 20:52:38 +0530 +Lines: 30 +Message-ID: <1277220158-3405-1-git-send-email-sjayaraman@suse.de> +References: <yes> +Cc: linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, + linux-kernel@vger.kernel.org, David Howells <dhowells@redhat.com> +To: Steve French <smfrench@gmail.com> +X-From: linux-kernel-owner@vger.kernel.org Tue Jun 22 17:43:27 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1OR5dG-0007m9-Ij + for glk-linux-kernel-3@lo.gmane.org; Tue, 22 Jun 2010 17:43:26 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1751536Ab0FVPnS (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Tue, 22 Jun 2010 11:43:18 -0400 +Received: from victor.provo.novell.com ([137.65.250.26]:51303 "EHLO + victor.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1750800Ab0FVPnR (ORCPT + <rfc822;groupwise-SJayaraman@novell.com:0:0>); + Tue, 22 Jun 2010 11:43:17 -0400 +Received: from localhost (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) + by victor.provo.novell.com with ESMTP; Tue, 22 Jun 2010 09:22:40 -0600 +X-Mailer: git-send-email 1.6.4.2 +In-Reply-To: <yes> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1001757> + +Add a kernel config option to enable local caching for CIFS. + +Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de> +--- + fs/cifs/Kconfig | 9 +++++++++ + 1 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/fs/cifs/Kconfig b/fs/cifs/Kconfig +index 80f3525..5739fd7 100644 +--- a/fs/cifs/Kconfig ++++ b/fs/cifs/Kconfig +@@ -131,6 +131,15 @@ config CIFS_DFS_UPCALL + IP addresses) which is needed for implicit mounts of DFS junction + points. If unsure, say N. + ++config CIFS_FSCACHE ++ bool "Provide CIFS client caching support (EXPERIMENTAL)" ++ depends on EXPERIMENTAL ++ depends on CIFS=m && FSCACHE || CIFS=y && FSCACHE=y ++ help ++ Makes CIFS FS-Cache capable. Say Y here if you want your CIFS data ++ to be cached locally on disk through the general filesystem cache ++ manager. If unsure, say N. ++ + config CIFS_EXPERIMENTAL + bool "CIFS Experimental Features (EXPERIMENTAL)" + depends on CIFS && EXPERIMENTAL +-- +1.6.4.2 + + + diff --git a/test/corpora/lkml/cur/1382298587.001732:2, b/test/corpora/lkml/cur/1382298587.001732:2, new file mode 100644 index 00000000..8850953a --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.001732:2, @@ -0,0 +1,73 @@ +From: Suresh Jayaraman <sjayaraman@suse.de> +Subject: [RFC][PATCH 02/10] cifs: guard cifsglob.h against multiple inclusion +Date: Tue, 22 Jun 2010 20:52:50 +0530 +Lines: 36 +Message-ID: <1277220170-3442-1-git-send-email-sjayaraman@suse.de> +References: <yes> +Cc: linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, + linux-kernel@vger.kernel.org, David Howells <dhowells@redhat.com> +To: Steve French <smfrench@gmail.com> +X-From: linux-fsdevel-owner@vger.kernel.org Tue Jun 22 17:43:39 2010 +Return-path: <linux-fsdevel-owner@vger.kernel.org> +Envelope-to: lnx-linux-fsdevel@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-fsdevel-owner@vger.kernel.org>) + id 1OR5dT-0007sB-18 + for lnx-linux-fsdevel@lo.gmane.org; Tue, 22 Jun 2010 17:43:39 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1752441Ab0FVPn3 (ORCPT <rfc822;lnx-linux-fsdevel@m.gmane.org>); + Tue, 22 Jun 2010 11:43:29 -0400 +Received: from victor.provo.novell.com ([137.65.250.26]:41538 "EHLO + victor.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1751889Ab0FVPn2 (ORCPT + <rfc822;groupwise-SJayaraman@novell.com:0:0>); + Tue, 22 Jun 2010 11:43:28 -0400 +Received: from localhost (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) + by victor.provo.novell.com with ESMTP; Tue, 22 Jun 2010 09:22:52 -0600 +X-Mailer: git-send-email 1.6.4.2 +In-Reply-To: <yes> +Sender: linux-fsdevel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-fsdevel.vger.kernel.org> +X-Mailing-List: linux-fsdevel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1001758> + +Add conditional compile macros to guard the header file against multiple +inclusion. + +Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de> +--- + fs/cifs/cifsglob.h | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h +index a88479c..6b2c39d 100644 +--- a/fs/cifs/cifsglob.h ++++ b/fs/cifs/cifsglob.h +@@ -16,6 +16,9 @@ + * the GNU Lesser General Public License for more details. + * + */ ++#ifndef _CIFS_GLOB_H ++#define _CIFS_GLOB_H ++ + #include <linux/in.h> + #include <linux/in6.h> + #include <linux/slab.h> +@@ -733,3 +736,5 @@ GLOBAL_EXTERN unsigned int cifs_min_small; /* min size of small buf pool */ + GLOBAL_EXTERN unsigned int cifs_max_pending; /* MAX requests at once to server*/ + + extern const struct slow_work_ops cifs_oplock_break_ops; ++ ++#endif /* _CIFS_GLOB_H */ +-- +1.6.4.2 + +-- +To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + + diff --git a/test/corpora/lkml/cur/1382298587.001733:2, b/test/corpora/lkml/cur/1382298587.001733:2, new file mode 100644 index 00000000..d782f90e --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.001733:2, @@ -0,0 +1,211 @@ +From: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +Subject: [RFC][PATCH 03/10] cifs: register CIFS for caching +Date: Tue, 22 Jun 2010 20:53:09 +0530 +Lines: 174 +Message-ID: <1277220189-3485-1-git-send-email-sjayaraman@suse.de> +References: <yes> +Cc: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +To: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Tue Jun 22 17:43:52 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1OR5de-0007xC-Ov + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Tue, 22 Jun 2010 17:43:51 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1753125Ab0FVPnt (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Tue, 22 Jun 2010 11:43:49 -0400 +Received: from victor.provo.novell.com ([137.65.250.26]:55866 "EHLO + victor.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1751261Ab0FVPnt (ORCPT + <rfc822;groupwise-SJayaraman-Et1tbQHTxzrQT0dZR+AlfA@public.gmane.org:0:0>); + Tue, 22 Jun 2010 11:43:49 -0400 +Received: from localhost (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) + by victor.provo.novell.com with ESMTP; Tue, 22 Jun 2010 09:23:11 -0600 +X-Mailer: git-send-email 1.6.4.2 +In-Reply-To: <yes> +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1001759> + +Define CIFS for FS-Cache and register for caching. Upon registration the +top-level index object cookie will be stuck to the netfs definition by +FS-Cache. + +Signed-off-by: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +--- + fs/cifs/Makefile | 2 ++ + fs/cifs/cache.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + fs/cifs/cifsfs.c | 8 ++++++++ + fs/cifs/fscache.h | 40 ++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 103 insertions(+), 0 deletions(-) + create mode 100644 fs/cifs/cache.c + create mode 100644 fs/cifs/fscache.h + +diff --git a/fs/cifs/Makefile b/fs/cifs/Makefile +index 9948c00..e2de709 100644 +--- a/fs/cifs/Makefile ++++ b/fs/cifs/Makefile +@@ -11,3 +11,5 @@ cifs-y := cifsfs.o cifssmb.o cifs_debug.o connect.o dir.o file.o inode.o \ + cifs-$(CONFIG_CIFS_UPCALL) += cifs_spnego.o + + cifs-$(CONFIG_CIFS_DFS_UPCALL) += dns_resolve.o cifs_dfs_ref.o ++ ++cifs-$(CONFIG_CIFS_FSCACHE) += cache.o +diff --git a/fs/cifs/cache.c b/fs/cifs/cache.c +new file mode 100644 +index 0000000..1080b96 +--- /dev/null ++++ b/fs/cifs/cache.c +@@ -0,0 +1,53 @@ ++/* ++ * fs/cifs/cache.c - CIFS filesystem cache index structure definitions ++ * ++ * Copyright (c) 2010 Novell, Inc. ++ * Authors(s): Suresh Jayaraman (sjayaraman-l3A5Bk7waGM@public.gmane.org> ++ * ++ * This library is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU Lesser General Public License as published ++ * by the Free Software Foundation; either version 2.1 of the License, or ++ * (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public License ++ * along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++#include <linux/init.h> ++#include <linux/kernel.h> ++#include <linux/sched.h> ++#include <linux/mm.h> ++ ++#include "fscache.h" ++#include "cifsglob.h" ++#include "cifs_debug.h" ++ ++/* ++ * CIFS filesystem definition for FS-Cache ++ */ ++struct fscache_netfs cifs_fscache_netfs = { ++ .name = "cifs", ++ .version = 0, ++}; ++ ++/* ++ * Register CIFS for caching with FS-Cache ++ */ ++int cifs_fscache_register(void) ++{ ++ return fscache_register_netfs(&cifs_fscache_netfs); ++} ++ ++/* ++ * Unregister CIFS for caching ++ */ ++void cifs_fscache_unregister(void) ++{ ++ fscache_unregister_netfs(&cifs_fscache_netfs); ++} ++ +diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c +index 484e52b..c2a7aa9 100644 +--- a/fs/cifs/cifsfs.c ++++ b/fs/cifs/cifsfs.c +@@ -47,6 +47,7 @@ + #include <linux/key-type.h> + #include "dns_resolve.h" + #include "cifs_spnego.h" ++#include "fscache.h" + #define CIFS_MAGIC_NUMBER 0xFF534D42 /* the first four bytes of SMB PDUs */ + + int cifsFYI = 0; +@@ -902,6 +903,10 @@ init_cifs(void) + cFYI(1, "cifs_max_pending set to max of 256"); + } + ++ rc = cifs_fscache_register(); ++ if (rc) ++ goto out; ++ + rc = cifs_init_inodecache(); + if (rc) + goto out_clean_proc; +@@ -949,8 +954,10 @@ init_cifs(void) + cifs_destroy_mids(); + out_destroy_inodecache: + cifs_destroy_inodecache(); ++ cifs_fscache_unregister(); + out_clean_proc: + cifs_proc_clean(); ++ out: + return rc; + } + +@@ -959,6 +966,7 @@ exit_cifs(void) + { + cFYI(DBG2, "exit_cifs"); + cifs_proc_clean(); ++ cifs_fscache_unregister(); + #ifdef CONFIG_CIFS_DFS_UPCALL + cifs_dfs_release_automount_timer(); + unregister_key_type(&key_type_dns_resolver); +diff --git a/fs/cifs/fscache.h b/fs/cifs/fscache.h +new file mode 100644 +index 0000000..cec9e2b +--- /dev/null ++++ b/fs/cifs/fscache.h +@@ -0,0 +1,40 @@ ++/* ++ * fs/cifs/fscache.h - CIFS filesystem cache interface definitions ++ * ++ * Copyright (c) 2010 Novell, Inc. ++ * Authors(s): Suresh Jayaraman (sjayaraman-l3A5Bk7waGM@public.gmane.org> ++ * ++ * This library is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU Lesser General Public License as published ++ * by the Free Software Foundation; either version 2.1 of the License, or ++ * (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public License ++ * along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++#ifndef _CIFS_FSCACHE_H ++#define _CIFS_FSCACHE_H ++ ++#include <linux/fscache.h> ++#include "cifsglob.h" ++ ++#ifdef CONFIG_CIFS_FSCACHE ++ ++extern struct fscache_netfs cifs_fscache_netfs; ++ ++extern int cifs_fscache_register(void); ++extern void cifs_fscache_unregister(void); ++ ++#else /* CONFIG_CIFS_FSCACHE */ ++static inline int cifs_fscache_register(void) { return 0; } ++static inline void cifs_fscache_unregister(void) {} ++ ++#endif /* CONFIG_CIFS_FSCACHE */ ++ ++#endif /* _CIFS_FSCACHE_H */ +-- +1.6.4.2 + + + diff --git a/test/corpora/lkml/cur/1382298587.001734:2, b/test/corpora/lkml/cur/1382298587.001734:2, new file mode 100644 index 00000000..4b64bc3b --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.001734:2, @@ -0,0 +1,223 @@ +From: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +Subject: [RFC][PATCH 04/10] cifs: define server-level cache index objects and register them with FS-Cache +Date: Tue, 22 Jun 2010 20:53:18 +0530 +Lines: 186 +Message-ID: <1277220198-3522-1-git-send-email-sjayaraman@suse.de> +References: <yes> +Cc: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +To: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Tue Jun 22 17:44:26 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1OR5eD-0008G7-KP + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Tue, 22 Jun 2010 17:44:26 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1753942Ab0FVPoC (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Tue, 22 Jun 2010 11:44:02 -0400 +Received: from victor.provo.novell.com ([137.65.250.26]:58783 "EHLO + victor.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1751265Ab0FVPoA (ORCPT + <rfc822;groupwise-SJayaraman-Et1tbQHTxzrQT0dZR+AlfA@public.gmane.org:0:0>); + Tue, 22 Jun 2010 11:44:00 -0400 +Received: from localhost (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) + by victor.provo.novell.com with ESMTP; Tue, 22 Jun 2010 09:23:20 -0600 +X-Mailer: git-send-email 1.6.4.2 +In-Reply-To: <yes> +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1001760> + +Define server-level cache index objects (as managed by TCP_ServerInfo structs). +Each server object is created in the CIFS top-level index object and is itself +an index into which superblock-level objects are inserted. + +Currently, the server objects are keyed by hostname. + +Signed-off-by: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +--- + fs/cifs/Makefile | 2 +- + fs/cifs/cache.c | 25 +++++++++++++++++++++++++ + fs/cifs/cifsglob.h | 3 +++ + fs/cifs/connect.c | 4 ++++ + fs/cifs/fscache.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ + fs/cifs/fscache.h | 12 ++++++++++++ + 6 files changed, 92 insertions(+), 1 deletion(-) + create mode 100644 fs/cifs/fscache.c + +Index: cifs-2.6/fs/cifs/Makefile +=================================================================== +--- cifs-2.6.orig/fs/cifs/Makefile ++++ cifs-2.6/fs/cifs/Makefile +@@ -12,4 +12,4 @@ cifs-$(CONFIG_CIFS_UPCALL) += cifs_spneg + + cifs-$(CONFIG_CIFS_DFS_UPCALL) += dns_resolve.o cifs_dfs_ref.o + +-cifs-$(CONFIG_CIFS_FSCACHE) += cache.o ++cifs-$(CONFIG_CIFS_FSCACHE) += fscache.o cache.o +Index: cifs-2.6/fs/cifs/cache.c +=================================================================== +--- cifs-2.6.orig/fs/cifs/cache.c ++++ cifs-2.6/fs/cifs/cache.c +@@ -51,3 +51,28 @@ void cifs_fscache_unregister(void) + fscache_unregister_netfs(&cifs_fscache_netfs); + } + ++/* ++ * Server object currently keyed by hostname ++ */ ++static uint16_t cifs_server_get_key(const void *cookie_netfs_data, ++ void *buffer, uint16_t maxbuf) ++{ ++ const struct TCP_Server_Info *server = cookie_netfs_data; ++ uint16_t len = strnlen(server->hostname, sizeof(server->hostname)); ++ ++ if (len > maxbuf) ++ return 0; ++ ++ memcpy(buffer, server->hostname, len); ++ ++ return len; ++} ++ ++/* ++ * Server object for FS-Cache ++ */ ++const struct fscache_cookie_def cifs_fscache_server_index_def = { ++ .name = "CIFS.server", ++ .type = FSCACHE_COOKIE_TYPE_INDEX, ++ .get_key = cifs_server_get_key, ++}; +Index: cifs-2.6/fs/cifs/cifsglob.h +=================================================================== +--- cifs-2.6.orig/fs/cifs/cifsglob.h ++++ cifs-2.6/fs/cifs/cifsglob.h +@@ -193,6 +193,9 @@ struct TCP_Server_Info { + bool sec_mskerberos; /* supports legacy MS Kerberos */ + bool sec_kerberosu2u; /* supports U2U Kerberos */ + bool sec_ntlmssp; /* supports NTLMSSP */ ++#ifdef CONFIG_CIFS_FSCACHE ++ struct fscache_cookie *fscache; /* client index cache cookie */ ++#endif + }; + + /* +Index: cifs-2.6/fs/cifs/connect.c +=================================================================== +--- cifs-2.6.orig/fs/cifs/connect.c ++++ cifs-2.6/fs/cifs/connect.c +@@ -48,6 +48,7 @@ + #include "nterr.h" + #include "rfc1002pdu.h" + #include "cn_cifs.h" ++#include "fscache.h" + + #define CIFS_PORT 445 + #define RFC1001_PORT 139 +@@ -1453,6 +1454,8 @@ cifs_put_tcp_session(struct TCP_Server_I + return; + } + ++ cifs_fscache_release_client_cookie(server); ++ + list_del_init(&server->tcp_ses_list); + write_unlock(&cifs_tcp_ses_lock); + +@@ -1572,6 +1575,7 @@ cifs_get_tcp_session(struct smb_vol *vol + goto out_err; + } + ++ cifs_fscache_get_client_cookie(tcp_ses); + /* thread spawned, put it on the list */ + write_lock(&cifs_tcp_ses_lock); + list_add(&tcp_ses->tcp_ses_list, &cifs_tcp_ses_list); +Index: cifs-2.6/fs/cifs/fscache.c +=================================================================== +--- /dev/null ++++ cifs-2.6/fs/cifs/fscache.c +@@ -0,0 +1,47 @@ ++/* ++ * fs/cifs/fscache.c - CIFS filesystem cache interface ++ * ++ * Copyright (c) 2010 Novell, Inc. ++ * Authors(s): Suresh Jayaraman (sjayaraman-l3A5Bk7waGM@public.gmane.org> ++ * ++ * This library is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU Lesser General Public License as published ++ * by the Free Software Foundation; either version 2.1 of the License, or ++ * (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public License ++ * along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++#include <linux/init.h> ++#include <linux/kernel.h> ++#include <linux/sched.h> ++#include <linux/mm.h> ++#include <linux/in6.h> ++ ++#include "fscache.h" ++#include "cifsglob.h" ++#include "cifs_debug.h" ++ ++void cifs_fscache_get_client_cookie(struct TCP_Server_Info *server) ++{ ++ server->fscache = ++ fscache_acquire_cookie(cifs_fscache_netfs.primary_index, ++ &cifs_fscache_server_index_def, server); ++ cFYI(1, "CIFS: get client cookie (0x%p/0x%p)\n", ++ server, server->fscache); ++} ++ ++void cifs_fscache_release_client_cookie(struct TCP_Server_Info *server) ++{ ++ cFYI(1, "CIFS: release client cookie (0x%p/0x%p)\n", ++ server, server->fscache); ++ fscache_relinquish_cookie(server->fscache, 0); ++ server->fscache = NULL; ++} ++ +Index: cifs-2.6/fs/cifs/fscache.h +=================================================================== +--- cifs-2.6.orig/fs/cifs/fscache.h ++++ cifs-2.6/fs/cifs/fscache.h +@@ -27,14 +27,26 @@ + #ifdef CONFIG_CIFS_FSCACHE + + extern struct fscache_netfs cifs_fscache_netfs; ++extern const struct fscache_cookie_def cifs_fscache_server_index_def; + + extern int cifs_fscache_register(void); + extern void cifs_fscache_unregister(void); + ++/* ++ * fscache.c ++ */ ++extern void cifs_fscache_get_client_cookie(struct TCP_Server_Info *); ++extern void cifs_fscache_release_client_cookie(struct TCP_Server_Info *); ++ + #else /* CONFIG_CIFS_FSCACHE */ + static inline int cifs_fscache_register(void) { return 0; } + static inline void cifs_fscache_unregister(void) {} + ++static inline void ++cifs_fscache_get_client_cookie(struct TCP_Server_Info *server) {} ++static inline void ++cifs_fscache_get_client_cookie(struct TCP_Server_Info *server); {} ++ + #endif /* CONFIG_CIFS_FSCACHE */ + + #endif /* _CIFS_FSCACHE_H */ + + diff --git a/test/corpora/lkml/cur/1382298587.001735:2, b/test/corpora/lkml/cur/1382298587.001735:2, new file mode 100644 index 00000000..d76da353 --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.001735:2, @@ -0,0 +1,212 @@ +From: Suresh Jayaraman <sjayaraman@suse.de> +Subject: [RFC][PATCH 07/10] cifs: FS-Cache page management +Date: Tue, 22 Jun 2010 20:53:48 +0530 +Lines: 175 +Message-ID: <1277220228-3635-1-git-send-email-sjayaraman@suse.de> +References: <yes> +Cc: linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, + linux-kernel@vger.kernel.org, David Howells <dhowells@redhat.com> +To: Steve French <smfrench@gmail.com> +X-From: linux-kernel-owner@vger.kernel.org Tue Jun 22 17:44:27 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1OR5eF-0008G7-BK + for glk-linux-kernel-3@lo.gmane.org; Tue, 22 Jun 2010 17:44:27 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1754757Ab0FVPoS (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Tue, 22 Jun 2010 11:44:18 -0400 +Received: from victor.provo.novell.com ([137.65.250.26]:54214 "EHLO + victor.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1752542Ab0FVPoB (ORCPT + <rfc822;groupwise-SJayaraman@novell.com:0:0>); + Tue, 22 Jun 2010 11:44:01 -0400 +Received: from localhost (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) + by victor.provo.novell.com with ESMTP; Tue, 22 Jun 2010 09:23:50 -0600 +X-Mailer: git-send-email 1.6.4.2 +In-Reply-To: <yes> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1001761> + +Takes care of invalidation and release of FS-Cache marked pages and also +invalidation of the FsCache page flag when the inode is removed. + +Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de> +--- + fs/cifs/cache.c | 31 +++++++++++++++++++++++++++++++ + fs/cifs/file.c | 20 ++++++++++++++++++++ + fs/cifs/fscache.c | 26 ++++++++++++++++++++++++++ + fs/cifs/fscache.h | 16 ++++++++++++++++ + 4 files changed, 93 insertions(+), 0 deletions(-) + +diff --git a/fs/cifs/cache.c b/fs/cifs/cache.c +index b205424..3a733c1 100644 +--- a/fs/cifs/cache.c ++++ b/fs/cifs/cache.c +@@ -210,6 +210,36 @@ fscache_checkaux cifs_fscache_inode_check_aux(void *cookie_netfs_data, + return FSCACHE_CHECKAUX_OKAY; + } + ++static void cifs_fscache_inode_now_uncached(void *cookie_netfs_data) ++{ ++ struct cifsInodeInfo *cifsi = cookie_netfs_data; ++ struct pagevec pvec; ++ pgoff_t first; ++ int loop, nr_pages; ++ ++ pagevec_init(&pvec, 0); ++ first = 0; ++ ++ cFYI(1, "cifs inode 0x%p now uncached\n", cifsi); ++ ++ for (;;) { ++ nr_pages = pagevec_lookup(&pvec, ++ cifsi->vfs_inode.i_mapping, first, ++ PAGEVEC_SIZE - pagevec_count(&pvec)); ++ if (!nr_pages) ++ break; ++ ++ for (loop = 0; loop < nr_pages; loop++) ++ ClearPageFsCache(pvec.pages[loop]); ++ ++ first = pvec.pages[nr_pages - 1]->index + 1; ++ ++ pvec.nr = nr_pages; ++ pagevec_release(&pvec); ++ cond_resched(); ++ } ++} ++ + const struct fscache_cookie_def cifs_fscache_inode_object_def = { + .name = "CIFS.uniqueid", + .type = FSCACHE_COOKIE_TYPE_DATAFILE, +@@ -217,4 +247,5 @@ const struct fscache_cookie_def cifs_fscache_inode_object_def = { + .get_attr = cifs_fscache_inode_get_attr, + .get_aux = cifs_fscache_inode_get_aux, + .check_aux = cifs_fscache_inode_check_aux, ++ .now_uncached = cifs_fscache_inode_now_uncached, + }; +diff --git a/fs/cifs/file.c b/fs/cifs/file.c +index 55ecb55..786ec04 100644 +--- a/fs/cifs/file.c ++++ b/fs/cifs/file.c +@@ -2271,6 +2271,22 @@ out: + return rc; + } + ++static int cifs_release_page(struct page *page, gfp_t gfp) ++{ ++ if (PagePrivate(page)) ++ return 0; ++ ++ return cifs_fscache_release_page(page, gfp); ++} ++ ++static void cifs_invalidate_page(struct page *page, unsigned long offset) ++{ ++ struct cifsInodeInfo *cifsi = CIFS_I(page->mapping->host); ++ ++ if (offset == 0) ++ cifs_fscache_invalidate_page(page, &cifsi->vfs_inode); ++} ++ + static void + cifs_oplock_break(struct slow_work *work) + { +@@ -2344,6 +2360,8 @@ const struct address_space_operations cifs_addr_ops = { + .write_begin = cifs_write_begin, + .write_end = cifs_write_end, + .set_page_dirty = __set_page_dirty_nobuffers, ++ .releasepage = cifs_release_page, ++ .invalidatepage = cifs_invalidate_page, + /* .sync_page = cifs_sync_page, */ + /* .direct_IO = */ + }; +@@ -2360,6 +2378,8 @@ const struct address_space_operations cifs_addr_ops_smallbuf = { + .write_begin = cifs_write_begin, + .write_end = cifs_write_end, + .set_page_dirty = __set_page_dirty_nobuffers, ++ .releasepage = cifs_release_page, ++ .invalidatepage = cifs_invalidate_page, + /* .sync_page = cifs_sync_page, */ + /* .direct_IO = */ + }; +diff --git a/fs/cifs/fscache.c b/fs/cifs/fscache.c +index ddfd355..c09d3b8 100644 +--- a/fs/cifs/fscache.c ++++ b/fs/cifs/fscache.c +@@ -130,3 +130,29 @@ void cifs_fscache_reset_inode_cookie(struct inode *inode) + } + } + ++int cifs_fscache_release_page(struct page *page, gfp_t gfp) ++{ ++ if (PageFsCache(page)) { ++ struct inode *inode = page->mapping->host; ++ struct cifsInodeInfo *cifsi = CIFS_I(inode); ++ ++ cFYI(1, "CIFS: fscache release page (0x%p/0x%p)\n", ++ cifsi->fscache, page); ++ if (!fscache_maybe_release_page(cifsi->fscache, page, gfp)) ++ return 0; ++ } ++ ++ return 1; ++} ++ ++void __cifs_fscache_invalidate_page(struct page *page, struct inode *inode) ++{ ++ struct cifsInodeInfo *cifsi = CIFS_I(inode); ++ struct fscache_cookie *cookie = cifsi->fscache; ++ ++ cFYI(1, "CIFS: fscache invalidatepage (0x%p/0x%p/0x%p)\n", ++ cookie, page, cifsi); ++ fscache_wait_on_page_write(cookie, page); ++ fscache_uncache_page(cookie, page); ++} ++ +diff --git a/fs/cifs/fscache.h b/fs/cifs/fscache.h +index 836bb02..127cb0a 100644 +--- a/fs/cifs/fscache.h ++++ b/fs/cifs/fscache.h +@@ -47,6 +47,16 @@ extern void cifs_fscache_release_inode_cookie(struct inode *); + extern void cifs_fscache_set_inode_cookie(struct inode *, struct file *); + extern void cifs_fscache_reset_inode_cookie(struct inode *); + ++extern void __cifs_fscache_invalidate_page(struct page *, struct inode *); ++extern int cifs_fscache_release_page(struct page *page, gfp_t gfp); ++ ++static inline void cifs_fscache_invalidate_page(struct page *page, ++ struct inode *inode) ++{ ++ if (PageFsCache(page)) ++ __cifs_fscache_invalidate_page(page, inode); ++} ++ + #else /* CONFIG_CIFS_FSCACHE */ + static inline int cifs_fscache_register(void) { return 0; } + static inline void cifs_fscache_unregister(void) {} +@@ -63,7 +73,13 @@ static inline void cifs_fscache_release_inode_cookie(struct inode *inode) {} + static inline void cifs_fscache_set_inode_cookie(struct inode *inode, + struct file *filp) {} + static inline void cifs_fscache_reset_inode_cookie(struct inode *inode) {} ++static inline void cifs_fscache_release_page(struct page *page, gfp_t gfp) ++{ ++ return 1; /* May release page */ ++} + ++static inline int cifs_fscache_invalidate_page(struct page *page, ++ struct inode *) {} + + #endif /* CONFIG_CIFS_FSCACHE */ + +-- +1.6.4.2 + + + diff --git a/test/corpora/lkml/cur/1382298587.001736:2, b/test/corpora/lkml/cur/1382298587.001736:2, new file mode 100644 index 00000000..f972891b --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.001736:2, @@ -0,0 +1,256 @@ +From: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +Subject: [RFC][PATCH 09/10] cifs: read pages from FS-Cache +Date: Tue, 22 Jun 2010 20:54:21 +0530 +Lines: 219 +Message-ID: <1277220261-3717-1-git-send-email-sjayaraman@suse.de> +References: <yes> +Cc: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +To: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Tue Jun 22 17:44:46 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1OR5eX-0008O2-Q4 + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Tue, 22 Jun 2010 17:44:46 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1752563Ab0FVPom (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Tue, 22 Jun 2010 11:44:42 -0400 +Received: from victor.provo.novell.com ([137.65.250.26]:42741 "EHLO + victor.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1752542Ab0FVPok (ORCPT + <rfc822;groupwise-SJayaraman-Et1tbQHTxzrQT0dZR+AlfA@public.gmane.org:0:0>); + Tue, 22 Jun 2010 11:44:40 -0400 +Received: from localhost (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) + by victor.provo.novell.com with ESMTP; Tue, 22 Jun 2010 09:24:22 -0600 +X-Mailer: git-send-email 1.6.4.2 +In-Reply-To: <yes> +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1001762> + +Read pages from a FS-Cache data storage object into a CIFS inode. + +Signed-off-by: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +--- + fs/cifs/file.c | 19 ++++++++++++++ + fs/cifs/fscache.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + fs/cifs/fscache.h | 40 ++++++++++++++++++++++++++++- + 3 files changed, 131 insertions(+), 1 deletions(-) + +diff --git a/fs/cifs/file.c b/fs/cifs/file.c +index 39c1ce0..42d2f25 100644 +--- a/fs/cifs/file.c ++++ b/fs/cifs/file.c +@@ -1978,6 +1978,16 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, + cifs_sb = CIFS_SB(file->f_path.dentry->d_sb); + pTcon = cifs_sb->tcon; + ++ /* ++ * Reads as many pages as possible from fscache. Returns -ENOBUFS ++ * immediately if the cookie is negative ++ */ ++ rc = cifs_readpages_from_fscache(mapping->host, mapping, page_list, ++ &num_pages); ++ cFYI(1, "CIFS: readpages_from_fscache returned %d\n", rc); ++ if (rc == 0) ++ goto read_complete; ++ + cFYI(DBG2, "rpages: num pages %d", num_pages); + for (i = 0; i < num_pages; ) { + unsigned contig_pages; +@@ -2090,6 +2100,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, + smb_read_data = NULL; + } + ++read_complete: + FreeXid(xid); + return rc; + } +@@ -2100,6 +2111,12 @@ static int cifs_readpage_worker(struct file *file, struct page *page, + char *read_data; + int rc; + ++ /* Is the page cached? */ ++ rc = cifs_readpage_from_fscache(file->f_path.dentry->d_inode, page); ++ cFYI(1, "CIFS: cifs_readpage_from_fscache returned %d\n", rc); ++ if (rc == 0) ++ goto read_complete; ++ + page_cache_get(page); + read_data = kmap(page); + /* for reads over a certain size could initiate async read ahead */ +@@ -2128,6 +2145,8 @@ static int cifs_readpage_worker(struct file *file, struct page *page, + io_error: + kunmap(page); + page_cache_release(page); ++ ++read_complete: + return rc; + } + +diff --git a/fs/cifs/fscache.c b/fs/cifs/fscache.c +index 13e47d5..6813737 100644 +--- a/fs/cifs/fscache.c ++++ b/fs/cifs/fscache.c +@@ -145,6 +145,79 @@ int cifs_fscache_release_page(struct page *page, gfp_t gfp) + return 1; + } + ++static void cifs_readpage_from_fscache_complete(struct page *page, void *ctx, ++ int error) ++{ ++ cFYI(1, "CFS: readpage_from_fscache_complete (0x%p/%d)\n", ++ page, error); ++ if (!error) ++ SetPageUptodate(page); ++ unlock_page(page); ++} ++ ++/* ++ * Retrieve a page from FS-Cache ++ */ ++int __cifs_readpage_from_fscache(struct inode *inode, struct page *page) ++{ ++ int ret; ++ ++ cFYI(1, "CIFS: readpage_from_fscache(fsc:%p, p:%p, i:0x%p\n", ++ CIFS_I(inode)->fscache, page, inode); ++ ret = fscache_read_or_alloc_page(CIFS_I(inode)->fscache, page, ++ cifs_readpage_from_fscache_complete, ++ NULL, ++ GFP_KERNEL); ++ switch (ret) { ++ ++ case 0: /* page found in fscache, read submitted */ ++ cFYI(1, "CIFS: readpage_from_fscache: submitted\n"); ++ return ret; ++ case -ENOBUFS: /* page won't be cached */ ++ case -ENODATA: /* page not in cache */ ++ cFYI(1, "CIFS: readpage_from_fscache %d\n", ret); ++ return 1; ++ ++ default: ++ cFYI(1, "unknown error ret = %d", ret); ++ } ++ return ret; ++} ++ ++/* ++ * Retrieve a set of pages from FS-Cache ++ */ ++int __cifs_readpages_from_fscache(struct inode *inode, ++ struct address_space *mapping, ++ struct list_head *pages, ++ unsigned *nr_pages) ++{ ++ int ret; ++ ++ cFYI(1, "CIFS: __cifs_readpages_from_fscache (0x%p/%u/0x%p)\n", ++ CIFS_I(inode)->fscache, *nr_pages, inode); ++ ret = fscache_read_or_alloc_pages(CIFS_I(inode)->fscache, mapping, ++ pages, nr_pages, ++ cifs_readpage_from_fscache_complete, ++ NULL, ++ mapping_gfp_mask(mapping)); ++ switch (ret) { ++ case 0: /* read submitted to the cache for all pages */ ++ cFYI(1, "CIFS: readpages_from_fscache\n"); ++ return ret; ++ ++ case -ENOBUFS: /* some pages are not cached and can't be */ ++ case -ENODATA: /* some pages are not cached */ ++ cFYI(1, "CIFS: readpages_from_fscache: no page\n"); ++ return 1; ++ ++ default: ++ cFYI(1, "unknown error ret = %d", ret); ++ } ++ ++ return ret; ++} ++ + void __cifs_readpage_to_fscache(struct inode *inode, struct page *page) + { + int ret; +diff --git a/fs/cifs/fscache.h b/fs/cifs/fscache.h +index e34d8ab..03bd3fe 100644 +--- a/fs/cifs/fscache.h ++++ b/fs/cifs/fscache.h +@@ -31,7 +31,6 @@ extern const struct fscache_cookie_def cifs_fscache_server_index_def; + extern const struct fscache_cookie_def cifs_fscache_super_index_def; + extern const struct fscache_cookie_def cifs_fscache_inode_object_def; + +- + extern int cifs_fscache_register(void); + extern void cifs_fscache_unregister(void); + +@@ -49,6 +48,11 @@ extern void cifs_fscache_reset_inode_cookie(struct inode *); + + extern void __cifs_fscache_invalidate_page(struct page *, struct inode *); + extern int cifs_fscache_release_page(struct page *page, gfp_t gfp); ++extern int __cifs_readpage_from_fscache(struct inode *, struct page *); ++extern int __cifs_readpages_from_fscache(struct inode *, ++ struct address_space *, ++ struct list_head *, ++ unsigned *); + + extern void __cifs_readpage_to_fscache(struct inode *, struct page *); + +@@ -59,6 +63,26 @@ static inline void cifs_fscache_invalidate_page(struct page *page, + __cifs_fscache_invalidate_page(page, inode); + } + ++static inline int cifs_readpage_from_fscache(struct inode *inode, ++ struct page *page) ++{ ++ if (CIFS_I(inode)->fscache) ++ return __cifs_readpage_from_fscache(inode, page); ++ ++ return -ENOBUFS; ++} ++ ++static inline int cifs_readpages_from_fscache(struct inode *inode, ++ struct address_space *mapping, ++ struct list_head *pages, ++ unsigned *nr_pages) ++{ ++ if (CIFS_I(inode)->fscache) ++ return __cifs_readpages_from_fscache(inode, mapping, pages, ++ nr_pages); ++ return -ENOBUFS; ++} ++ + static inline void cifs_readpage_to_fscache(struct inode *inode, + struct page *page) + { +@@ -89,6 +113,20 @@ static inline void cifs_fscache_release_page(struct page *page, gfp_t gfp) + + static inline int cifs_fscache_invalidate_page(struct page *page, + struct inode *) {} ++static inline int ++cifs_readpage_from_fscache(struct inode *inode, struct page *page) ++{ ++ return -ENOBUFS; ++} ++ ++static inline int cifs_readpages_from_fscache(struct inode *inode, ++ struct address_space *mapping, ++ struct list_head *pages, ++ unsigned *nr_pages) ++{ ++ return -ENOBUFS; ++} ++ + static inline void cifs_readpage_to_fscache(struct inode *inode, + struct page *page) {} + +-- +1.6.4.2 + + + diff --git a/test/corpora/lkml/cur/1382298587.001738:2, b/test/corpora/lkml/cur/1382298587.001738:2, new file mode 100644 index 00000000..b1e0edfb --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.001738:2, @@ -0,0 +1,139 @@ +From: Suresh Jayaraman <sjayaraman@suse.de> +Subject: [RFC][PATCH 08/10] cifs: store pages into local cache +Date: Tue, 22 Jun 2010 20:54:00 +0530 +Lines: 102 +Message-ID: <1277220240-3674-1-git-send-email-sjayaraman@suse.de> +References: <yes> +Cc: linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, + linux-kernel@vger.kernel.org, David Howells <dhowells@redhat.com> +To: Steve French <smfrench@gmail.com> +X-From: linux-fsdevel-owner@vger.kernel.org Tue Jun 22 17:45:09 2010 +Return-path: <linux-fsdevel-owner@vger.kernel.org> +Envelope-to: lnx-linux-fsdevel@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-fsdevel-owner@vger.kernel.org>) + id 1OR5ev-00007O-6e + for lnx-linux-fsdevel@lo.gmane.org; Tue, 22 Jun 2010 17:45:09 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1755015Ab0FVPon (ORCPT <rfc822;lnx-linux-fsdevel@m.gmane.org>); + Tue, 22 Jun 2010 11:44:43 -0400 +Received: from victor.provo.novell.com ([137.65.250.26]:58250 "EHLO + victor.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1751265Ab0FVPok (ORCPT + <rfc822;groupwise-SJayaraman@novell.com:0:0>); + Tue, 22 Jun 2010 11:44:40 -0400 +Received: from localhost (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) + by victor.provo.novell.com with ESMTP; Tue, 22 Jun 2010 09:24:02 -0600 +X-Mailer: git-send-email 1.6.4.2 +In-Reply-To: <yes> +Sender: linux-fsdevel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-fsdevel.vger.kernel.org> +X-Mailing-List: linux-fsdevel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1001764> + +Store pages from an CIFS inode into the data storage object associated with +that inode. + +Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de> +--- + fs/cifs/file.c | 6 ++++++ + fs/cifs/fscache.c | 13 +++++++++++++ + fs/cifs/fscache.h | 11 +++++++++++ + 3 files changed, 30 insertions(+), 0 deletions(-) + +diff --git a/fs/cifs/file.c b/fs/cifs/file.c +index 786ec04..39c1ce0 100644 +--- a/fs/cifs/file.c ++++ b/fs/cifs/file.c +@@ -2060,6 +2060,8 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, + we will hit it on next read */ + + /* break; */ ++ /* send this page to FS-Cache */ ++ cifs_readpage_to_fscache(mapping->host, page); + } + } else { + cFYI(1, "No bytes read (%d) at offset %lld . " +@@ -2117,6 +2119,10 @@ static int cifs_readpage_worker(struct file *file, struct page *page, + + flush_dcache_page(page); + SetPageUptodate(page); ++ ++ /* send this page to the cache */ ++ cifs_readpage_to_fscache(file->f_path.dentry->d_inode, page); ++ + rc = 0; + + io_error: +diff --git a/fs/cifs/fscache.c b/fs/cifs/fscache.c +index c09d3b8..13e47d5 100644 +--- a/fs/cifs/fscache.c ++++ b/fs/cifs/fscache.c +@@ -145,6 +145,19 @@ int cifs_fscache_release_page(struct page *page, gfp_t gfp) + return 1; + } + ++void __cifs_readpage_to_fscache(struct inode *inode, struct page *page) ++{ ++ int ret; ++ ++ cFYI(1, "CIFS: readpage_to_fscache(fsc: %p, p: %p, i: %p\n", ++ CIFS_I(inode)->fscache, page, inode); ++ ret = fscache_write_page(CIFS_I(inode)->fscache, page, GFP_KERNEL); ++ cFYI(1, "CIFS: fscache_write_page returned %d\n", ret); ++ ++ if (ret != 0) ++ fscache_uncache_page(CIFS_I(inode)->fscache, page); ++} ++ + void __cifs_fscache_invalidate_page(struct page *page, struct inode *inode) + { + struct cifsInodeInfo *cifsi = CIFS_I(inode); +diff --git a/fs/cifs/fscache.h b/fs/cifs/fscache.h +index 127cb0a..e34d8ab 100644 +--- a/fs/cifs/fscache.h ++++ b/fs/cifs/fscache.h +@@ -50,6 +50,8 @@ extern void cifs_fscache_reset_inode_cookie(struct inode *); + extern void __cifs_fscache_invalidate_page(struct page *, struct inode *); + extern int cifs_fscache_release_page(struct page *page, gfp_t gfp); + ++extern void __cifs_readpage_to_fscache(struct inode *, struct page *); ++ + static inline void cifs_fscache_invalidate_page(struct page *page, + struct inode *inode) + { +@@ -57,6 +59,13 @@ static inline void cifs_fscache_invalidate_page(struct page *page, + __cifs_fscache_invalidate_page(page, inode); + } + ++static inline void cifs_readpage_to_fscache(struct inode *inode, ++ struct page *page) ++{ ++ if (PageFsCache(page)) ++ __cifs_readpage_to_fscache(inode, page); ++} ++ + #else /* CONFIG_CIFS_FSCACHE */ + static inline int cifs_fscache_register(void) { return 0; } + static inline void cifs_fscache_unregister(void) {} +@@ -80,6 +89,8 @@ static inline void cifs_fscache_release_page(struct page *page, gfp_t gfp) + + static inline int cifs_fscache_invalidate_page(struct page *page, + struct inode *) {} ++static inline void cifs_readpage_to_fscache(struct inode *inode, ++ struct page *page) {} + + #endif /* CONFIG_CIFS_FSCACHE */ + +-- +1.6.4.2 + +-- +To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + + diff --git a/test/corpora/lkml/cur/1382298587.001739:2, b/test/corpora/lkml/cur/1382298587.001739:2, new file mode 100644 index 00000000..d0abda0a --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.001739:2, @@ -0,0 +1,355 @@ +From: Suresh Jayaraman <sjayaraman@suse.de> +Subject: [RFC][PATCH 06/10] cifs: define inode-level cache object and register them +Date: Tue, 22 Jun 2010 20:53:33 +0530 +Lines: 318 +Message-ID: <1277220214-3597-1-git-send-email-sjayaraman@suse.de> +References: <yes> +Cc: linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, + linux-kernel@vger.kernel.org, David Howells <dhowells@redhat.com> +To: Steve French <smfrench@gmail.com> +X-From: linux-kernel-owner@vger.kernel.org Tue Jun 22 17:45:30 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1OR5fF-0000Ka-Na + for glk-linux-kernel-3@lo.gmane.org; Tue, 22 Jun 2010 17:45:30 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1755952Ab0FVPpP (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Tue, 22 Jun 2010 11:45:15 -0400 +Received: from victor.provo.novell.com ([137.65.250.26]:59441 "EHLO + victor.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1751397Ab0FVPoA (ORCPT + <rfc822;groupwise-SJayaraman@novell.com:0:0>); + Tue, 22 Jun 2010 11:44:00 -0400 +Received: from localhost (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) + by victor.provo.novell.com with ESMTP; Tue, 22 Jun 2010 09:23:35 -0600 +X-Mailer: git-send-email 1.6.4.2 +In-Reply-To: <yes> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1001765> + +Define inode-level data storage objects (managed by cifsInodeInfo structs). +Each inode-level object is created in a super-block level object and is itself +a data storage object in to which pages from the inode are stored. + +The inode object is keyed by UniqueId. The coherency data being used is +LastWriteTime and the file size. + +Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de> +--- + fs/cifs/cache.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + fs/cifs/cifsfs.c | 7 ++++ + fs/cifs/cifsglob.h | 3 + + fs/cifs/file.c | 6 +++ + fs/cifs/fscache.c | 68 +++++++++++++++++++++++++++++++++++++++++++++ + fs/cifs/fscache.h | 12 +++++++ + fs/cifs/inode.c | 4 ++ + 7 files changed, 180 insertions(+) + +Index: cifs-2.6/fs/cifs/cache.c +=================================================================== +--- cifs-2.6.orig/fs/cifs/cache.c ++++ cifs-2.6/fs/cifs/cache.c +@@ -138,3 +138,83 @@ const struct fscache_cookie_def cifs_fsc + .get_key = cifs_super_get_key, + }; + ++/* ++ * Auxiliary data attached to CIFS inode within the cache ++ */ ++struct cifs_fscache_inode_auxdata { ++ struct timespec last_write_time; ++ loff_t size; ++}; ++ ++static uint16_t cifs_fscache_inode_get_key(const void *cookie_netfs_data, ++ void *buffer, uint16_t maxbuf) ++{ ++ const struct cifsInodeInfo *cifsi = cookie_netfs_data; ++ uint16_t keylen; ++ ++ /* use the UniqueId as the key */ ++ keylen = sizeof(cifsi->uniqueid); ++ if (keylen > maxbuf) ++ keylen = 0; ++ else ++ memcpy(buffer, &cifsi->uniqueid, keylen); ++ ++ return keylen; ++} ++ ++static void ++cifs_fscache_inode_get_attr(const void *cookie_netfs_data, uint64_t *size) ++{ ++ const struct cifsInodeInfo *cifsi = cookie_netfs_data; ++ ++ *size = cifsi->vfs_inode.i_size; ++} ++ ++static uint16_t ++cifs_fscache_inode_get_aux(const void *cookie_netfs_data, void *buffer, ++ uint16_t maxbuf) ++{ ++ struct cifs_fscache_inode_auxdata auxdata; ++ const struct cifsInodeInfo *cifsi = cookie_netfs_data; ++ ++ memset(&auxdata, 0, sizeof(auxdata)); ++ auxdata.size = cifsi->vfs_inode.i_size; ++ auxdata.last_write_time = cifsi->vfs_inode.i_ctime; ++ ++ if (maxbuf > sizeof(auxdata)) ++ maxbuf = sizeof(auxdata); ++ ++ memcpy(buffer, &auxdata, maxbuf); ++ ++ return maxbuf; ++} ++ ++static enum ++fscache_checkaux cifs_fscache_inode_check_aux(void *cookie_netfs_data, ++ const void *data, ++ uint16_t datalen) ++{ ++ struct cifs_fscache_inode_auxdata auxdata; ++ struct cifsInodeInfo *cifsi = cookie_netfs_data; ++ ++ if (datalen != sizeof(auxdata)) ++ return FSCACHE_CHECKAUX_OBSOLETE; ++ ++ memset(&auxdata, 0, sizeof(auxdata)); ++ auxdata.size = cifsi->vfs_inode.i_size; ++ auxdata.last_write_time = cifsi->vfs_inode.i_ctime; ++ ++ if (memcmp(data, &auxdata, datalen) != 0) ++ return FSCACHE_CHECKAUX_OBSOLETE; ++ ++ return FSCACHE_CHECKAUX_OKAY; ++} ++ ++const struct fscache_cookie_def cifs_fscache_inode_object_def = { ++ .name = "CIFS.uniqueid", ++ .type = FSCACHE_COOKIE_TYPE_DATAFILE, ++ .get_key = cifs_fscache_inode_get_key, ++ .get_attr = cifs_fscache_inode_get_attr, ++ .get_aux = cifs_fscache_inode_get_aux, ++ .check_aux = cifs_fscache_inode_check_aux, ++}; +Index: cifs-2.6/fs/cifs/cifsfs.c +=================================================================== +--- cifs-2.6.orig/fs/cifs/cifsfs.c ++++ cifs-2.6/fs/cifs/cifsfs.c +@@ -330,6 +330,12 @@ cifs_destroy_inode(struct inode *inode) + } + + static void ++cifs_clear_inode(struct inode *inode) ++{ ++ cifs_fscache_release_inode_cookie(inode); ++} ++ ++static void + cifs_show_address(struct seq_file *s, struct TCP_Server_Info *server) + { + seq_printf(s, ",addr="); +@@ -490,6 +496,7 @@ static const struct super_operations cif + .alloc_inode = cifs_alloc_inode, + .destroy_inode = cifs_destroy_inode, + .drop_inode = cifs_drop_inode, ++ .clear_inode = cifs_clear_inode, + /* .delete_inode = cifs_delete_inode, */ /* Do not need above + function unless later we add lazy close of inodes or unless the + kernel forgets to call us with the same number of releases (closes) +Index: cifs-2.6/fs/cifs/cifsglob.h +=================================================================== +--- cifs-2.6.orig/fs/cifs/cifsglob.h ++++ cifs-2.6/fs/cifs/cifsglob.h +@@ -407,6 +407,9 @@ struct cifsInodeInfo { + bool invalid_mapping:1; /* pagecache is invalid */ + u64 server_eof; /* current file size on server */ + u64 uniqueid; /* server inode number */ ++#ifdef CONFIG_CIFS_FSCACHE ++ struct fscache_cookie *fscache; ++#endif + struct inode vfs_inode; + }; + +Index: cifs-2.6/fs/cifs/file.c +=================================================================== +--- cifs-2.6.orig/fs/cifs/file.c ++++ cifs-2.6/fs/cifs/file.c +@@ -40,6 +40,7 @@ + #include "cifs_unicode.h" + #include "cifs_debug.h" + #include "cifs_fs_sb.h" ++#include "fscache.h" + + static inline int cifs_convert_flags(unsigned int flags) + { +@@ -282,6 +283,9 @@ int cifs_open(struct inode *inode, struc + CIFSSMBClose(xid, tcon, netfid); + rc = -ENOMEM; + } ++ ++ cifs_fscache_set_inode_cookie(inode, file); ++ + goto out; + } else if ((rc == -EINVAL) || (rc == -EOPNOTSUPP)) { + if (tcon->ses->serverNOS) +@@ -373,6 +377,8 @@ int cifs_open(struct inode *inode, struc + goto out; + } + ++ cifs_fscache_set_inode_cookie(inode, file); ++ + if (oplock & CIFS_CREATE_ACTION) { + /* time to set mode which we can not set earlier due to + problems creating new read-only files */ +Index: cifs-2.6/fs/cifs/fscache.c +=================================================================== +--- cifs-2.6.orig/fs/cifs/fscache.c ++++ cifs-2.6/fs/cifs/fscache.c +@@ -62,3 +62,71 @@ void cifs_fscache_release_super_cookie(s + tcon->fscache = NULL; + } + ++static void cifs_fscache_enable_inode_cookie(struct inode *inode) ++{ ++ struct cifsInodeInfo *cifsi = CIFS_I(inode); ++ struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb); ++ ++ if (cifsi->fscache) ++ return; ++ ++ cifsi->fscache = fscache_acquire_cookie(cifs_sb->tcon->fscache, ++ &cifs_fscache_inode_object_def, ++ cifsi); ++ cFYI(1, "CIFS: got FH cookie (0x%p/0x%p/0x%p)\n", ++ cifs_sb->tcon, cifsi, cifsi->fscache); ++} ++ ++void cifs_fscache_release_inode_cookie(struct inode *inode) ++{ ++ struct cifsInodeInfo *cifsi = CIFS_I(inode); ++ ++ if (cifsi->fscache) { ++ cFYI(1, "CIFS releasing inode cookie (0x%p/0x%p)\n", ++ cifsi, cifsi->fscache); ++ fscache_relinquish_cookie(cifsi->fscache, 0); ++ cifsi->fscache = NULL; ++ } ++} ++ ++static void cifs_fscache_disable_inode_cookie(struct inode *inode) ++{ ++ struct cifsInodeInfo *cifsi = CIFS_I(inode); ++ ++ if (cifsi->fscache) { ++ cFYI(1, "CIFS disabling inode cookie (0x%p/0x%p)\n", ++ cifsi, cifsi->fscache); ++ fscache_relinquish_cookie(cifsi->fscache, 1); ++ cifsi->fscache = NULL; ++ } ++} ++ ++void cifs_fscache_set_inode_cookie(struct inode *inode, struct file *filp) ++{ ++ /* BB: parallel opens - need locking? */ ++ if ((filp->f_flags & O_ACCMODE) != O_RDONLY) ++ cifs_fscache_disable_inode_cookie(inode); ++ else { ++ cifs_fscache_enable_inode_cookie(inode); ++ cFYI(1, "CIFS: fscache inode cookie set\n"); ++ } ++} ++ ++void cifs_fscache_reset_inode_cookie(struct inode *inode) ++{ ++ struct cifsInodeInfo *cifsi = CIFS_I(inode); ++ struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb); ++ struct fscache_cookie *old = cifsi->fscache; ++ ++ if (cifsi->fscache) { ++ /* retire the current fscache cache and get a new one */ ++ fscache_relinquish_cookie(cifsi->fscache, 1); ++ ++ cifsi->fscache = fscache_acquire_cookie(cifs_sb->tcon->fscache, ++ &cifs_fscache_inode_object_def, ++ cifsi); ++ cFYI(1, "CIFS: new cookie (0x%p/0x%p) oldcookie 0x%p\n", ++ cifsi, cifsi->fscache, old); ++ } ++} ++ +Index: cifs-2.6/fs/cifs/fscache.h +=================================================================== +--- cifs-2.6.orig/fs/cifs/fscache.h ++++ cifs-2.6/fs/cifs/fscache.h +@@ -29,6 +29,8 @@ + extern struct fscache_netfs cifs_fscache_netfs; + extern const struct fscache_cookie_def cifs_fscache_server_index_def; + extern const struct fscache_cookie_def cifs_fscache_super_index_def; ++extern const struct fscache_cookie_def cifs_fscache_inode_object_def; ++ + + extern int cifs_fscache_register(void); + extern void cifs_fscache_unregister(void); +@@ -41,6 +43,10 @@ extern void cifs_fscache_release_client_ + extern void cifs_fscache_get_super_cookie(struct cifsTconInfo *); + extern void cifs_fscache_release_super_cookie(struct cifsTconInfo *); + ++extern void cifs_fscache_release_inode_cookie(struct inode *); ++extern void cifs_fscache_set_inode_cookie(struct inode *, struct file *); ++extern void cifs_fscache_reset_inode_cookie(struct inode *); ++ + #else /* CONFIG_CIFS_FSCACHE */ + static inline int cifs_fscache_register(void) { return 0; } + static inline void cifs_fscache_unregister(void) {} +@@ -53,6 +59,12 @@ static inline void cifs_fscache_get_supe + static inline void + cifs_fscache_release_super_cookie(struct cifsTconInfo *tcon) {} + ++static inline void cifs_fscache_release_inode_cookie(struct inode *inode) {} ++static inline void cifs_fscache_set_inode_cookie(struct inode *inode, ++ struct file *filp) {} ++static inline void cifs_fscache_reset_inode_cookie(struct inode *inode) {} ++ ++ + #endif /* CONFIG_CIFS_FSCACHE */ + + #endif /* _CIFS_FSCACHE_H */ +Index: cifs-2.6/fs/cifs/inode.c +=================================================================== +--- cifs-2.6.orig/fs/cifs/inode.c ++++ cifs-2.6/fs/cifs/inode.c +@@ -29,6 +29,7 @@ + #include "cifsproto.h" + #include "cifs_debug.h" + #include "cifs_fs_sb.h" ++#include "fscache.h" + + + static void cifs_set_ops(struct inode *inode, const bool is_dfs_referral) +@@ -776,6 +777,8 @@ retry_iget5_locked: + inode->i_flags |= S_NOATIME | S_NOCMTIME; + if (inode->i_state & I_NEW) { + inode->i_ino = hash; ++ /* initialize per-inode cache cookie pointer */ ++ CIFS_I(inode)->fscache = NULL; + unlock_new_inode(inode); + } + } +@@ -1568,6 +1571,7 @@ cifs_invalidate_mapping(struct inode *in + cifs_i->write_behind_rc = rc; + } + invalidate_remote_inode(inode); ++ cifs_fscache_reset_inode_cookie(inode); + } + + int cifs_revalidate_file(struct file *filp) + + diff --git a/test/corpora/lkml/cur/1382298587.001740:2, b/test/corpora/lkml/cur/1382298587.001740:2, new file mode 100644 index 00000000..ef0f657b --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.001740:2, @@ -0,0 +1,214 @@ +From: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +Subject: [RFC][PATCH 05/10] cifs: define superblock-level cache index objects and register them +Date: Tue, 22 Jun 2010 20:53:26 +0530 +Lines: 177 +Message-ID: <1277220206-3559-1-git-send-email-sjayaraman@suse.de> +References: <yes> +Cc: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +To: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Tue Jun 22 17:45:50 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1OR5fZ-0000Vj-Mj + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Tue, 22 Jun 2010 17:45:50 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1752511Ab0FVPpJ (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Tue, 22 Jun 2010 11:45:09 -0400 +Received: from victor.provo.novell.com ([137.65.250.26]:56189 "EHLO + victor.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1752441Ab0FVPoA (ORCPT + <rfc822;groupwise-SJayaraman-Et1tbQHTxzrQT0dZR+AlfA@public.gmane.org:0:0>); + Tue, 22 Jun 2010 11:44:00 -0400 +Received: from localhost (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) + by victor.provo.novell.com with ESMTP; Tue, 22 Jun 2010 09:23:29 -0600 +X-Mailer: git-send-email 1.6.4.2 +In-Reply-To: <yes> +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1001766> + +Define superblock-level cache index objects (managed by cifsTconInfo structs). +Each superblock object is created in a server-level index object and in itself +an index into which inode-level objects are inserted. + +Currently, the superblock objects are keyed by sharename. + +Signed-off-by: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +--- + fs/cifs/cache.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + fs/cifs/cifsglob.h | 3 ++ + fs/cifs/connect.c | 4 +++ + fs/cifs/fscache.c | 17 ++++++++++++++ + fs/cifs/fscache.h | 6 +++++ + 5 files changed, 92 insertions(+) + +Index: cifs-2.6/fs/cifs/cache.c +=================================================================== +--- cifs-2.6.orig/fs/cifs/cache.c ++++ cifs-2.6/fs/cifs/cache.c +@@ -76,3 +76,65 @@ const struct fscache_cookie_def cifs_fsc + .type = FSCACHE_COOKIE_TYPE_INDEX, + .get_key = cifs_server_get_key, + }; ++ ++static char *extract_sharename(const char *treename) ++{ ++ const char *src; ++ char *delim, *dst; ++ int len; ++ ++ /* skip double chars at the beginning */ ++ src = treename + 2; ++ ++ /* share name is always preceded by '\\' now */ ++ delim = strchr(src, '\\'); ++ if (!delim) ++ return ERR_PTR(-EINVAL); ++ delim++; ++ len = strlen(delim); ++ ++ /* caller has to free the memory */ ++ dst = kstrndup(delim, len, GFP_KERNEL); ++ if (!dst) ++ return ERR_PTR(-ENOMEM); ++ ++ return dst; ++} ++ ++/* ++ * Superblock object currently keyed by share name ++ */ ++static uint16_t cifs_super_get_key(const void *cookie_netfs_data, void *buffer, ++ uint16_t maxbuf) ++{ ++ const struct cifsTconInfo *tcon = cookie_netfs_data; ++ char *sharename; ++ uint16_t len; ++ ++ sharename = extract_sharename(tcon->treeName); ++ if (IS_ERR(sharename)) { ++ cFYI(1, "CIFS: couldn't extract sharename\n"); ++ sharename = NULL; ++ return 0; ++ } ++ ++ len = strlen(sharename); ++ if (len > maxbuf) ++ return 0; ++ ++ memcpy(buffer, sharename, len); ++ ++ kfree(sharename); ++ ++ return len; ++} ++ ++/* ++ * Superblock object for FS-Cache ++ */ ++const struct fscache_cookie_def cifs_fscache_super_index_def = { ++ .name = "CIFS.super", ++ .type = FSCACHE_COOKIE_TYPE_INDEX, ++ .get_key = cifs_super_get_key, ++}; ++ +Index: cifs-2.6/fs/cifs/cifsglob.h +=================================================================== +--- cifs-2.6.orig/fs/cifs/cifsglob.h ++++ cifs-2.6/fs/cifs/cifsglob.h +@@ -317,6 +317,9 @@ struct cifsTconInfo { + bool local_lease:1; /* check leases (only) on local system not remote */ + bool broken_posix_open; /* e.g. Samba server versions < 3.3.2, 3.2.9 */ + bool need_reconnect:1; /* connection reset, tid now invalid */ ++#ifdef CONFIG_CIFS_FSCACHE ++ struct fscache_cookie *fscache; /* cookie for share */ ++#endif + /* BB add field for back pointer to sb struct(s)? */ + }; + +Index: cifs-2.6/fs/cifs/connect.c +=================================================================== +--- cifs-2.6.orig/fs/cifs/connect.c ++++ cifs-2.6/fs/cifs/connect.c +@@ -1773,6 +1773,8 @@ cifs_put_tcon(struct cifsTconInfo *tcon) + list_del_init(&tcon->tcon_list); + write_unlock(&cifs_tcp_ses_lock); + ++ cifs_fscache_release_super_cookie(tcon); ++ + xid = GetXid(); + CIFSSMBTDis(xid, tcon); + _FreeXid(xid); +@@ -1843,6 +1845,8 @@ cifs_get_tcon(struct cifsSesInfo *ses, s + tcon->nocase = volume_info->nocase; + tcon->local_lease = volume_info->local_lease; + ++ cifs_fscache_get_super_cookie(tcon); ++ + write_lock(&cifs_tcp_ses_lock); + list_add(&tcon->tcon_list, &ses->tcon_list); + write_unlock(&cifs_tcp_ses_lock); +Index: cifs-2.6/fs/cifs/fscache.c +=================================================================== +--- cifs-2.6.orig/fs/cifs/fscache.c ++++ cifs-2.6/fs/cifs/fscache.c +@@ -45,3 +45,20 @@ void cifs_fscache_release_client_cookie( + server->fscache = NULL; + } + ++void cifs_fscache_get_super_cookie(struct cifsTconInfo *tcon) ++{ ++ tcon->fscache = ++ fscache_acquire_cookie(tcon->ses->server->fscache, ++ &cifs_fscache_super_index_def, tcon); ++ cFYI(1, "CIFS: get superblock cookie (0x%p/0x%p)\n", ++ tcon, tcon->fscache); ++} ++ ++void cifs_fscache_release_super_cookie(struct cifsTconInfo *tcon) ++{ ++ cFYI(1, "CIFS: releasing superblock cookie (0x%p/0x%p)\n", ++ tcon, tcon->fscache); ++ fscache_relinquish_cookie(tcon->fscache, 0); ++ tcon->fscache = NULL; ++} ++ +Index: cifs-2.6/fs/cifs/fscache.h +=================================================================== +--- cifs-2.6.orig/fs/cifs/fscache.h ++++ cifs-2.6/fs/cifs/fscache.h +@@ -28,6 +28,7 @@ + + extern struct fscache_netfs cifs_fscache_netfs; + extern const struct fscache_cookie_def cifs_fscache_server_index_def; ++extern const struct fscache_cookie_def cifs_fscache_super_index_def; + + extern int cifs_fscache_register(void); + extern void cifs_fscache_unregister(void); +@@ -37,6 +38,8 @@ extern void cifs_fscache_unregister(void + */ + extern void cifs_fscache_get_client_cookie(struct TCP_Server_Info *); + extern void cifs_fscache_release_client_cookie(struct TCP_Server_Info *); ++extern void cifs_fscache_get_super_cookie(struct cifsTconInfo *); ++extern void cifs_fscache_release_super_cookie(struct cifsTconInfo *); + + #else /* CONFIG_CIFS_FSCACHE */ + static inline int cifs_fscache_register(void) { return 0; } +@@ -46,6 +49,9 @@ static inline void + cifs_fscache_get_client_cookie(struct TCP_Server_Info *server) {} + static inline void + cifs_fscache_get_client_cookie(struct TCP_Server_Info *server); {} ++static inline void cifs_fscache_get_super_cookie(struct cifsTconInfo *tcon) {} ++static inline void ++cifs_fscache_release_super_cookie(struct cifsTconInfo *tcon) {} + + #endif /* CONFIG_CIFS_FSCACHE */ + + + diff --git a/test/corpora/lkml/cur/1382298587.001887:2, b/test/corpora/lkml/cur/1382298587.001887:2, new file mode 100644 index 00000000..81290484 --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.001887:2, @@ -0,0 +1,85 @@ +From: Jeff Layton <jlayton-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org> +Subject: Re: [RFC][PATCH 02/10] cifs: guard cifsglob.h against multiple + inclusion +Date: Tue, 22 Jun 2010 17:37:42 -0400 +Lines: 35 +Message-ID: <20100622173742.448e1e94@corrin.poochiereds.net> +References: <yes> + <1277220170-3442-1-git-send-email-sjayaraman@suse.de> +Mime-Version: 1.0 +Content-Type: text/plain; charset=US-ASCII +Content-Transfer-Encoding: 7bit +Cc: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +To: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Tue Jun 22 23:36:08 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1ORB8Z-00027v-R8 + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Tue, 22 Jun 2010 23:36:08 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1751663Ab0FVVfq (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Tue, 22 Jun 2010 17:35:46 -0400 +Received: from cdptpa-omtalb.mail.rr.com ([75.180.132.121]:46190 "EHLO + cdptpa-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1751933Ab0FVVfo (ORCPT + <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); Tue, 22 Jun 2010 17:35:44 -0400 +X-Authority-Analysis: v=1.0 c=1 a=Y4kVDsoNLLAA:10 a=yQWWgrYGNuUA:10 a=kj9zAlcOel0A:10 a=hGzw-44bAAAA:8 a=6UT2YofcClCzWf3PPoQA:9 a=Ipo6nwFRv7ENfF13HvmH_iG48b8A:4 a=CjuIK1q_8ugA:10 a=0kPLrQdw3YYA:10 a=dowx1zmaLagA:10 +X-Cloudmark-Score: 0 +X-Originating-IP: 71.70.153.3 +Received: from [71.70.153.3] ([71.70.153.3:49036] helo=mail.poochiereds.net) + by cdptpa-oedge01.mail.rr.com (envelope-from <jlayton-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org>) + (ecelerity 2.2.2.39 r()) with ESMTP + id 29/22-24471-DAC212C4; Tue, 22 Jun 2010 21:35:42 +0000 +Received: from corrin.poochiereds.net (unknown [65.88.2.5]) + by mail.poochiereds.net (Postfix) with ESMTPSA id 1C5A1580F4; + Tue, 22 Jun 2010 17:35:41 -0400 (EDT) +In-Reply-To: <1277220170-3442-1-git-send-email-sjayaraman-l3A5Bk7waGM@public.gmane.org> +X-Mailer: Claws Mail 3.7.6 (GTK+ 2.20.1; x86_64-redhat-linux-gnu) +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1001913> + +On Tue, 22 Jun 2010 20:52:50 +0530 +Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> wrote: + +> Add conditional compile macros to guard the header file against multiple +> inclusion. +> +> Signed-off-by: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +> --- +> fs/cifs/cifsglob.h | 5 +++++ +> 1 files changed, 5 insertions(+), 0 deletions(-) +> +> diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h +> index a88479c..6b2c39d 100644 +> --- a/fs/cifs/cifsglob.h +> +++ b/fs/cifs/cifsglob.h +> @@ -16,6 +16,9 @@ +> * the GNU Lesser General Public License for more details. +> * +> */ +> +#ifndef _CIFS_GLOB_H +> +#define _CIFS_GLOB_H +> + +> #include <linux/in.h> +> #include <linux/in6.h> +> #include <linux/slab.h> +> @@ -733,3 +736,5 @@ GLOBAL_EXTERN unsigned int cifs_min_small; /* min size of small buf pool */ +> GLOBAL_EXTERN unsigned int cifs_max_pending; /* MAX requests at once to server*/ +> +> extern const struct slow_work_ops cifs_oplock_break_ops; +> + +> +#endif /* _CIFS_GLOB_H */ + +Strong ACK + +Acked-by: Jeff Layton <jlayton-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org> + + diff --git a/test/corpora/lkml/cur/1382298587.001892:2, b/test/corpora/lkml/cur/1382298587.001892:2, new file mode 100644 index 00000000..82603bf1 --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.001892:2, @@ -0,0 +1,254 @@ +From: Jeff Layton <jlayton-vpEMnDpepFuMZCB2o+C8xQ@public.gmane.org> +Subject: Re: [RFC][PATCH 04/10] cifs: define server-level cache index + objects and register them with FS-Cache +Date: Tue, 22 Jun 2010 17:52:14 -0400 +Lines: 204 +Message-ID: <20100622175214.4c56234f@corrin.poochiereds.net> +References: <yes> + <1277220198-3522-1-git-send-email-sjayaraman@suse.de> +Mime-Version: 1.0 +Content-Type: text/plain; charset=US-ASCII +Content-Transfer-Encoding: 7bit +Cc: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +To: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Tue Jun 22 23:50:23 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1ORBMJ-0005WJ-Lj + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Tue, 22 Jun 2010 23:50:20 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1750777Ab0FVVuS (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Tue, 22 Jun 2010 17:50:18 -0400 +Received: from cdptpa-omtalb.mail.rr.com ([75.180.132.120]:55670 "EHLO + cdptpa-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1750749Ab0FVVuR (ORCPT + <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); Tue, 22 Jun 2010 17:50:17 -0400 +X-Authority-Analysis: v=1.1 cv=8MuG1bpxLlSbaYWWtODGdBCK7StbFcRsMXhWm1NVx/I= c=1 sm=0 a=wpY4Lvx3kJcA:10 a=UBIxAjGgU1YA:10 a=kj9zAlcOel0A:10 a=ld/erqUjW76FpBUqCqkKeA==:17 a=VwQbUJbxAAAA:8 a=qYub2k57AAAA:8 a=uYIlwBZcjrF9BUCsR4kA:9 a=OO1ZLbZb6q4TPdC5pcAA:7 a=jFshslHAf8hJVDYUYRlYN4n-w5YA:4 a=CjuIK1q_8ugA:10 a=x8gzFH9gYPwA:10 a=0kPLrQdw3YYA:10 a=jBoGP612-tUA:10 a=t5DF_bUGhurCx8LQ:21 a=W6P_Gh1y2IibdbqZ:21 a=ld/erqUjW76FpBUqCqkKeA==:117 +X-Cloudmark-Score: 0 +X-Originating-IP: 71.70.153.3 +Received: from [71.70.153.3] ([71.70.153.3:59154] helo=mail.poochiereds.net) + by cdptpa-oedge03.mail.rr.com (envelope-from <jlayton-vpEMnDpepFuMZCB2o+C8xQ@public.gmane.org>) + (ecelerity 2.2.2.39 r()) with ESMTP + id AC/10-00502-710312C4; Tue, 22 Jun 2010 21:50:16 +0000 +Received: from corrin.poochiereds.net (unknown [65.88.2.5]) + by mail.poochiereds.net (Postfix) with ESMTPSA id 03B11580F4; + Tue, 22 Jun 2010 17:50:14 -0400 (EDT) +In-Reply-To: <1277220198-3522-1-git-send-email-sjayaraman-l3A5Bk7waGM@public.gmane.org> +X-Mailer: Claws Mail 3.7.6 (GTK+ 2.20.1; x86_64-redhat-linux-gnu) +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1001918> + +On Tue, 22 Jun 2010 20:53:18 +0530 +Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> wrote: + +> Define server-level cache index objects (as managed by TCP_ServerInfo structs). +> Each server object is created in the CIFS top-level index object and is itself +> an index into which superblock-level objects are inserted. +> +> Currently, the server objects are keyed by hostname. +> +> Signed-off-by: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +> --- +> fs/cifs/Makefile | 2 +- +> fs/cifs/cache.c | 25 +++++++++++++++++++++++++ +> fs/cifs/cifsglob.h | 3 +++ +> fs/cifs/connect.c | 4 ++++ +> fs/cifs/fscache.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ +> fs/cifs/fscache.h | 12 ++++++++++++ +> 6 files changed, 92 insertions(+), 1 deletion(-) +> create mode 100644 fs/cifs/fscache.c +> +> Index: cifs-2.6/fs/cifs/Makefile +> =================================================================== +> --- cifs-2.6.orig/fs/cifs/Makefile +> +++ cifs-2.6/fs/cifs/Makefile +> @@ -12,4 +12,4 @@ cifs-$(CONFIG_CIFS_UPCALL) += cifs_spneg +> +> cifs-$(CONFIG_CIFS_DFS_UPCALL) += dns_resolve.o cifs_dfs_ref.o +> +> -cifs-$(CONFIG_CIFS_FSCACHE) += cache.o +> +cifs-$(CONFIG_CIFS_FSCACHE) += fscache.o cache.o +> Index: cifs-2.6/fs/cifs/cache.c +> =================================================================== +> --- cifs-2.6.orig/fs/cifs/cache.c +> +++ cifs-2.6/fs/cifs/cache.c +> @@ -51,3 +51,28 @@ void cifs_fscache_unregister(void) +> fscache_unregister_netfs(&cifs_fscache_netfs); +> } +> +> +/* +> + * Server object currently keyed by hostname +> + */ +> +static uint16_t cifs_server_get_key(const void *cookie_netfs_data, +> + void *buffer, uint16_t maxbuf) +> +{ +> + const struct TCP_Server_Info *server = cookie_netfs_data; +> + uint16_t len = strnlen(server->hostname, sizeof(server->hostname)); +> + + +Would a tuple of address/family/port be a better choice here? Imagine I +mount "foo" and then later mount "foor.bar.baz". If they are the same +address and only the UNC differs, then you won't get the benefit of +the cache, right? + +> + if (len > maxbuf) +> + return 0; +> + +> + memcpy(buffer, server->hostname, len); +> + +> + return len; +> +} +> + +> +/* +> + * Server object for FS-Cache +> + */ +> +const struct fscache_cookie_def cifs_fscache_server_index_def = { +> + .name = "CIFS.server", +> + .type = FSCACHE_COOKIE_TYPE_INDEX, +> + .get_key = cifs_server_get_key, +> +}; +> Index: cifs-2.6/fs/cifs/cifsglob.h +> =================================================================== +> --- cifs-2.6.orig/fs/cifs/cifsglob.h +> +++ cifs-2.6/fs/cifs/cifsglob.h +> @@ -193,6 +193,9 @@ struct TCP_Server_Info { +> bool sec_mskerberos; /* supports legacy MS Kerberos */ +> bool sec_kerberosu2u; /* supports U2U Kerberos */ +> bool sec_ntlmssp; /* supports NTLMSSP */ +> +#ifdef CONFIG_CIFS_FSCACHE +> + struct fscache_cookie *fscache; /* client index cache cookie */ +> +#endif +> }; +> +> /* +> Index: cifs-2.6/fs/cifs/connect.c +> =================================================================== +> --- cifs-2.6.orig/fs/cifs/connect.c +> +++ cifs-2.6/fs/cifs/connect.c +> @@ -48,6 +48,7 @@ +> #include "nterr.h" +> #include "rfc1002pdu.h" +> #include "cn_cifs.h" +> +#include "fscache.h" +> +> #define CIFS_PORT 445 +> #define RFC1001_PORT 139 +> @@ -1453,6 +1454,8 @@ cifs_put_tcp_session(struct TCP_Server_I +> return; +> } +> +> + cifs_fscache_release_client_cookie(server); +> + +> list_del_init(&server->tcp_ses_list); +> write_unlock(&cifs_tcp_ses_lock); +> +> @@ -1572,6 +1575,7 @@ cifs_get_tcp_session(struct smb_vol *vol +> goto out_err; +> } +> +> + cifs_fscache_get_client_cookie(tcp_ses); +> /* thread spawned, put it on the list */ +> write_lock(&cifs_tcp_ses_lock); +> list_add(&tcp_ses->tcp_ses_list, &cifs_tcp_ses_list); +> Index: cifs-2.6/fs/cifs/fscache.c +> =================================================================== +> --- /dev/null +> +++ cifs-2.6/fs/cifs/fscache.c +> @@ -0,0 +1,47 @@ +> +/* +> + * fs/cifs/fscache.c - CIFS filesystem cache interface +> + * +> + * Copyright (c) 2010 Novell, Inc. +> + * Authors(s): Suresh Jayaraman (sjayaraman-l3A5Bk7waGM@public.gmane.org> +> + * +> + * This library is free software; you can redistribute it and/or modify +> + * it under the terms of the GNU Lesser General Public License as published +> + * by the Free Software Foundation; either version 2.1 of the License, or +> + * (at your option) any later version. +> + * +> + * This library is distributed in the hope that it will be useful, +> + * but WITHOUT ANY WARRANTY; without even the implied warranty of +> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See +> + * the GNU Lesser General Public License for more details. +> + * +> + * You should have received a copy of the GNU Lesser General Public License +> + * along with this library; if not, write to the Free Software +> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +> + */ +> +#include <linux/init.h> +> +#include <linux/kernel.h> +> +#include <linux/sched.h> +> +#include <linux/mm.h> +> +#include <linux/in6.h> +> + +> +#include "fscache.h" +> +#include "cifsglob.h" +> +#include "cifs_debug.h" +> + +> +void cifs_fscache_get_client_cookie(struct TCP_Server_Info *server) +> +{ +> + server->fscache = +> + fscache_acquire_cookie(cifs_fscache_netfs.primary_index, +> + &cifs_fscache_server_index_def, server); +> + cFYI(1, "CIFS: get client cookie (0x%p/0x%p)\n", +> + server, server->fscache); +> +} +> + +> +void cifs_fscache_release_client_cookie(struct TCP_Server_Info *server) +> +{ +> + cFYI(1, "CIFS: release client cookie (0x%p/0x%p)\n", +> + server, server->fscache); +> + fscache_relinquish_cookie(server->fscache, 0); +> + server->fscache = NULL; +> +} +> + +> Index: cifs-2.6/fs/cifs/fscache.h +> =================================================================== +> --- cifs-2.6.orig/fs/cifs/fscache.h +> +++ cifs-2.6/fs/cifs/fscache.h +> @@ -27,14 +27,26 @@ +> #ifdef CONFIG_CIFS_FSCACHE +> +> extern struct fscache_netfs cifs_fscache_netfs; +> +extern const struct fscache_cookie_def cifs_fscache_server_index_def; +> +> extern int cifs_fscache_register(void); +> extern void cifs_fscache_unregister(void); +> +> +/* +> + * fscache.c +> + */ +> +extern void cifs_fscache_get_client_cookie(struct TCP_Server_Info *); +> +extern void cifs_fscache_release_client_cookie(struct TCP_Server_Info *); +> + +> #else /* CONFIG_CIFS_FSCACHE */ +> static inline int cifs_fscache_register(void) { return 0; } +> static inline void cifs_fscache_unregister(void) {} +> +> +static inline void +> +cifs_fscache_get_client_cookie(struct TCP_Server_Info *server) {} +> +static inline void +> +cifs_fscache_get_client_cookie(struct TCP_Server_Info *server); {} +> + +> #endif /* CONFIG_CIFS_FSCACHE */ +> +> #endif /* _CIFS_FSCACHE_H */ +> -- +> To unsubscribe from this list: send the line "unsubscribe linux-cifs" in +> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +> More majordomo info at http://vger.kernel.org/majordomo-info.html +> + + +-- +Jeff Layton <jlayton-vpEMnDpepFuMZCB2o+C8xQ@public.gmane.org> + + diff --git a/test/corpora/lkml/cur/1382298587.001970:2, b/test/corpora/lkml/cur/1382298587.001970:2, new file mode 100644 index 00000000..707d0ad2 --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.001970:2, @@ -0,0 +1,103 @@ +From: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +Subject: Re: [RFC][PATCH 04/10] cifs: define server-level cache index objects + and register them with FS-Cache +Date: Wed, 23 Jun 2010 11:04:39 +0530 +Lines: 61 +Message-ID: <4C219CEF.5000003@suse.de> +References: <yes> <1277220198-3522-1-git-send-email-sjayaraman@suse.de> <20100622175214.4c56234f@corrin.poochiereds.net> +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 7bit +Cc: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +To: Jeff Layton <jlayton-vpEMnDpepFuMZCB2o+C8xQ@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Wed Jun 23 07:34:50 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1ORIbp-0002v4-3W + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Wed, 23 Jun 2010 07:34:49 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1750954Ab0FWFes (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Wed, 23 Jun 2010 01:34:48 -0400 +Received: from cantor2.suse.de ([195.135.220.15]:58263 "EHLO mx2.suse.de" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1750809Ab0FWFes (ORCPT <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); + Wed, 23 Jun 2010 01:34:48 -0400 +Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2]) + by mx2.suse.de (Postfix) with ESMTP id 8C18386A2E; + Wed, 23 Jun 2010 07:34:46 +0200 (CEST) +User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.5) Gecko/20091130 SUSE/3.0.0-1.1.1 Thunderbird/3.0 +In-Reply-To: <20100622175214.4c56234f-4QP7MXygkU+dMjc06nkz3ljfA9RmPOcC@public.gmane.org> +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1001998> + +On 06/23/2010 03:22 AM, Jeff Layton wrote: +> On Tue, 22 Jun 2010 20:53:18 +0530 +> Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> wrote: +> +>> Define server-level cache index objects (as managed by TCP_ServerInfo structs). +>> Each server object is created in the CIFS top-level index object and is itself +>> an index into which superblock-level objects are inserted. +>> +>> Currently, the server objects are keyed by hostname. +>> +>> Signed-off-by: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +>> --- +>> fs/cifs/Makefile | 2 +- +>> fs/cifs/cache.c | 25 +++++++++++++++++++++++++ +>> fs/cifs/cifsglob.h | 3 +++ +>> fs/cifs/connect.c | 4 ++++ +>> fs/cifs/fscache.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ +>> fs/cifs/fscache.h | 12 ++++++++++++ +>> 6 files changed, 92 insertions(+), 1 deletion(-) +>> create mode 100644 fs/cifs/fscache.c +>> +>> Index: cifs-2.6/fs/cifs/Makefile +>> =================================================================== +>> --- cifs-2.6.orig/fs/cifs/Makefile +>> +++ cifs-2.6/fs/cifs/Makefile +>> @@ -12,4 +12,4 @@ cifs-$(CONFIG_CIFS_UPCALL) += cifs_spneg +>> +>> cifs-$(CONFIG_CIFS_DFS_UPCALL) += dns_resolve.o cifs_dfs_ref.o +>> +>> -cifs-$(CONFIG_CIFS_FSCACHE) += cache.o +>> +cifs-$(CONFIG_CIFS_FSCACHE) += fscache.o cache.o +>> Index: cifs-2.6/fs/cifs/cache.c +>> =================================================================== +>> --- cifs-2.6.orig/fs/cifs/cache.c +>> +++ cifs-2.6/fs/cifs/cache.c +>> @@ -51,3 +51,28 @@ void cifs_fscache_unregister(void) +>> fscache_unregister_netfs(&cifs_fscache_netfs); +>> } +>> +>> +/* +>> + * Server object currently keyed by hostname +>> + */ +>> +static uint16_t cifs_server_get_key(const void *cookie_netfs_data, +>> + void *buffer, uint16_t maxbuf) +>> +{ +>> + const struct TCP_Server_Info *server = cookie_netfs_data; +>> + uint16_t len = strnlen(server->hostname, sizeof(server->hostname)); +>> + +> +> Would a tuple of address/family/port be a better choice here? Imagine I +> mount "foo" and then later mount "foor.bar.baz". If they are the same +> address and only the UNC differs, then you won't get the benefit of +> the cache, right? +> + +Good point. I'll fix it up when I do a respin. + +Thanks, + +-- +Suresh Jayaraman + + diff --git a/test/corpora/lkml/cur/1382298587.002189:2, b/test/corpora/lkml/cur/1382298587.002189:2, new file mode 100644 index 00000000..3cfc62e0 --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.002189:2, @@ -0,0 +1,66 @@ +From: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +Subject: Re: [RFC][PATCH 03/10] cifs: register CIFS for caching +Date: Wed, 23 Jun 2010 17:51:17 +0100 +Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley + Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United + Kingdom. + Registered in England and Wales under Company Registration No. 3798903 +Lines: 20 +Message-ID: <9603.1277311877@redhat.com> +References: <1277220189-3485-1-git-send-email-sjayaraman@suse.de> <yes> +Cc: dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, + linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +To: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Wed Jun 23 18:51:32 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1ORTAg-0008Bt-CT + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Wed, 23 Jun 2010 18:51:30 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1751915Ab0FWQv3 (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Wed, 23 Jun 2010 12:51:29 -0400 +Received: from mx1.redhat.com ([209.132.183.28]:50923 "EHLO mx1.redhat.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1751520Ab0FWQv3 (ORCPT <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); + Wed, 23 Jun 2010 12:51:29 -0400 +Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) + by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5NGpLFc028550 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); + Wed, 23 Jun 2010 12:51:21 -0400 +Received: from redhat.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) + by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5NGpHIG010890; + Wed, 23 Jun 2010 12:51:18 -0400 +In-Reply-To: <1277220189-3485-1-git-send-email-sjayaraman-l3A5Bk7waGM@public.gmane.org> +X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1002219> + +Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> wrote: + +> + rc = cifs_fscache_register(); +> + if (rc) +> + goto out; +> + +> rc = cifs_init_inodecache(); +> if (rc) +> goto out_clean_proc; +> @@ -949,8 +954,10 @@ init_cifs(void) +> cifs_destroy_mids(); +> out_destroy_inodecache: +> cifs_destroy_inodecache(); +> + cifs_fscache_unregister(); +> out_clean_proc: + +This is incorrect. You need to call cifs_fscache_unregister() if +cifs_init_inodecache() fails. + +David + + diff --git a/test/corpora/lkml/cur/1382298587.002193:2, b/test/corpora/lkml/cur/1382298587.002193:2, new file mode 100644 index 00000000..e2ea6266 --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.002193:2, @@ -0,0 +1,59 @@ +From: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +Subject: Re: [RFC][PATCH 05/10] cifs: define superblock-level cache index objects and register them +Date: Wed, 23 Jun 2010 17:58:10 +0100 +Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley + Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United + Kingdom. + Registered in England and Wales under Company Registration No. 3798903 +Lines: 13 +Message-ID: <9720.1277312290@redhat.com> +References: <1277220206-3559-1-git-send-email-sjayaraman@suse.de> <yes> +Cc: dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, + linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +To: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Wed Jun 23 18:58:19 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1ORTHG-0003Az-Ge + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Wed, 23 Jun 2010 18:58:18 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1751520Ab0FWQ6R (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Wed, 23 Jun 2010 12:58:17 -0400 +Received: from mx1.redhat.com ([209.132.183.28]:62343 "EHLO mx1.redhat.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1751372Ab0FWQ6R (ORCPT <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); + Wed, 23 Jun 2010 12:58:17 -0400 +Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) + by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5NGwDC2031683 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); + Wed, 23 Jun 2010 12:58:13 -0400 +Received: from redhat.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) + by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5NGwAfq021298; + Wed, 23 Jun 2010 12:58:11 -0400 +In-Reply-To: <1277220206-3559-1-git-send-email-sjayaraman-l3A5Bk7waGM@public.gmane.org> +X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1002223> + +Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> wrote: + +> Define superblock-level cache index objects (managed by cifsTconInfo +> structs). Each superblock object is created in a server-level index object +> and in itself an index into which inode-level objects are inserted. +> +> Currently, the superblock objects are keyed by sharename. + +Seems reasonable. Is there any way you can check that the share you are +looking at on a server is the same as the last time you looked? Can you +validate the root directory of the share in some way? + +David + + diff --git a/test/corpora/lkml/cur/1382298587.002194:2, b/test/corpora/lkml/cur/1382298587.002194:2, new file mode 100644 index 00000000..d2d1efdb --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.002194:2, @@ -0,0 +1,61 @@ +From: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +Subject: Re: [RFC][PATCH 06/10] cifs: define inode-level cache object and register them +Date: Wed, 23 Jun 2010 18:02:53 +0100 +Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley + Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United + Kingdom. + Registered in England and Wales under Company Registration No. 3798903 +Lines: 15 +Message-ID: <9822.1277312573@redhat.com> +References: <1277220214-3597-1-git-send-email-sjayaraman@suse.de> <yes> +Cc: dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, + linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +To: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Wed Jun 23 19:03:04 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1ORTLr-0007Bh-Cs + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Wed, 23 Jun 2010 19:03:03 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1752063Ab0FWRDB (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Wed, 23 Jun 2010 13:03:01 -0400 +Received: from mx1.redhat.com ([209.132.183.28]:30823 "EHLO mx1.redhat.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1751804Ab0FWRDA (ORCPT <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); + Wed, 23 Jun 2010 13:03:00 -0400 +Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) + by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5NH2v0J030982 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); + Wed, 23 Jun 2010 13:02:57 -0400 +Received: from redhat.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) + by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5NH2r9N014323; + Wed, 23 Jun 2010 13:02:54 -0400 +In-Reply-To: <1277220214-3597-1-git-send-email-sjayaraman-l3A5Bk7waGM@public.gmane.org> +X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1002224> + +Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> wrote: + +> Define inode-level data storage objects (managed by cifsInodeInfo structs). +> Each inode-level object is created in a super-block level object and is +> itself a data storage object in to which pages from the inode are stored. +> +> The inode object is keyed by UniqueId. The coherency data being used is +> LastWriteTime and the file size. + +Isn't there a file creation time too? + +I take it you don't support caching on files that are open for writing at this +time? + +David + + diff --git a/test/corpora/lkml/cur/1382298587.002195:2, b/test/corpora/lkml/cur/1382298587.002195:2, new file mode 100644 index 00000000..ec54a814 --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.002195:2, @@ -0,0 +1,59 @@ +From: David Howells <dhowells@redhat.com> +Subject: Re: [RFC][PATCH 07/10] cifs: FS-Cache page management +Date: Wed, 23 Jun 2010 18:05:01 +0100 +Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley + Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United + Kingdom. + Registered in England and Wales under Company Registration No. 3798903 +Lines: 13 +Message-ID: <9866.1277312701@redhat.com> +References: <1277220228-3635-1-git-send-email-sjayaraman@suse.de> <yes> +Cc: dhowells@redhat.com, Steve French <smfrench@gmail.com>, + linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, + linux-kernel@vger.kernel.org +To: Suresh Jayaraman <sjayaraman@suse.de> +X-From: linux-fsdevel-owner@vger.kernel.org Wed Jun 23 19:05:19 2010 +Return-path: <linux-fsdevel-owner@vger.kernel.org> +Envelope-to: lnx-linux-fsdevel@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-fsdevel-owner@vger.kernel.org>) + id 1ORTNz-0008Oj-Ho + for lnx-linux-fsdevel@lo.gmane.org; Wed, 23 Jun 2010 19:05:15 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1752145Ab0FWRFO (ORCPT <rfc822;lnx-linux-fsdevel@m.gmane.org>); + Wed, 23 Jun 2010 13:05:14 -0400 +Received: from mx1.redhat.com ([209.132.183.28]:1689 "EHLO mx1.redhat.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1751804Ab0FWRFN (ORCPT <rfc822;linux-fsdevel@vger.kernel.org>); + Wed, 23 Jun 2010 13:05:13 -0400 +Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) + by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5NH59sl011966 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); + Wed, 23 Jun 2010 13:05:09 -0400 +Received: from redhat.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) + by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5NH52Jl022163; + Wed, 23 Jun 2010 13:05:03 -0400 +In-Reply-To: <1277220228-3635-1-git-send-email-sjayaraman@suse.de> +X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 +Sender: linux-fsdevel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-fsdevel.vger.kernel.org> +X-Mailing-List: linux-fsdevel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1002225> + +Suresh Jayaraman <sjayaraman@suse.de> wrote: + +> Takes care of invalidation and release of FS-Cache marked pages and also +> invalidation of the FsCache page flag when the inode is removed. +> +> Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de> + +Acked-by: David Howells <dhowells@redhat.com> +-- +To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + + diff --git a/test/corpora/lkml/cur/1382298587.002196:2, b/test/corpora/lkml/cur/1382298587.002196:2, new file mode 100644 index 00000000..63838dc7 --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.002196:2, @@ -0,0 +1,54 @@ +From: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +Subject: Re: [RFC][PATCH 08/10] cifs: store pages into local cache +Date: Wed, 23 Jun 2010 18:06:12 +0100 +Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley + Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United + Kingdom. + Registered in England and Wales under Company Registration No. 3798903 +Lines: 8 +Message-ID: <9890.1277312772@redhat.com> +References: <1277220240-3674-1-git-send-email-sjayaraman@suse.de> <yes> +Cc: dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, + linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +To: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Wed Jun 23 19:06:21 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1ORTP3-0000fp-01 + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Wed, 23 Jun 2010 19:06:21 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1752403Ab0FWRGU (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Wed, 23 Jun 2010 13:06:20 -0400 +Received: from mx1.redhat.com ([209.132.183.28]:63621 "EHLO mx1.redhat.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1751804Ab0FWRGT (ORCPT <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); + Wed, 23 Jun 2010 13:06:19 -0400 +Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) + by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5NH6FCB012081 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); + Wed, 23 Jun 2010 13:06:15 -0400 +Received: from redhat.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) + by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5NH6CKG013414; + Wed, 23 Jun 2010 13:06:13 -0400 +In-Reply-To: <1277220240-3674-1-git-send-email-sjayaraman-l3A5Bk7waGM@public.gmane.org> +X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1002226> + +Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> wrote: + +> Store pages from an CIFS inode into the data storage object associated with +> that inode. +> +> Signed-off-by: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> + +Acked-by: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> + + diff --git a/test/corpora/lkml/cur/1382298587.002197:2, b/test/corpora/lkml/cur/1382298587.002197:2, new file mode 100644 index 00000000..765c3993 --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.002197:2, @@ -0,0 +1,53 @@ +From: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +Subject: Re: [RFC][PATCH 09/10] cifs: read pages from FS-Cache +Date: Wed, 23 Jun 2010 18:07:40 +0100 +Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley + Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United + Kingdom. + Registered in England and Wales under Company Registration No. 3798903 +Lines: 7 +Message-ID: <9918.1277312860@redhat.com> +References: <1277220261-3717-1-git-send-email-sjayaraman@suse.de> <yes> +Cc: dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, + linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +To: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Wed Jun 23 19:07:51 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1ORTQR-0000nv-JF + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Wed, 23 Jun 2010 19:07:47 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1751708Ab0FWRHr (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Wed, 23 Jun 2010 13:07:47 -0400 +Received: from mx1.redhat.com ([209.132.183.28]:34413 "EHLO mx1.redhat.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1750954Ab0FWRHq (ORCPT <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); + Wed, 23 Jun 2010 13:07:46 -0400 +Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) + by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5NH7h3Y005904 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); + Wed, 23 Jun 2010 13:07:43 -0400 +Received: from redhat.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) + by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5NH7efR020683; + Wed, 23 Jun 2010 13:07:41 -0400 +In-Reply-To: <1277220261-3717-1-git-send-email-sjayaraman-l3A5Bk7waGM@public.gmane.org> +X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1002227> + +Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> wrote: + +> Read pages from a FS-Cache data storage object into a CIFS inode. +> +> Signed-off-by: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> + +Acked-by: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> + + diff --git a/test/corpora/lkml/cur/1382298587.002201:2, b/test/corpora/lkml/cur/1382298587.002201:2, new file mode 100644 index 00000000..bae1eefe --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.002201:2, @@ -0,0 +1,58 @@ +From: David Howells <dhowells@redhat.com> +Subject: Re: [RFC][PATCH 10/10] cifs: add mount option to enable local caching +Date: Wed, 23 Jun 2010 18:08:34 +0100 +Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley + Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United + Kingdom. + Registered in England and Wales under Company Registration No. 3798903 +Lines: 12 +Message-ID: <9942.1277312914@redhat.com> +References: <1277220309-3757-1-git-send-email-sjayaraman@suse.de> <yes> +Cc: dhowells@redhat.com, Steve French <smfrench@gmail.com>, + linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, + linux-kernel@vger.kernel.org +To: Suresh Jayaraman <sjayaraman@suse.de> +X-From: linux-kernel-owner@vger.kernel.org Wed Jun 23 19:09:22 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1ORTRv-0002J8-2s + for glk-linux-kernel-3@lo.gmane.org; Wed, 23 Jun 2010 19:09:19 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1753275Ab0FWRIt (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Wed, 23 Jun 2010 13:08:49 -0400 +Received: from mx1.redhat.com ([209.132.183.28]:6156 "EHLO mx1.redhat.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1753203Ab0FWRIr (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Wed, 23 Jun 2010 13:08:47 -0400 +Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) + by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5NH8dax006028 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); + Wed, 23 Jun 2010 13:08:39 -0400 +Received: from redhat.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) + by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5NH8YmA020846; + Wed, 23 Jun 2010 13:08:36 -0400 +In-Reply-To: <1277220309-3757-1-git-send-email-sjayaraman@suse.de> +X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1002231> + +Suresh Jayaraman <sjayaraman@suse.de> wrote: + +> Add a mount option 'fsc' to enable local caching on CIFS. +> +> As the cifs-utils (userspace) changes are not done yet, this patch enables +> 'fsc' by default to assist testing. +> +> Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de> + +Acked-by: David Howells <dhowells@redhat.com> + +(Give or take the debugging bit) + + diff --git a/test/corpora/lkml/cur/1382298587.002228:2, b/test/corpora/lkml/cur/1382298587.002228:2, new file mode 100644 index 00000000..b401ae39 --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.002228:2, @@ -0,0 +1,100 @@ +From: Scott Lovenberg <scott.lovenberg@gmail.com> +Subject: Re: [RFC][PATCH 10/10] cifs: add mount option to enable local caching +Date: Wed, 23 Jun 2010 14:32:24 -0400 +Lines: 37 +Message-ID: <4C225338.9010807@gmail.com> +References: <yes> <1277220309-3757-1-git-send-email-sjayaraman@suse.de> +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1; format=flowed +Content-Transfer-Encoding: 7bit +Cc: Steve French <smfrench@gmail.com>, linux-cifs@vger.kernel.org, + linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, + David Howells <dhowells@redhat.com> +To: Suresh Jayaraman <sjayaraman@suse.de> +X-From: linux-kernel-owner@vger.kernel.org Wed Jun 23 20:32:44 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1ORUke-00020X-7B + for glk-linux-kernel-3@lo.gmane.org; Wed, 23 Jun 2010 20:32:44 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1753205Ab0FWScd (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Wed, 23 Jun 2010 14:32:33 -0400 +Received: from mail-gx0-f174.google.com ([209.85.161.174]:50118 "EHLO + mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1752380Ab0FWScb (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Wed, 23 Jun 2010 14:32:31 -0400 +Received: by gxk28 with SMTP id 28so317656gxk.19 + for <multiple recipients>; Wed, 23 Jun 2010 11:32:31 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=gmail.com; s=gamma; + h=domainkey-signature:received:received:message-id:date:from + :user-agent:mime-version:to:cc:subject:references:in-reply-to + :content-type:content-transfer-encoding; + bh=iTBSrajJefJVTimpUcvJQmptYefXJDrz9ZyZgxnMvzA=; + b=DOZLux9YGwNIWknqofz5rMltvopOT+kRgPsHIYw8Z7Uhh9gR5YAD4V6kKmv1SIaWoo + uXjNwY+IPIiD4f4OwwlpwJTd4B7PkBCDIlOkwVcvvS3F6qr6WbXBd0nRuRiFGMwONU3E + MqTAWDDwIXLVURr1t+n3MFrKwKj5b7pZT5fHw= +DomainKey-Signature: a=rsa-sha1; c=nofws; + d=gmail.com; s=gamma; + h=message-id:date:from:user-agent:mime-version:to:cc:subject + :references:in-reply-to:content-type:content-transfer-encoding; + b=pTsfPMlTDpE3Oi2w9V3eE2ohOeBEloXhgElmCwGEenBegF7ZhIyoga6tyRJqQ922ws + oyxLXSORpOuPJRoIBRXfzae3KXkgKT0eLDjxQNTdS7Jbe+vcJ604sANFcnxBsJ51fThT + R/wXt7LiG/T6H4DUpcN7aUjtzlq9JgC2JQ/ws= +Received: by 10.224.43.197 with SMTP id x5mr5243425qae.127.1277317950764; + Wed, 23 Jun 2010 11:32:30 -0700 (PDT) +Received: from [192.168.0.2] ([64.9.41.61]) + by mx.google.com with ESMTPS id 15sm3010007qcg.2.2010.06.23.11.32.25 + (version=TLSv1/SSLv3 cipher=RC4-MD5); + Wed, 23 Jun 2010 11:32:26 -0700 (PDT) +User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.1.10) Gecko/20100512 Lightning/1.0b1 Thunderbird/3.0.5 ThunderBrowse/3.2.8.1 +In-Reply-To: <1277220309-3757-1-git-send-email-sjayaraman@suse.de> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1002258> + +On 6/22/2010 11:25 AM, Suresh Jayaraman wrote: +> Add a mount option 'fsc' to enable local caching on CIFS. +> +> As the cifs-utils (userspace) changes are not done yet, this patch enables +> 'fsc' by default to assist testing. +> +[...] +> @@ -1332,6 +1336,8 @@ cifs_parse_mount_options(char *options, const char *devname, +> printk(KERN_WARNING "CIFS: Mount option noac not " +> "supported. Instead set " +> "/proc/fs/cifs/LookupCacheEnabled to 0\n"); +> + } else if (strnicmp(data, "fsc", 3) == 0) { +> + vol->fsc = true; +> } else +> printk(KERN_WARNING "CIFS: Unknown mount option %s\n", +> data); +> @@ -2405,6 +2411,8 @@ static void setup_cifs_sb(struct smb_vol *pvolume_info, +> cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_OVERR_GID; +> if (pvolume_info->dynperm) +> cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_DYNPERM; +> + if (pvolume_info->fsc) +> + cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_FSCACHE; +> if (pvolume_info->direct_io) { +> cFYI(1, "mounting share using direct i/o"); +> cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_DIRECT_IO; +> +I reworked the CIFS mount option parsing a while back; I'm not sure +whether that patch was going to be in the 2.6.35 tree or not (the window +just opened, didn't it?). + +Jeff, Steve, can you confirm if that patch is going to be in 2.6.35? + +Patch refs: http://patchwork.ozlabs.org/patch/53059/ and +http://patchwork.ozlabs.org/patch/53674/ + + + + + diff --git a/test/corpora/lkml/cur/1382298587.002878:2, b/test/corpora/lkml/cur/1382298587.002878:2, new file mode 100644 index 00000000..66a3e223 --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.002878:2, @@ -0,0 +1,90 @@ +From: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +Subject: Re: [RFC][PATCH 10/10] cifs: add mount option to enable local caching +Date: Fri, 25 Jun 2010 16:18:12 +0530 +Lines: 47 +Message-ID: <4C24896C.4000903@suse.de> +References: <yes> <1277220309-3757-1-git-send-email-sjayaraman@suse.de> <4C225338.9010807@gmail.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 7bit +Cc: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +To: Scott Lovenberg <scott.lovenberg-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Fri Jun 25 12:48:27 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1OS6SO-0003QF-NW + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Fri, 25 Jun 2010 12:48:25 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1753965Ab0FYKsX (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Fri, 25 Jun 2010 06:48:23 -0400 +Received: from cantor.suse.de ([195.135.220.2]:46395 "EHLO mx1.suse.de" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1752612Ab0FYKsW (ORCPT <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); + Fri, 25 Jun 2010 06:48:22 -0400 +Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by mx1.suse.de (Postfix) with ESMTP id 60CED6CB00; + Fri, 25 Jun 2010 12:48:21 +0200 (CEST) +User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.5) Gecko/20091130 SUSE/3.0.0-1.1.1 Thunderbird/3.0 +In-Reply-To: <4C225338.9010807-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1002912> + +On 06/24/2010 12:02 AM, Scott Lovenberg wrote: +> On 6/22/2010 11:25 AM, Suresh Jayaraman wrote: +>> Add a mount option 'fsc' to enable local caching on CIFS. +>> +>> As the cifs-utils (userspace) changes are not done yet, this patch +>> enables +>> 'fsc' by default to assist testing. +>> +> [...] +>> @@ -1332,6 +1336,8 @@ cifs_parse_mount_options(char *options, const +>> char *devname, +>> printk(KERN_WARNING "CIFS: Mount option noac not " +>> "supported. Instead set " +>> "/proc/fs/cifs/LookupCacheEnabled to 0\n"); +>> + } else if (strnicmp(data, "fsc", 3) == 0) { +>> + vol->fsc = true; +>> } else +>> printk(KERN_WARNING "CIFS: Unknown mount option %s\n", +>> data); +>> @@ -2405,6 +2411,8 @@ static void setup_cifs_sb(struct smb_vol +>> *pvolume_info, +>> cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_OVERR_GID; +>> if (pvolume_info->dynperm) +>> cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_DYNPERM; +>> + if (pvolume_info->fsc) +>> + cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_FSCACHE; +>> if (pvolume_info->direct_io) { +>> cFYI(1, "mounting share using direct i/o"); +>> cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_DIRECT_IO; +>> +> I reworked the CIFS mount option parsing a while back; I'm not sure +> whether that patch was going to be in the 2.6.35 tree or not (the window +> just opened, didn't it?). + +Not a problem, I could redo this patch alone when the reworked option +parsing patches get in. + +> Jeff, Steve, can you confirm if that patch is going to be in 2.6.35? +> +> Patch refs: http://patchwork.ozlabs.org/patch/53059/ and +> http://patchwork.ozlabs.org/patch/53674/ +> + +Thanks, + +-- +Suresh Jayaraman + + diff --git a/test/corpora/lkml/cur/1382298587.002912:2, b/test/corpora/lkml/cur/1382298587.002912:2, new file mode 100644 index 00000000..d9c761de --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.002912:2, @@ -0,0 +1,65 @@ +From: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +Subject: Re: [RFC][PATCH 06/10] cifs: define inode-level cache object and + register them +Date: Fri, 25 Jun 2010 18:20:14 +0530 +Lines: 24 +Message-ID: <4C24A606.5040001@suse.de> +References: <1277220214-3597-1-git-send-email-sjayaraman@suse.de> <yes> <9822.1277312573@redhat.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 7bit +Cc: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +To: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Fri Jun 25 14:50:26 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1OS8MR-0007EU-OS + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Fri, 25 Jun 2010 14:50:24 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1754607Ab0FYMuX (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Fri, 25 Jun 2010 08:50:23 -0400 +Received: from cantor2.suse.de ([195.135.220.15]:38716 "EHLO mx2.suse.de" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1753675Ab0FYMuW (ORCPT <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); + Fri, 25 Jun 2010 08:50:22 -0400 +Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) + by mx2.suse.de (Postfix) with ESMTP id B05E686A2E; + Fri, 25 Jun 2010 14:50:21 +0200 (CEST) +User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.5) Gecko/20091130 SUSE/3.0.0-1.1.1 Thunderbird/3.0 +In-Reply-To: <9822.1277312573-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1002946> + +On 06/23/2010 10:32 PM, David Howells wrote: +> Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> wrote: +> +>> Define inode-level data storage objects (managed by cifsInodeInfo structs). +>> Each inode-level object is created in a super-block level object and is +>> itself a data storage object in to which pages from the inode are stored. +>> +>> The inode object is keyed by UniqueId. The coherency data being used is +>> LastWriteTime and the file size. +> +> Isn't there a file creation time too? + +I think the creation time is currently being ignored as we won't be able +to accomodate in POSIX stat struct. + +> I take it you don't support caching on files that are open for writing at this +> time? +> + +Yes. + + +-- +Suresh Jayaraman + + diff --git a/test/corpora/lkml/cur/1382298587.002915:2, b/test/corpora/lkml/cur/1382298587.002915:2, new file mode 100644 index 00000000..e43c909f --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.002915:2, @@ -0,0 +1,58 @@ +From: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +Subject: Re: [RFC][PATCH 06/10] cifs: define inode-level cache object and register them +Date: Fri, 25 Jun 2010 13:55:49 +0100 +Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley + Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United + Kingdom. + Registered in England and Wales under Company Registration No. 3798903 +Lines: 12 +Message-ID: <22697.1277470549@redhat.com> +References: <4C24A606.5040001@suse.de> <1277220214-3597-1-git-send-email-sjayaraman@suse.de> <yes> <9822.1277312573@redhat.com> +Cc: dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, + linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +To: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Fri Jun 25 14:56:04 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1OS8Rw-0002tq-3k + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Fri, 25 Jun 2010 14:56:04 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1753622Ab0FYM4B (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Fri, 25 Jun 2010 08:56:01 -0400 +Received: from mx1.redhat.com ([209.132.183.28]:50162 "EHLO mx1.redhat.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1752535Ab0FYM4B (ORCPT <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); + Fri, 25 Jun 2010 08:56:01 -0400 +Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) + by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5PCtqOd018091 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); + Fri, 25 Jun 2010 08:55:52 -0400 +Received: from redhat.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) + by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5PCtn4G016466; + Fri, 25 Jun 2010 08:55:51 -0400 +In-Reply-To: <4C24A606.5040001-l3A5Bk7waGM@public.gmane.org> +X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1002949> + +Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> wrote: + +> I think the creation time is currently being ignored as we won't be able +> to accomodate in POSIX stat struct. + +The FS-Cache interface doesn't use the POSIX stat struct, but it could be +really useful to save it and use it for cache coherency inside the kernel. + +Out of interest, what does Samba do when it comes to generating a creation time +for UNIX where one does not exist? + +David + + diff --git a/test/corpora/lkml/cur/1382298587.002917:2, b/test/corpora/lkml/cur/1382298587.002917:2, new file mode 100644 index 00000000..f7047f84 --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.002917:2, @@ -0,0 +1,67 @@ +From: David Howells <dhowells@redhat.com> +Subject: Re: [RFC][PATCH 05/10] cifs: define superblock-level cache index objects and register them +Date: Fri, 25 Jun 2010 13:58:33 +0100 +Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley + Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United + Kingdom. + Registered in England and Wales under Company Registration No. 3798903 +Lines: 21 +Message-ID: <22746.1277470713@redhat.com> +References: <4C24A4A0.90408@suse.de> <1277220206-3559-1-git-send-email-sjayaraman@suse.de> <yes> <9720.1277312290@redhat.com> +Cc: dhowells@redhat.com, Steve French <smfrench@gmail.com>, + linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, + linux-kernel@vger.kernel.org +To: Suresh Jayaraman <sjayaraman@suse.de> +X-From: linux-fsdevel-owner@vger.kernel.org Fri Jun 25 15:02:20 2010 +Return-path: <linux-fsdevel-owner@vger.kernel.org> +Envelope-to: lnx-linux-fsdevel@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with smtp (Exim 4.69) + (envelope-from <linux-fsdevel-owner@vger.kernel.org>) + id 1OS8Xz-000628-FG + for lnx-linux-fsdevel@lo.gmane.org; Fri, 25 Jun 2010 15:02:19 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1755357Ab0FYM6k (ORCPT <rfc822;lnx-linux-fsdevel@m.gmane.org>); + Fri, 25 Jun 2010 08:58:40 -0400 +Received: from mx1.redhat.com ([209.132.183.28]:50417 "EHLO mx1.redhat.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1754086Ab0FYM6j (ORCPT <rfc822;linux-fsdevel@vger.kernel.org>); + Fri, 25 Jun 2010 08:58:39 -0400 +Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) + by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5PCwa7Z005113 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); + Fri, 25 Jun 2010 08:58:36 -0400 +Received: from redhat.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) + by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5PCwXVB011094; + Fri, 25 Jun 2010 08:58:34 -0400 +In-Reply-To: <4C24A4A0.90408@suse.de> +X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 +Sender: linux-fsdevel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-fsdevel.vger.kernel.org> +X-Mailing-List: linux-fsdevel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1002951> + +Suresh Jayaraman <sjayaraman@suse.de> wrote: + +> Also, considering the UNC name of the resource (//server/share) may not +> be a good idea too as the cache will not be used when for e.g. IPaddress +> is used to mount. + +You could convert the UNC name to an IP address, and just use that as your +key. + +> > validate the root directory of the share in some way? +> +> I don't know if there is a way to do this. + +Is there an inode number or something? Even the creation time might do. + +David +-- +To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + + diff --git a/test/corpora/lkml/cur/1382298587.002997:2, b/test/corpora/lkml/cur/1382298587.002997:2, new file mode 100644 index 00000000..b78073cd --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.002997:2, @@ -0,0 +1,90 @@ +From: Jeff Layton <jlayton-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org> +Subject: Re: [RFC][PATCH 06/10] cifs: define inode-level cache object and + register them +Date: Fri, 25 Jun 2010 12:53:06 -0400 +Lines: 36 +Message-ID: <20100625125306.7f9b1966@tlielax.poochiereds.net> +References: <4C24A606.5040001@suse.de> + <1277220214-3597-1-git-send-email-sjayaraman@suse.de> + <yes> + <9822.1277312573@redhat.com> + <22697.1277470549@redhat.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=US-ASCII +Content-Transfer-Encoding: 7bit +Cc: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org>, + Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + samba-technical-w/Ol4Ecudpl8XjKLYN78aQ@public.gmane.org +To: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Fri Jun 25 18:53:12 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1OSC9P-0005Eb-SU + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Fri, 25 Jun 2010 18:53:12 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S932199Ab0FYQxK (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Fri, 25 Jun 2010 12:53:10 -0400 +Received: from cdptpa-omtalb.mail.rr.com ([75.180.132.122]:53512 "EHLO + cdptpa-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S932187Ab0FYQxJ (ORCPT + <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); Fri, 25 Jun 2010 12:53:09 -0400 +X-Authority-Analysis: v=1.0 c=1 a=iVNVO0OCT3kA:10 a=yQWWgrYGNuUA:10 a=kj9zAlcOel0A:10 a=20KFwNOVAAAA:8 a=hGzw-44bAAAA:8 a=f0L6POiToRdS6aViIA4A:9 a=tdNtT7bw1iHNm6ggrCkIte35EhAA:4 a=CjuIK1q_8ugA:10 a=jEp0ucaQiEUA:10 a=0kPLrQdw3YYA:10 a=dowx1zmaLagA:10 a=00U40p1LBqVLw4jT:21 a=gh7LVOPznGai4vo_:21 +X-Cloudmark-Score: 0 +X-Originating-IP: 71.70.153.3 +Received: from [71.70.153.3] ([71.70.153.3:42266] helo=mail.poochiereds.net) + by cdptpa-oedge01.mail.rr.com (envelope-from <jlayton-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org>) + (ecelerity 2.2.2.39 r()) with ESMTP + id 2D/E0-24471-3FED42C4; Fri, 25 Jun 2010 16:53:08 +0000 +Received: from tlielax.poochiereds.net (tlielax.poochiereds.net [192.168.1.3]) + by mail.poochiereds.net (Postfix) with ESMTPS id E9B19580FA; + Fri, 25 Jun 2010 12:53:06 -0400 (EDT) +In-Reply-To: <22697.1277470549-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +X-Mailer: Claws Mail 3.7.6 (GTK+ 2.20.1; x86_64-redhat-linux-gnu) +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1003033> + +On Fri, 25 Jun 2010 13:55:49 +0100 +David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote: + +> Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> wrote: +> +> > I think the creation time is currently being ignored as we won't be able +> > to accomodate in POSIX stat struct. +> +> The FS-Cache interface doesn't use the POSIX stat struct, but it could be +> really useful to save it and use it for cache coherency inside the kernel. +> +> Out of interest, what does Samba do when it comes to generating a creation time +> for UNIX where one does not exist? +> + +(cc'ing samba-technical since we're talking about the create time) + +Looks like it mostly uses the ctime. IMO, the mtime would be a better +choice since it changes less frequently, but I don't guess that it +matters very much. + +I have a few patches that make the cifs_iget code do more stringent +checks. One of those makes it use the create time like an i_generation +field to guard against matching inodes that have the same number but +that have undergone a delete/create cycle. They need a bit more testing +but I'm planning to post them in time for 2.6.36. + +Because of how samba generates this number, it could be somewhat +problematic to do this. What may save us though is that Linux<->Samba +mostly uses unix extensions unless someone has specifically disabled +them on either end. The unix extension calls don't generally send any +sort of create time field, so we can't rely on it in those codepaths +anyway. + +-- +Jeff Layton <jlayton-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org> + + diff --git a/test/corpora/lkml/cur/1382298587.003106:2, b/test/corpora/lkml/cur/1382298587.003106:2, new file mode 100644 index 00000000..19ea381d --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.003106:2, @@ -0,0 +1,60 @@ +From: David Howells <dhowells@redhat.com> +Subject: Re: [RFC][PATCH 06/10] cifs: define inode-level cache object and register them +Date: Fri, 25 Jun 2010 22:46:38 +0100 +Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley + Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United + Kingdom. + Registered in England and Wales under Company Registration No. 3798903 +Lines: 13 +Message-ID: <18628.1277502398@redhat.com> +References: <20100625125306.7f9b1966@tlielax.poochiereds.net> <4C24A606.5040001@suse.de> <1277220214-3597-1-git-send-email-sjayaraman@suse.de> <yes> <9822.1277312573@redhat.com> <22697.1277470549@redhat.com> +Cc: dhowells@redhat.com, Suresh Jayaraman <sjayaraman@suse.de>, + Steve French <smfrench@gmail.com>, linux-cifs@vger.kernel.org, + linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, + samba-technical@lists.samba.org +To: Jeff Layton <jlayton@samba.org> +X-From: linux-kernel-owner@vger.kernel.org Fri Jun 25 23:47:07 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1OSGjo-0006q8-ME + for glk-linux-kernel-3@lo.gmane.org; Fri, 25 Jun 2010 23:47:05 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S932250Ab0FYVqv (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Fri, 25 Jun 2010 17:46:51 -0400 +Received: from mx1.redhat.com ([209.132.183.28]:55406 "EHLO mx1.redhat.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932088Ab0FYVqs (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Fri, 25 Jun 2010 17:46:48 -0400 +Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) + by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5PLkhIG005974 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); + Fri, 25 Jun 2010 17:46:43 -0400 +Received: from redhat.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) + by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5PLkd77017768; + Fri, 25 Jun 2010 17:46:40 -0400 +In-Reply-To: <20100625125306.7f9b1966@tlielax.poochiereds.net> +X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1003142> + +Jeff Layton <jlayton@samba.org> wrote: + +> Looks like it mostly uses the ctime. IMO, the mtime would be a better +> choice since it changes less frequently, but I don't guess that it +> matters very much. + +I'd've thought mtime changes more frequently since that's altered when data is +written. ctime is changed when attributes are changed. + +Note that Ext4 appears to have a file creation time field in its inode +(struct ext4_inode::i_crtime[_extra]). Can Samba be made to use that? + +David + + diff --git a/test/corpora/lkml/cur/1382298587.003112:2, b/test/corpora/lkml/cur/1382298587.003112:2, new file mode 100644 index 00000000..e74a864c --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.003112:2, @@ -0,0 +1,105 @@ +From: Jeff Layton <jlayton@samba.org> +Subject: Re: [RFC][PATCH 06/10] cifs: define inode-level cache object and + register them +Date: Fri, 25 Jun 2010 18:26:51 -0400 +Lines: 30 +Message-ID: <20100625182651.36800d06@tlielax.poochiereds.net> +References: <20100625125306.7f9b1966@tlielax.poochiereds.net> + <4C24A606.5040001@suse.de> + <1277220214-3597-1-git-send-email-sjayaraman@suse.de> <yes> + <9822.1277312573@redhat.com> <22697.1277470549@redhat.com> + <18628.1277502398@redhat.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=US-ASCII +Content-Transfer-Encoding: 7bit +Cc: linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, + linux-kernel@vger.kernel.org, Steve French <smfrench@gmail.com>, + linux-fsdevel@vger.kernel.org +To: David Howells <dhowells@redhat.com> +X-From: samba-technical-bounces@lists.samba.org Sat Jun 26 00:27:01 2010 +Return-path: <samba-technical-bounces@lists.samba.org> +Envelope-to: gnsi-samba-technical@m.gmane.org +Received: from fn.samba.org ([216.83.154.106] helo=lists.samba.org) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <samba-technical-bounces@lists.samba.org>) + id 1OSHMS-0003Yl-G8 + for gnsi-samba-technical@m.gmane.org; Sat, 26 Jun 2010 00:27:01 +0200 +Received: from fn.samba.org (localhost [127.0.0.1]) + by lists.samba.org (Postfix) with ESMTP id 8919DAD2B8; + Fri, 25 Jun 2010 16:26:57 -0600 (MDT) +X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on fn.samba.org +X-Spam-Level: +X-Spam-Status: No, score=-1.7 required=3.8 tests=AWL,BAYES_00,SPF_NEUTRAL + autolearn=no version=3.2.5 +X-Original-To: samba-technical@lists.samba.org +Delivered-To: samba-technical@lists.samba.org +Received: from cdptpa-omtalb.mail.rr.com (cdptpa-omtalb.mail.rr.com + [75.180.132.122]) + by lists.samba.org (Postfix) with ESMTP id ECB66AD220 + for <samba-technical@lists.samba.org>; + Fri, 25 Jun 2010 16:26:51 -0600 (MDT) +X-Authority-Analysis: v=1.0 c=1 a=iVNVO0OCT3kA:10 a=yQWWgrYGNuUA:10 + a=kj9zAlcOel0A:10 a=20KFwNOVAAAA:8 a=hGzw-44bAAAA:8 + a=AraS79FXNJ3kHilSTm4A:9 a=3STw0N-n4mJG0pydffwA:7 + a=0uwppTlTaQ5HiYOalIavAxwTlvEA:4 a=CjuIK1q_8ugA:10 + a=jEp0ucaQiEUA:10 a=dowx1zmaLagA:10 +X-Cloudmark-Score: 0 +X-Originating-IP: 71.70.153.3 +Received: from [71.70.153.3] ([71.70.153.3:55553] helo=mail.poochiereds.net) + by cdptpa-oedge01.mail.rr.com (envelope-from <jlayton@samba.org>) + (ecelerity 2.2.2.39 r()) with ESMTP + id 78/FA-24471-C2D252C4; Fri, 25 Jun 2010 22:26:53 +0000 +Received: from tlielax.poochiereds.net (tlielax.poochiereds.net [192.168.1.3]) + by mail.poochiereds.net (Postfix) with ESMTPS id 68F07580FA; + Fri, 25 Jun 2010 18:26:52 -0400 (EDT) +In-Reply-To: <18628.1277502398@redhat.com> +X-Mailer: Claws Mail 3.7.6 (GTK+ 2.20.1; x86_64-redhat-linux-gnu) +X-BeenThere: samba-technical@lists.samba.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Discussions on Samba internals. For general questions please + subscribe to the list samba@samba.org" + <samba-technical.lists.samba.org> +List-Unsubscribe: <https://lists.samba.org/mailman/options/samba-technical>, + <mailto:samba-technical-request@lists.samba.org?subject=unsubscribe> +List-Archive: <http://lists.samba.org/pipermail/samba-technical> +List-Post: <mailto:samba-technical@lists.samba.org> +List-Help: <mailto:samba-technical-request@lists.samba.org?subject=help> +List-Subscribe: <https://lists.samba.org/mailman/listinfo/samba-technical>, + <mailto:samba-technical-request@lists.samba.org?subject=subscribe> +Sender: samba-technical-bounces@lists.samba.org +Errors-To: samba-technical-bounces@lists.samba.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1003148> + +On Fri, 25 Jun 2010 22:46:38 +0100 +David Howells <dhowells@redhat.com> wrote: + +> Jeff Layton <jlayton@samba.org> wrote: +> +> > Looks like it mostly uses the ctime. IMO, the mtime would be a better +> > choice since it changes less frequently, but I don't guess that it +> > matters very much. +> +> I'd've thought mtime changes more frequently since that's altered when data is +> written. ctime is changed when attributes are changed. +> + +IIUC, updating mtime for a write is also an attribute change, and that +affects ctime. According to the stat(2) manpage: + + The field st_ctime is changed by writing or by setting inode informa- + tion (i.e., owner, group, link count, mode, etc.). + +> Note that Ext4 appears to have a file creation time field in its inode +> (struct ext4_inode::i_crtime[_extra]). Can Samba be made to use that? +> + +Is it exposed to userspace in any (standard) way? It would be handy to +have that. While we're wishing...it might also be nice to have a +standard way to get at the i_generation from userspace too. + +-- +Jeff Layton <jlayton@samba.org> + + + diff --git a/test/corpora/lkml/cur/1382298587.003117:2, b/test/corpora/lkml/cur/1382298587.003117:2, new file mode 100644 index 00000000..7f53e34b --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.003117:2, @@ -0,0 +1,65 @@ +From: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +Subject: Re: [RFC][PATCH 06/10] cifs: define inode-level cache object and register them +Date: Sat, 26 Jun 2010 00:04:28 +0100 +Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley + Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United + Kingdom. + Registered in England and Wales under Company Registration No. 3798903 +Lines: 18 +Message-ID: <20123.1277507068@redhat.com> +References: <20100625182651.36800d06@tlielax.poochiereds.net> <20100625125306.7f9b1966@tlielax.poochiereds.net> <4C24A606.5040001@suse.de> <1277220214-3597-1-git-send-email-sjayaraman@suse.de> <yes> <9822.1277312573@redhat.com> <22697.1277470549@redhat.com> <18628.1277502398@redhat.com> +Cc: dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org>, + Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + samba-technical-w/Ol4Ecudpl8XjKLYN78aQ@public.gmane.org +To: Jeff Layton <jlayton-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Sat Jun 26 01:04:45 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1OSHww-0006Jk-NV + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Sat, 26 Jun 2010 01:04:43 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1751807Ab0FYXEl (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Fri, 25 Jun 2010 19:04:41 -0400 +Received: from mx1.redhat.com ([209.132.183.28]:62977 "EHLO mx1.redhat.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1752149Ab0FYXEl (ORCPT <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); + Fri, 25 Jun 2010 19:04:41 -0400 +Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) + by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5PN4X40004498 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); + Fri, 25 Jun 2010 19:04:34 -0400 +Received: from redhat.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) + by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5PN4Sld008220; + Fri, 25 Jun 2010 19:04:30 -0400 +In-Reply-To: <20100625182651.36800d06-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org> +X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1003153> + +Jeff Layton <jlayton-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org> wrote: + +> IIUC, updating mtime for a write is also an attribute change, and that +> affects ctime. According to the stat(2) manpage: + +You're right. Okay, ctime is the more frequently changed. + +> > Note that Ext4 appears to have a file creation time field in its inode +> > (struct ext4_inode::i_crtime[_extra]). Can Samba be made to use that? +> +> Is it exposed to userspace in any (standard) way? It would be handy to +> have that. While we're wishing...it might also be nice to have a +> standard way to get at the i_generation from userspace too. + +Not at present, but it's something that could be exported by ioctl() or +getxattr(). + +David + + diff --git a/test/corpora/lkml/cur/1382298587.003118:2, b/test/corpora/lkml/cur/1382298587.003118:2, new file mode 100644 index 00000000..a1ec438b --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.003118:2, @@ -0,0 +1,122 @@ +From: Steve French <smfrench@gmail.com> +Subject: Re: [RFC][PATCH 06/10] cifs: define inode-level cache object and + register them +Date: Fri, 25 Jun 2010 18:05:30 -0500 +Lines: 51 +Message-ID: <AANLkTilOTrHLvLv4XWYZO6xCnYZgYT7gO2M-oKZ6VvqM@mail.gmail.com> +References: <20100625125306.7f9b1966@tlielax.poochiereds.net> + <4C24A606.5040001@suse.de> + <1277220214-3597-1-git-send-email-sjayaraman@suse.de> + <9822.1277312573@redhat.com> + <22697.1277470549@redhat.com> + <18628.1277502398@redhat.com> + <20100625182651.36800d06@tlielax.poochiereds.net> +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: QUOTED-PRINTABLE +Cc: David Howells <dhowells@redhat.com>, + Suresh Jayaraman <sjayaraman@suse.de>, + linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, + linux-kernel@vger.kernel.org, samba-technical@lists.samba.org, + Jeff Layton <jlayton@redhat.com> +To: Jeff Layton <jlayton@samba.org>, + "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>, + Mingming Cao <mcao@us.ibm.com> +X-From: linux-kernel-owner@vger.kernel.org Sat Jun 26 01:05:41 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1OSHxs-0006a8-BA + for glk-linux-kernel-3@lo.gmane.org; Sat, 26 Jun 2010 01:05:40 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1756188Ab0FYXFd convert rfc822-to-quoted-printable (ORCPT + <rfc822;glk-linux-kernel-3@m.gmane.org>); + Fri, 25 Jun 2010 19:05:33 -0400 +Received: from mail-qw0-f46.google.com ([209.85.216.46]:51369 "EHLO + mail-qw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1751575Ab0FYXFb convert rfc822-to-8bit (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Fri, 25 Jun 2010 19:05:31 -0400 +Received: by qwi4 with SMTP id 4so742644qwi.19 + for <multiple recipients>; Fri, 25 Jun 2010 16:05:30 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=gmail.com; s=gamma; + h=domainkey-signature:mime-version:received:received:in-reply-to + :references:date:message-id:subject:from:to:cc:content-type + :content-transfer-encoding; + bh=6wKQkGOEeUGN4oPR3Nm4SRxtJr/EBwN8ENmpLnfdCDU=; + b=X7L6W0MtpQeW/4iBuj+oDlcP2yCJ3qwUs9lHBq1fRW6WdYblHXjmaN8o++3GDPLAg5 + 0MD07zxbYTGXRSrgCjCrGVm0tT88/6hY2a/rB8g68h/Qso2sIHa7B1iIN8JRR4pPWle0 + sVjp9Xy/bQn2e0uE481Ii1TLHuWYA/QDXZreU= +DomainKey-Signature: a=rsa-sha1; c=nofws; + d=gmail.com; s=gamma; + h=mime-version:in-reply-to:references:date:message-id:subject:from:to + :cc:content-type:content-transfer-encoding; + b=B+7qQvdOpN5a/KCRrDbssKZX8D3SnP73VMHd9RpkqP9nCHCmSLAgbeH03+/m6CLVAo + G+NKWqWtknwPBkYqT/bdP2XEak1yr+0rjOqjUaNvaT7AhzsyHEJBkaNnsbS3qaRy39OP + S7OkAyHfmgdeNAHkKnKRF73hfpvgAqR9X4bn8= +Received: by 10.224.59.223 with SMTP id m31mr1130670qah.63.1277507130411; Fri, + 25 Jun 2010 16:05:30 -0700 (PDT) +Received: by 10.229.46.136 with HTTP; Fri, 25 Jun 2010 16:05:30 -0700 (PDT) +In-Reply-To: <20100625182651.36800d06@tlielax.poochiereds.net> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1003154> + +On Fri, Jun 25, 2010 at 5:26 PM, Jeff Layton <jlayton@samba.org> wrote: +> +> On Fri, 25 Jun 2010 22:46:38 +0100 +> David Howells <dhowells@redhat.com> wrote: +> +> > Jeff Layton <jlayton@samba.org> wrote: +> > +> > > Looks like it mostly uses the ctime. IMO, the mtime would be a be= +tter +> > > choice since it changes less frequently, but I don't guess that i= +t +> > > matters very much. +> > +> > I'd've thought mtime changes more frequently since that's altered w= +hen data is +> > written. =A0ctime is changed when attributes are changed. +> > +> +> IIUC, updating mtime for a write is also an attribute change, and tha= +t +> affects ctime. According to the stat(2) manpage: +> +> =A0 =A0 =A0 The field st_ctime is changed by writing or by setting =A0= +inode =A0informa- +> =A0 =A0 =A0 tion (i.e., owner, group, link count, mode, etc.). +> +> > Note that Ext4 appears to have a file creation time field in its in= +ode +> > (struct ext4_inode::i_crtime[_extra]). =A0Can Samba be made to use = +that? +> > +> +> Is it exposed to userspace in any (standard) way? It would be handy t= +o +> have that. While we're wishing...it might also be nice to have a +> standard way to get at the i_generation from userspace too. +> + +Yes - I have talked with MingMing and Aneesh about those (NFS may +someday be able to use those too).=A0 An obstacle in the past had been +that samba server stores its own fake creation time in an ndr encoded +xattr which complicates things. + +MingMing/Annesh - +Xattr or other way to get at birth time? + + +-- +Thanks, + +Steve + + diff --git a/test/corpora/lkml/cur/1382298587.003171:2, b/test/corpora/lkml/cur/1382298587.003171:2, new file mode 100644 index 00000000..66e425ef --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.003171:2, @@ -0,0 +1,174 @@ +From: Mingming Cao <mcao@us.ibm.com> +Subject: Re: [RFC][PATCH 06/10] cifs: define inode-level cache object and + register them +Date: Fri, 25 Jun 2010 17:52:24 -0700 +Lines: 92 +Message-ID: <OFB55E8EC7.E8DD23D5-ON8725774E.0004921E-8825774E.0004CC31@us.ibm.com> +References: <20100625125306.7f9b1966@tlielax.poochiereds.net> <4C24A606.5040001@suse.de> + <1277220214-3597-1-git-send-email-sjayaraman@suse.de> <9822.1277312573@redhat.com> + <22697.1277470549@redhat.com> <18628.1277502398@redhat.com> <20100625182651.36800d06@tlielax.poochiereds.net> + <AANLkTilOTrHLvLv4XWYZO6xCnYZgYT7gO2M-oKZ6VvqM@mail.gmail.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: quoted-printable +Cc: linux-cifs@vger.kernel.org, Jeff Layton <jlayton@redhat.com>, + samba-technical@lists.samba.org, linux-kernel@vger.kernel.org, + David Howells <dhowells@redhat.com>, linux-fsdevel@vger.kernel.org, + "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> +To: Steve French <smfrench@gmail.com> +X-From: samba-technical-bounces@lists.samba.org Sat Jun 26 13:36:56 2010 +Return-path: <samba-technical-bounces@lists.samba.org> +Envelope-to: gnsi-samba-technical@m.gmane.org +Received: from fn.samba.org ([216.83.154.106] helo=lists.samba.org) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <samba-technical-bounces@lists.samba.org>) + id 1OSTgu-00025d-6P + for gnsi-samba-technical@m.gmane.org; Sat, 26 Jun 2010 13:36:56 +0200 +Received: from fn.samba.org (localhost [127.0.0.1]) + by lists.samba.org (Postfix) with ESMTP id 1ED11AD2C4; + Sat, 26 Jun 2010 05:36:45 -0600 (MDT) +X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on fn.samba.org +X-Spam-Level: +X-Spam-Status: No, score=-6.6 required=3.8 tests=BAYES_00,HTML_MESSAGE, + RCVD_IN_DNSWL_MED,SPF_PASS autolearn=ham version=3.2.5 +X-Original-To: samba-technical@lists.samba.org +Delivered-To: samba-technical@lists.samba.org +Received: from e34.co.us.ibm.com (e34.co.us.ibm.com [32.97.110.152]) + by lists.samba.org (Postfix) with ESMTP id 30F90AD282 + for <samba-technical@lists.samba.org>; + Fri, 25 Jun 2010 18:52:24 -0600 (MDT) +Received: from d03relay01.boulder.ibm.com (d03relay01.boulder.ibm.com + [9.17.195.226]) + by e34.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id o5Q0iN1h017083 + for <samba-technical@lists.samba.org>; Fri, 25 Jun 2010 18:44:23 -0600 +Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) + by d03relay01.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id + o5Q0qQTN175324 + for <samba-technical@lists.samba.org>; Fri, 25 Jun 2010 18:52:26 -0600 +Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) + by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP + id o5Q0qPCF006767 + for <samba-technical@lists.samba.org>; Fri, 25 Jun 2010 18:52:26 -0600 +Received: from d03nm128.boulder.ibm.com (d03nm128.boulder.ibm.com + [9.17.195.32]) + by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id + o5Q0qPrh006760; Fri, 25 Jun 2010 18:52:25 -0600 +In-Reply-To: <AANLkTilOTrHLvLv4XWYZO6xCnYZgYT7gO2M-oKZ6VvqM@mail.gmail.com> +X-KeepSent: B55E8EC7:E8DD23D5-8725774E:0004921E; + type=4; name=$KeepSent +X-Mailer: Lotus Notes Build V852_M2_03302010 March 30, 2010 +X-MIMETrack: Serialize by Router on D03NM128/03/M/IBM(Release 8.0.1|February + 07, 2008) at 06/25/2010 18:52:25 +X-Mailman-Approved-At: Sat, 26 Jun 2010 05:36:42 -0600 +X-Content-Filtered-By: Mailman/MimeDel 2.1.12 +X-BeenThere: samba-technical@lists.samba.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Discussions on Samba internals. For general questions please + subscribe to the list samba@samba.org" + <samba-technical.lists.samba.org> +List-Unsubscribe: <https://lists.samba.org/mailman/options/samba-technical>, + <mailto:samba-technical-request@lists.samba.org?subject=unsubscribe> +List-Archive: <http://lists.samba.org/pipermail/samba-technical> +List-Post: <mailto:samba-technical@lists.samba.org> +List-Help: <mailto:samba-technical-request@lists.samba.org?subject=help> +List-Subscribe: <https://lists.samba.org/mailman/listinfo/samba-technical>, + <mailto:samba-technical-request@lists.samba.org?subject=subscribe> +Sender: samba-technical-bounces@lists.samba.org +Errors-To: samba-technical-bounces@lists.samba.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1003208> + + + +Steve French <smfrench@gmail.com> wrote on 06/25/2010 04:05:30 PM: + +> Steve French <smfrench@gmail.com> +> 06/25/2010 04:05 PM +> +> To +> +> Jeff Layton <jlayton@samba.org>, "Aneesh Kumar K.V" +> <aneesh.kumar@linux.vnet.ibm.com>, Mingming Cao/Beaverton/IBM@IBMUS +> +> cc +> +> David Howells <dhowells@redhat.com>, Suresh Jayaraman +> <sjayaraman@suse.de>, linux-cifs@vger.kernel.org, linux- +> fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, samba- +> technical@lists.samba.org, Jeff Layton <jlayton@redhat.com> +> +> Subject +> +> Re: [RFC][PATCH 06/10] cifs: define inode-level cache object and +> register them +> +> On Fri, Jun 25, 2010 at 5:26 PM, Jeff Layton <jlayton@samba.org> wrot= +e: +> > +> > On Fri, 25 Jun 2010 22:46:38 +0100 +> > David Howells <dhowells@redhat.com> wrote: +> > +> > > Jeff Layton <jlayton@samba.org> wrote: +> > > +> > > > Looks like it mostly uses the ctime. IMO, the mtime would be a +better +> > > > choice since it changes less frequently, but I don't guess that= + it +> > > > matters very much. +> > > +> > > I'd've thought mtime changes more frequently since that's +> altered when data is +> > > written. =A0ctime is changed when attributes are changed. +> > > +> > +> > IIUC, updating mtime for a write is also an attribute change, and t= +hat +> > affects ctime. According to the stat(2) manpage: +> > +> > =A0 =A0 =A0 The field st_ctime is changed by writing or by setting +> =A0inode =A0informa- +> > =A0 =A0 =A0 tion (i.e., owner, group, link count, mode, etc.). +> > +> > > Note that Ext4 appears to have a file creation time field in its +inode +> > > (struct ext4_inode::i_crtime[_extra]). =A0Can Samba be made to us= +e +that? +> > > +> > +> > Is it exposed to userspace in any (standard) way? It would be handy= + to +> > have that. While we're wishing...it might also be nice to have a +> > standard way to get at the i_generation from userspace too. +> > +> +> Yes - I have talked with MingMing and Aneesh about those (NFS may +> someday be able to use those too).=A0 An obstacle in the past had bee= +n +> that samba server stores its own fake creation time in an ndr encoded= + +> xattr which complicates things. +> +> MingMing/Annesh - +> Xattr or other way to get at birth time? +> +> + +Not yet, + The ext4 file creation time only accesable from the kernel at the mome= +nt. +There were discussion +to make this information avaliable via xattr before, but was rejected, +since most people +agree that making this info avalibele via stat() is more standard. Howe= +ver +modifying stat() would imply +big interface change. thus no action has been taken yet. + +> -- +> Thanks, +> +> Steve= + + + diff --git a/test/corpora/lkml/cur/1382298587.003317:2, b/test/corpora/lkml/cur/1382298587.003317:2, new file mode 100644 index 00000000..6fce5182 --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.003317:2, @@ -0,0 +1,156 @@ +From: "Aneesh Kumar K. V" <aneesh.kumar@linux.vnet.ibm.com> +Subject: Re: [RFC][PATCH 06/10] cifs: define inode-level cache object and register them +Date: Sun, 27 Jun 2010 23:47:21 +0530 +Lines: 100 +Message-ID: <871vbscpce.fsf@linux.vnet.ibm.com> +References: <20100625125306.7f9b1966@tlielax.poochiereds.net> <4C24A606.5040001@suse.de> <1277220214-3597-1-git-send-email-sjayaraman@suse.de> <9822.1277312573@redhat.com> <22697.1277470549@redhat.com> <18628.1277502398@redhat.com> <20100625182651.36800d06@tlielax.poochiereds.net> <AANLkTilOTrHLvLv4XWYZO6xCnYZgYT7gO2M-oKZ6VvqM@mail.gmail.com> <OFB55E8EC7.E8DD23D5-ON8725774E.0004921E-8825774E.0004CC31@us.ibm.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: QUOTED-PRINTABLE +Cc: David Howells <dhowells@redhat.com>, + Jeff Layton <jlayton@redhat.com>, + Jeff Layton <jlayton@samba.org>, linux-cifs@vger.kernel.org, + linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, + samba-technical@lists.samba.org, + Suresh Jayaraman <sjayaraman@suse.de> +To: Mingming Cao <mcao@us.ibm.com>, Steve French <smfrench@gmail.com>, + "DENIEL Philippe" <philippe.deniel@cea.fr> +X-From: linux-kernel-owner@vger.kernel.org Sun Jun 27 20:18:00 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1OSwQZ-0003Kh-Vu + for glk-linux-kernel-3@lo.gmane.org; Sun, 27 Jun 2010 20:18:00 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1754631Ab0F0SRq convert rfc822-to-quoted-printable (ORCPT + <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 27 Jun 2010 14:17:46 -0400 +Received: from e23smtp07.au.ibm.com ([202.81.31.140]:52430 "EHLO + e23smtp07.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1753837Ab0F0SRl convert rfc822-to-8bit (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Sun, 27 Jun 2010 14:17:41 -0400 +Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [202.81.31.247]) + by e23smtp07.au.ibm.com (8.14.4/8.13.1) with ESMTP id o5RIHbfJ012483; + Mon, 28 Jun 2010 04:17:37 +1000 +Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) + by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o5RIHW9f1130634; + Mon, 28 Jun 2010 04:17:32 +1000 +Received: from d23av03.au.ibm.com (loopback [127.0.0.1]) + by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o5RIHVcR027534; + Mon, 28 Jun 2010 04:17:32 +1000 +Received: from skywalker.linux.vnet.ibm.com ([9.77.196.78]) + by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id o5RIHMFl027485; + Mon, 28 Jun 2010 04:17:24 +1000 +In-Reply-To: <OFB55E8EC7.E8DD23D5-ON8725774E.0004921E-8825774E.0004CC31@us.ibm.com> +User-Agent: Notmuch/ (http://notmuchmail.org) Emacs/24.0.50.1 (i686-pc-linux-gnu) +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1003357> + +On Fri, 25 Jun 2010 17:52:24 -0700, Mingming Cao <mcao@us.ibm.com> wrot= +e: +>=20 +>=20 +> Steve French <smfrench@gmail.com> wrote on 06/25/2010 04:05:30 PM: +>=20 +> > Steve French <smfrench@gmail.com> +> > 06/25/2010 04:05 PM +> > +> > To +> > +> > Jeff Layton <jlayton@samba.org>, "Aneesh Kumar K.V" +> > <aneesh.kumar@linux.vnet.ibm.com>, Mingming Cao/Beaverton/IBM@IBMUS +> > +> > cc +> > +> > David Howells <dhowells@redhat.com>, Suresh Jayaraman +> > <sjayaraman@suse.de>, linux-cifs@vger.kernel.org, linux- +> > fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, samba- +> > technical@lists.samba.org, Jeff Layton <jlayton@redhat.com> +> > +> > Subject +> > +> > Re: [RFC][PATCH 06/10] cifs: define inode-level cache object and +> > register them +> > +> > On Fri, Jun 25, 2010 at 5:26 PM, Jeff Layton <jlayton@samba.org> wr= +ote: +> > > +> > > On Fri, 25 Jun 2010 22:46:38 +0100 +> > > David Howells <dhowells@redhat.com> wrote: +> > > +> > > > Jeff Layton <jlayton@samba.org> wrote: +> > > > +> > > > > Looks like it mostly uses the ctime. IMO, the mtime would be = +a +> better +> > > > > choice since it changes less frequently, but I don't guess th= +at it +> > > > > matters very much. +> > > > +> > > > I'd've thought mtime changes more frequently since that's +> > altered when data is +> > > > written. =C2=A0ctime is changed when attributes are changed. +> > > > +> > > +> > > IIUC, updating mtime for a write is also an attribute change, and= + that +> > > affects ctime. According to the stat(2) manpage: +> > > +> > > =C2=A0 =C2=A0 =C2=A0 The field st_ctime is changed by writing or = +by setting +> > =C2=A0inode =C2=A0informa- +> > > =C2=A0 =C2=A0 =C2=A0 tion (i.e., owner, group, link count, mode, = +etc.). +> > > +> > > > Note that Ext4 appears to have a file creation time field in it= +s +> inode +> > > > (struct ext4_inode::i_crtime[_extra]). =C2=A0Can Samba be made = +to use +> that? +> > > > +> > > +> > > Is it exposed to userspace in any (standard) way? It would be han= +dy to +> > > have that. While we're wishing...it might also be nice to have a +> > > standard way to get at the i_generation from userspace too. +> > > +> > +> > Yes - I have talked with MingMing and Aneesh about those (NFS may +> > someday be able to use those too).=C2=A0 An obstacle in the past ha= +d been +> > that samba server stores its own fake creation time in an ndr encod= +ed +> > xattr which complicates things. +> > +> > MingMing/Annesh - +> > Xattr or other way to get at birth time? +> > +> > +>=20 +> Not yet, +> The ext4 file creation time only accesable from the kernel at the mo= +ment. +> There were discussion +> to make this information avaliable via xattr before, but was rejected= +, +> since most people +> agree that making this info avalibele via stat() is more standard. Ho= +wever +> modifying stat() would imply +> big interface change. thus no action has been taken yet. + +NFS ganesha pNFS also had a requirement for getting i_generation and +inode number in userspace. So may be we should now look at updating +stat or add a variant syscall that include i_generation and create time +in the return value + +-aneesh + + diff --git a/test/corpora/lkml/cur/1382298587.003318:2, b/test/corpora/lkml/cur/1382298587.003318:2, new file mode 100644 index 00000000..058d1477 --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.003318:2, @@ -0,0 +1,66 @@ +From: Christoph Hellwig <hch-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> +Subject: Re: [RFC][PATCH 06/10] cifs: define inode-level cache object and + register them +Date: Sun, 27 Jun 2010 14:22:29 -0400 +Lines: 9 +Message-ID: <20100627182229.GA492@infradead.org> +References: <20100625125306.7f9b1966@tlielax.poochiereds.net> + <4C24A606.5040001@suse.de> + <1277220214-3597-1-git-send-email-sjayaraman@suse.de> + <9822.1277312573@redhat.com> + <22697.1277470549@redhat.com> + <18628.1277502398@redhat.com> + <20100625182651.36800d06@tlielax.poochiereds.net> + <AANLkTilOTrHLvLv4XWYZO6xCnYZgYT7gO2M-oKZ6VvqM@mail.gmail.com> + <OFB55E8EC7.E8DD23D5-ON8725774E.0004921E-8825774E.0004CC31@us.ibm.com> + <871vbscpce.fsf@linux.vnet.ibm.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Cc: Mingming Cao <mcao-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>, Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, + DENIEL Philippe <philippe.deniel-KCE40YydGKI@public.gmane.org>, + David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>, + Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>, + Jeff Layton <jlayton-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org>, linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + samba-technical-w/Ol4Ecudpl8XjKLYN78aQ@public.gmane.org, + Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +To: "Aneesh Kumar K. V" <aneesh.kumar-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Sun Jun 27 20:22:46 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1OSwVB-0005TI-SG + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Sun, 27 Jun 2010 20:22:46 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1752811Ab0F0SWo (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Sun, 27 Jun 2010 14:22:44 -0400 +Received: from bombadil.infradead.org ([18.85.46.34]:55433 "EHLO + bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1752728Ab0F0SWn (ORCPT + <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); Sun, 27 Jun 2010 14:22:43 -0400 +Received: from hch by bombadil.infradead.org with local (Exim 4.72 #1 (Red Hat Linux)) + id 1OSwUv-00009z-9N; Sun, 27 Jun 2010 18:22:29 +0000 +Content-Disposition: inline +In-Reply-To: <871vbscpce.fsf-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org> +User-Agent: Mutt/1.5.20 (2009-08-17) +X-SRS-Rewrite: SMTP reverse-path rewritten from <hch-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> by bombadil.infradead.org + See http://www.infradead.org/rpr.html +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1003358> + +On Sun, Jun 27, 2010 at 11:47:21PM +0530, Aneesh Kumar K. V wrote: +> NFS ganesha pNFS also had a requirement for getting i_generation and +> inode number in userspace. So may be we should now look at updating +> stat or add a variant syscall that include i_generation and create time +> in the return value + +What's missing in knfsd that you feel the sudden urge to move backwards +to a userspace nfsd (one with a horribly crappy codebase, too). + + + diff --git a/test/corpora/lkml/cur/1382298587.003486:2, b/test/corpora/lkml/cur/1382298587.003486:2, new file mode 100644 index 00000000..8831b450 --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.003486:2, @@ -0,0 +1,89 @@ +From: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +Subject: Re: [RFC][PATCH 05/10] cifs: define superblock-level cache index + objects and register them +Date: Mon, 28 Jun 2010 18:23:13 +0530 +Lines: 48 +Message-ID: <4C289B39.4060901@suse.de> +References: <22746.1277470713@redhat.com> <4C24A4A0.90408@suse.de> <1277220206-3559-1-git-send-email-sjayaraman@suse.de> <yes> <9720.1277312290@redhat.com> <23204.1277472412@redhat.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 7bit +Cc: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +To: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Mon Jun 28 14:53:24 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1OTDq0-00054Q-At + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Mon, 28 Jun 2010 14:53:24 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1754503Ab0F1MxX (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Mon, 28 Jun 2010 08:53:23 -0400 +Received: from cantor2.suse.de ([195.135.220.15]:48374 "EHLO mx2.suse.de" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1754456Ab0F1MxW (ORCPT <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); + Mon, 28 Jun 2010 08:53:22 -0400 +Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) + by mx2.suse.de (Postfix) with ESMTP id 7BDC18672B; + Mon, 28 Jun 2010 14:53:21 +0200 (CEST) +User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.5) Gecko/20091130 SUSE/3.0.0-1.1.1 Thunderbird/3.0 +In-Reply-To: <23204.1277472412-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1003530> + +On 06/25/2010 06:56 PM, David Howells wrote: +> David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote: +> +>>>> validate the root directory of the share in some way? +>>> +>>> I don't know if there is a way to do this. +>> +>> Is there an inode number or something? Even the creation time might do. +> +> Looking in cifspdu.h, there are a number of things that it might be possible +> to use. +> +> (1) FILE_ALL_INFO: CreationTime, IndexNumber, IndexNumber1, FileName +> (assuming this isn't flattened to '\' or something for the root of a +> share. +> +> (2) FILE_UNIX_BASIC_INFO: DevMajor, DevMinor, UniqueId. +> +> (3) FILE_INFO_STANDARD: CreationDate, CreationTime. +> +> (4) FILE_INFO_BASIC: CreationTime. +> +> (5) FILE_DIRECTORY_INFO: FileIndex, CreationTime, FileName. +> +> (6) SEARCH_ID_FULL_DIR_INFO: FileIndex, CreationTime, UniqueId, FileName. +> +> (7) FILE_BOTH_DIRECTORY_INFO: FileIndex, CreationTime, ShortName, FileName. +> +> (8) OPEN_RSP_EXT: Fid, CreationTime, VolumeGUID, FileId. +> +> You may have to choose different sets of things, depending on what the server +> has on offer. Also, don't forget, if you can't work out whether a share is + +Did you mean we need to validate differently for different servers? + +I just did some testing and it looks like we could rely on CreationTime, +IndexNumber for validating with Windows servers (FileName is relative to +the mapped drive) and UniqueId for validating with Samba servers. I did +not test all possibilities (there could be more). + +> coherent or not from the above, you can always use LastWriteTime, ChangeTime +> and EndOfFile and just discard the whole subtree if they differ. +> + +Thanks, + +-- +Suresh Jayaraman + + diff --git a/test/corpora/lkml/cur/1382298587.004581:2, b/test/corpora/lkml/cur/1382298587.004581:2, new file mode 100644 index 00000000..732bfa09 --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.004581:2, @@ -0,0 +1,92 @@ +From: Timur Tabi <timur.tabi@gmail.com> +Subject: Re: [PATCH v2 5/7] powerpc/85xx: Add MChk handler for SRIO port +Date: Wed, 30 Jun 2010 15:55:58 -0500 +Lines: 33 +Message-ID: <AANLkTine3pc2Ai2Woj81Y9fS_KgGs1sIMb2NMR6G74ww@mail.gmail.com> +References: <20100308191005.GE4324@amak.tundra.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: QUOTED-PRINTABLE +Cc: mporter@kernel.crashing.org, linux-kernel@vger.kernel.org, + linuxppc-dev@lists.ozlabs.org, thomas.moll@sysgo.com +To: Alexandre Bounine <abounine@tundra.com> +X-From: linux-kernel-owner@vger.kernel.org Wed Jun 30 22:56:40 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1OU4Kl-0005Kf-V4 + for glk-linux-kernel-3@lo.gmane.org; Wed, 30 Jun 2010 22:56:40 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1756668Ab0F3U4b convert rfc822-to-quoted-printable (ORCPT + <rfc822;glk-linux-kernel-3@m.gmane.org>); + Wed, 30 Jun 2010 16:56:31 -0400 +Received: from mail-vw0-f46.google.com ([209.85.212.46]:41333 "EHLO + mail-vw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1753416Ab0F3U43 convert rfc822-to-8bit (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Wed, 30 Jun 2010 16:56:29 -0400 +Received: by vws5 with SMTP id 5so1449398vws.19 + for <linux-kernel@vger.kernel.org>; Wed, 30 Jun 2010 13:56:28 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=gmail.com; s=gamma; + h=domainkey-signature:received:mime-version:received:in-reply-to + :references:from:date:message-id:subject:to:cc:content-type + :content-transfer-encoding; + bh=FTlit9cHTz/9rLGcvA5/pEZlzxAQ5x20v8HE5XYFwYM=; + b=NFbjnxZ4KwcjTy4tFh+BnhWPEGeYTw6z918yIouRaMmbEDph56xq26K9aTBokuYHqe + UgFjBn7XWcxvqJPyCetfsDRG+F3M2XwCq/DSCswSPtXSLsy8WKm7cMXVS3hjiO8sMZ97 + mRMGZkYBJHjWP+ulkBXiq6q7/OQuE8Dkl+rWM= +DomainKey-Signature: a=rsa-sha1; c=nofws; + d=gmail.com; s=gamma; + h=mime-version:in-reply-to:references:from:date:message-id:subject:to + :cc:content-type:content-transfer-encoding; + b=r0N6AOAg+TSvY2kPQPahldj4iRU9oUoSLtHA7JXG2QU4CR9O5GBhxAtr2aY99qUPZd + tFS0ZWRAb9cmOgiZhTpNxsBjCJ/e/DQ1ccP5rZ/U40q1SJ1KwN92hqpOoppZ0tkqSB7/ + UlQtsvPSK7a0bYqufEmscfAi98w1+mfZIbK6U= +Received: by 10.220.161.203 with SMTP id s11mr5093041vcx.195.1277931388141; + Wed, 30 Jun 2010 13:56:28 -0700 (PDT) +Received: by 10.220.161.137 with HTTP; Wed, 30 Jun 2010 13:55:58 -0700 (PDT) +In-Reply-To: <20100308191005.GE4324@amak.tundra.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1004632> + +On Mon, Mar 8, 2010 at 2:10 PM, Alexandre Bounine <abounine@tundra.com>= + wrote: +> +> From: Alexandre Bounine <alexandre.bounine@idt.com> +> +> Add Machine Check exception handling into RapidIO port driver +> for Freescale SoCs (MPC85xx). +> +> Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com> +> Tested-by: Thomas Moll <thomas.moll@sysgo.com> +=2E.. + +> +static int fsl_rio_mcheck_exception(struct pt_regs *regs) +> +{ +> + =A0 =A0 =A0 const struct exception_table_entry *entry =3D NULL; +> + =A0 =A0 =A0 unsigned long reason =3D (mfspr(SPRN_MCSR) & MCSR_MASK)= +; + +MCSR_MASK is not defined anywhere, so when I compile this code, I get t= +his: + + CC arch/powerpc/sysdev/fsl_rio.o +arch/powerpc/sysdev/fsl_rio.c: In function 'fsl_rio_mcheck_exception': +arch/powerpc/sysdev/fsl_rio.c:248: error: 'MCSR_MASK' undeclared +(first use in this function) +arch/powerpc/sysdev/fsl_rio.c:248: error: (Each undeclared identifier +is reported only once +arch/powerpc/sysdev/fsl_rio.c:248: error: for each function it appears = +in.) + +--=20 +Timur Tabi +Linux kernel developer at Freescale + + diff --git a/test/corpora/lkml/cur/1382298587.004582:2, b/test/corpora/lkml/cur/1382298587.004582:2, new file mode 100644 index 00000000..d149b721 --- /dev/null +++ b/test/corpora/lkml/cur/1382298587.004582:2, @@ -0,0 +1,68 @@ +From: Timur Tabi <timur.tabi@gmail.com> +Subject: Re: [PATCH v2 5/7] powerpc/85xx: Add MChk handler for SRIO port +Date: Wed, 30 Jun 2010 16:00:56 -0500 +Lines: 12 +Message-ID: <AANLkTinKbimKyLpvFD7KOvavshu_n8gRcp2BvEJj0XZQ@mail.gmail.com> +References: <20100308191005.GE4324@amak.tundra.com> <AANLkTine3pc2Ai2Woj81Y9fS_KgGs1sIMb2NMR6G74ww@mail.gmail.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Cc: mporter@kernel.crashing.org, linux-kernel@vger.kernel.org, + linuxppc-dev@lists.ozlabs.org, thomas.moll@sysgo.com +To: Alexandre Bounine <abounine@tundra.com> +X-From: linux-kernel-owner@vger.kernel.org Wed Jun 30 23:01:37 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1OU4PZ-0000HS-0T + for glk-linux-kernel-3@lo.gmane.org; Wed, 30 Jun 2010 23:01:37 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1755703Ab0F3VB2 (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Wed, 30 Jun 2010 17:01:28 -0400 +Received: from mail-vw0-f46.google.com ([209.85.212.46]:53141 "EHLO + mail-vw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1751784Ab0F3VB1 (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Wed, 30 Jun 2010 17:01:27 -0400 +Received: by vws5 with SMTP id 5so1454517vws.19 + for <linux-kernel@vger.kernel.org>; Wed, 30 Jun 2010 14:01:26 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=gmail.com; s=gamma; + h=domainkey-signature:received:mime-version:received:in-reply-to + :references:from:date:message-id:subject:to:cc:content-type; + bh=+BUKti+Oa03CrnVvRyT591FhcoxqR7S2rzZHtD6WSuY=; + b=O/b04HLJrmTE0aIq2mNCRznQrXxAAGHSMarHR5mrgYptmr68froM6UgmDqTZFLhNiH + BcT8g+AziiqSV1k/ckXjRyVR0s9Jdv4g2phMNtp8NStbPfOPpLDkUKTQadphOTonCfeK + e+ZrLBwh+FCoYNAOjvFioBKj6CxN2Oi5xIhPc= +DomainKey-Signature: a=rsa-sha1; c=nofws; + d=gmail.com; s=gamma; + h=mime-version:in-reply-to:references:from:date:message-id:subject:to + :cc:content-type; + b=UcKGhJIXCTTcSvBWwGwLUefPONGygVPsUnTt4nDSl4udB8JKMyi0EghzzgNXUyq4Dz + UCxzZAyxzjvjgsgPS3kzPhSsWG2PRG66pC1OA68RJ5YVOjt55/yOz/yfTqXBVvRSq2fV + QNcKACYHSjkIZ7Uq7ZEW9bEGI5tTKdz++N2UA= +Received: by 10.220.124.73 with SMTP id t9mr5099129vcr.37.1277931686462; Wed, + 30 Jun 2010 14:01:26 -0700 (PDT) +Received: by 10.220.161.137 with HTTP; Wed, 30 Jun 2010 14:00:56 -0700 (PDT) +In-Reply-To: <AANLkTine3pc2Ai2Woj81Y9fS_KgGs1sIMb2NMR6G74ww@mail.gmail.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1004633> + +On Wed, Jun 30, 2010 at 3:55 PM, Timur Tabi <timur.tabi@gmail.com> wrote: + +> MCSR_MASK is not defined anywhere, so when I compile this code, I get this: + +Never mind. I see that it's been fixed already, and that the patch +that removed MCSR_MASK was posted around the same time that this patch +was posted. + + +-- +Timur Tabi +Linux kernel developer at Freescale + + diff --git a/test/corpora/lkml/cur/1382298770.001724:2, b/test/corpora/lkml/cur/1382298770.001724:2, new file mode 100644 index 00000000..69c794c7 --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.001724:2, @@ -0,0 +1,104 @@ +From: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +Subject: [RFC][PATCH 10/10] cifs: add mount option to enable local caching +Date: Tue, 22 Jun 2010 20:55:09 +0530 +Lines: 66 +Message-ID: <1277220309-3757-1-git-send-email-sjayaraman@suse.de> +References: <yes> +Cc: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +To: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Tue Jun 22 17:25:29 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1OR5Ls-0004PS-BM + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Tue, 22 Jun 2010 17:25:28 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1755015Ab0FVPZ1 (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Tue, 22 Jun 2010 11:25:27 -0400 +Received: from victor.provo.novell.com ([137.65.250.26]:48639 "EHLO + victor.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1754070Ab0FVPZ1 (ORCPT + <rfc822;groupwise-SJayaraman-Et1tbQHTxzrQT0dZR+AlfA@public.gmane.org:0:0>); + Tue, 22 Jun 2010 11:25:27 -0400 +X-Greylist: delayed 316 seconds by postgrey-1.27 at vger.kernel.org; Tue, 22 Jun 2010 11:25:26 EDT +Received: from localhost (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) + by victor.provo.novell.com with ESMTP; Tue, 22 Jun 2010 09:25:11 -0600 +X-Mailer: git-send-email 1.6.4.2 +In-Reply-To: <yes> +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1001750> + +Add a mount option 'fsc' to enable local caching on CIFS. + +As the cifs-utils (userspace) changes are not done yet, this patch enables +'fsc' by default to assist testing. + +Signed-off-by: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +--- + fs/cifs/cifs_fs_sb.h | 1 + + fs/cifs/connect.c | 8 ++++++++ + 2 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/fs/cifs/cifs_fs_sb.h b/fs/cifs/cifs_fs_sb.h +index 246a167..9e77145 100644 +--- a/fs/cifs/cifs_fs_sb.h ++++ b/fs/cifs/cifs_fs_sb.h +@@ -35,6 +35,7 @@ + #define CIFS_MOUNT_DYNPERM 0x1000 /* allow in-memory only mode setting */ + #define CIFS_MOUNT_NOPOSIXBRL 0x2000 /* mandatory not posix byte range lock */ + #define CIFS_MOUNT_NOSSYNC 0x4000 /* don't do slow SMBflush on every sync*/ ++#define CIFS_MOUNT_FSCACHE 0x8000 /* local caching enabled */ + + struct cifs_sb_info { + struct cifsTconInfo *tcon; /* primary mount */ +diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c +index 4844dbd..6c6ff3c 100644 +--- a/fs/cifs/connect.c ++++ b/fs/cifs/connect.c +@@ -98,6 +98,7 @@ struct smb_vol { + bool noblocksnd:1; + bool noautotune:1; + bool nostrictsync:1; /* do not force expensive SMBflush on every sync */ ++ bool fsc:1; /* enable fscache */ + unsigned int rsize; + unsigned int wsize; + bool sockopt_tcp_nodelay:1; +@@ -843,6 +844,9 @@ cifs_parse_mount_options(char *options, const char *devname, + /* default to using server inode numbers where available */ + vol->server_ino = 1; + ++ /* XXX: default to fsc for testing until mount.cifs pieces are done */ ++ vol->fsc = 1; ++ + if (!options) + return 1; + +@@ -1332,6 +1336,8 @@ cifs_parse_mount_options(char *options, const char *devname, + printk(KERN_WARNING "CIFS: Mount option noac not " + "supported. Instead set " + "/proc/fs/cifs/LookupCacheEnabled to 0\n"); ++ } else if (strnicmp(data, "fsc", 3) == 0) { ++ vol->fsc = true; + } else + printk(KERN_WARNING "CIFS: Unknown mount option %s\n", + data); +@@ -2405,6 +2411,8 @@ static void setup_cifs_sb(struct smb_vol *pvolume_info, + cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_OVERR_GID; + if (pvolume_info->dynperm) + cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_DYNPERM; ++ if (pvolume_info->fsc) ++ cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_FSCACHE; + if (pvolume_info->direct_io) { + cFYI(1, "mounting share using direct i/o"); + cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_DIRECT_IO; +-- +1.6.4.2 + + + diff --git a/test/corpora/lkml/cur/1382298770.001730:2, b/test/corpora/lkml/cur/1382298770.001730:2, new file mode 100644 index 00000000..840be2ee --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.001730:2, @@ -0,0 +1,103 @@ +From: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +Subject: [RFC][PATCH 00/10] cifs: local caching support using FS-Cache +Date: Tue, 22 Jun 2010 20:50:05 +0530 +Lines: 66 +Message-ID: <1277220005-3322-1-git-send-email-sjayaraman@suse.de> +References: <yes> +Cc: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +To: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Tue Jun 22 17:40:38 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1OR5aY-00055O-BD + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Tue, 22 Jun 2010 17:40:38 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1751889Ab0FVPkf (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Tue, 22 Jun 2010 11:40:35 -0400 +Received: from victor.provo.novell.com ([137.65.250.26]:50040 "EHLO + victor.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1751554Ab0FVPkf (ORCPT + <rfc822;groupwise-SJayaraman-Et1tbQHTxzrQT0dZR+AlfA@public.gmane.org:0:0>); + Tue, 22 Jun 2010 11:40:35 -0400 +Received: from localhost (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) + by victor.provo.novell.com with ESMTP; Tue, 22 Jun 2010 09:20:07 -0600 +X-Mailer: git-send-email 1.6.4.2 +In-Reply-To: <yes> +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1001756> + +This patchset is a first stab at adding persistent, local caching facility for +CIFS using the FS-Cache interface. + +The index hierarchy which is mainly used to locate a file object or discard +a certain subset of the files cached, currently has three levels: + - Server + - Share + - File + +The server index object is keyed by hostname of the server. The superblock +index object is keyed by the sharename and the inode object is keyed by the +UniqueId. The cache coherency is ensured by checking the 'LastWriteTime' and +size of file. + +To use this, apply this patchset in order, mount the share with rsize=4096 and +try copying a huge file (say few hundred MBs) from mount point to local +filesystem. During the first time, the cache will be initialized. When you copy +the second time, it should read from the local cache. + +To reduce the impact of page cache and see the local caching in action +readily, try doing a sync and drop the caches by doing: + sync; echo 3 > /proc/sys/vm/drop_caches + +Known issues +------------- + - the cache coherency check may not be reliable always as some + CIFS servers are known not to update mtime until the filehandle is + closed. + - not all the Servers under all circumstances provide a unique + 'UniqueId'. + +Todo's +------- + - improvements to avoid potential key collisions + - address the above known issues + +This set is lightly tested and all the bugs seen during my testing have been +fixed. However, this can be considered as an RFC for now. + +Any Comments or Suggestions are welcome. + +Suresh Jayaraman (10) + cifs: add kernel config option for CIFS Client caching support + cifs: guard cifsglob.h against multiple inclusion + cifs: register CIFS for caching + cifs: define server-level cache index objects and register them with FS-Cache + cifs: define superblock-level cache index objects and register them + cifs: define inode-level cache object and register them + cifs: FS-Cache page management + cifs: store pages into local cache + cifs: read pages from FS-Cache + cifs: add mount option to enable local caching + + Kconfig | 9 ++ + Makefile | 2 + cache.c | 251 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + cifs_fs_sb.h | 1 + cifsfs.c | 15 +++ + cifsglob.h | 14 +++ + connect.c | 16 +++ + file.c | 51 +++++++++++ + fscache.c | 244 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + fscache.h | 135 +++++++++++++++++++++++++++++++ + inode.c | 4 + 11 files changed, 742 insertions(+) + + + diff --git a/test/corpora/lkml/cur/1382298770.001731:2, b/test/corpora/lkml/cur/1382298770.001731:2, new file mode 100644 index 00000000..d8b3168c --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.001731:2, @@ -0,0 +1,67 @@ +From: Suresh Jayaraman <sjayaraman@suse.de> +Subject: [RFC][PATCH 01/10] cifs: add kernel config option for CIFS Client caching support +Date: Tue, 22 Jun 2010 20:52:38 +0530 +Lines: 30 +Message-ID: <1277220158-3405-1-git-send-email-sjayaraman@suse.de> +References: <yes> +Cc: linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, + linux-kernel@vger.kernel.org, David Howells <dhowells@redhat.com> +To: Steve French <smfrench@gmail.com> +X-From: linux-kernel-owner@vger.kernel.org Tue Jun 22 17:43:27 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1OR5dG-0007m9-Ij + for glk-linux-kernel-3@lo.gmane.org; Tue, 22 Jun 2010 17:43:26 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1751536Ab0FVPnS (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Tue, 22 Jun 2010 11:43:18 -0400 +Received: from victor.provo.novell.com ([137.65.250.26]:51303 "EHLO + victor.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1750800Ab0FVPnR (ORCPT + <rfc822;groupwise-SJayaraman@novell.com:0:0>); + Tue, 22 Jun 2010 11:43:17 -0400 +Received: from localhost (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) + by victor.provo.novell.com with ESMTP; Tue, 22 Jun 2010 09:22:40 -0600 +X-Mailer: git-send-email 1.6.4.2 +In-Reply-To: <yes> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1001757> + +Add a kernel config option to enable local caching for CIFS. + +Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de> +--- + fs/cifs/Kconfig | 9 +++++++++ + 1 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/fs/cifs/Kconfig b/fs/cifs/Kconfig +index 80f3525..5739fd7 100644 +--- a/fs/cifs/Kconfig ++++ b/fs/cifs/Kconfig +@@ -131,6 +131,15 @@ config CIFS_DFS_UPCALL + IP addresses) which is needed for implicit mounts of DFS junction + points. If unsure, say N. + ++config CIFS_FSCACHE ++ bool "Provide CIFS client caching support (EXPERIMENTAL)" ++ depends on EXPERIMENTAL ++ depends on CIFS=m && FSCACHE || CIFS=y && FSCACHE=y ++ help ++ Makes CIFS FS-Cache capable. Say Y here if you want your CIFS data ++ to be cached locally on disk through the general filesystem cache ++ manager. If unsure, say N. ++ + config CIFS_EXPERIMENTAL + bool "CIFS Experimental Features (EXPERIMENTAL)" + depends on CIFS && EXPERIMENTAL +-- +1.6.4.2 + + + diff --git a/test/corpora/lkml/cur/1382298770.001732:2, b/test/corpora/lkml/cur/1382298770.001732:2, new file mode 100644 index 00000000..8850953a --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.001732:2, @@ -0,0 +1,73 @@ +From: Suresh Jayaraman <sjayaraman@suse.de> +Subject: [RFC][PATCH 02/10] cifs: guard cifsglob.h against multiple inclusion +Date: Tue, 22 Jun 2010 20:52:50 +0530 +Lines: 36 +Message-ID: <1277220170-3442-1-git-send-email-sjayaraman@suse.de> +References: <yes> +Cc: linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, + linux-kernel@vger.kernel.org, David Howells <dhowells@redhat.com> +To: Steve French <smfrench@gmail.com> +X-From: linux-fsdevel-owner@vger.kernel.org Tue Jun 22 17:43:39 2010 +Return-path: <linux-fsdevel-owner@vger.kernel.org> +Envelope-to: lnx-linux-fsdevel@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-fsdevel-owner@vger.kernel.org>) + id 1OR5dT-0007sB-18 + for lnx-linux-fsdevel@lo.gmane.org; Tue, 22 Jun 2010 17:43:39 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1752441Ab0FVPn3 (ORCPT <rfc822;lnx-linux-fsdevel@m.gmane.org>); + Tue, 22 Jun 2010 11:43:29 -0400 +Received: from victor.provo.novell.com ([137.65.250.26]:41538 "EHLO + victor.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1751889Ab0FVPn2 (ORCPT + <rfc822;groupwise-SJayaraman@novell.com:0:0>); + Tue, 22 Jun 2010 11:43:28 -0400 +Received: from localhost (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) + by victor.provo.novell.com with ESMTP; Tue, 22 Jun 2010 09:22:52 -0600 +X-Mailer: git-send-email 1.6.4.2 +In-Reply-To: <yes> +Sender: linux-fsdevel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-fsdevel.vger.kernel.org> +X-Mailing-List: linux-fsdevel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1001758> + +Add conditional compile macros to guard the header file against multiple +inclusion. + +Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de> +--- + fs/cifs/cifsglob.h | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h +index a88479c..6b2c39d 100644 +--- a/fs/cifs/cifsglob.h ++++ b/fs/cifs/cifsglob.h +@@ -16,6 +16,9 @@ + * the GNU Lesser General Public License for more details. + * + */ ++#ifndef _CIFS_GLOB_H ++#define _CIFS_GLOB_H ++ + #include <linux/in.h> + #include <linux/in6.h> + #include <linux/slab.h> +@@ -733,3 +736,5 @@ GLOBAL_EXTERN unsigned int cifs_min_small; /* min size of small buf pool */ + GLOBAL_EXTERN unsigned int cifs_max_pending; /* MAX requests at once to server*/ + + extern const struct slow_work_ops cifs_oplock_break_ops; ++ ++#endif /* _CIFS_GLOB_H */ +-- +1.6.4.2 + +-- +To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + + diff --git a/test/corpora/lkml/cur/1382298770.001733:2, b/test/corpora/lkml/cur/1382298770.001733:2, new file mode 100644 index 00000000..d782f90e --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.001733:2, @@ -0,0 +1,211 @@ +From: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +Subject: [RFC][PATCH 03/10] cifs: register CIFS for caching +Date: Tue, 22 Jun 2010 20:53:09 +0530 +Lines: 174 +Message-ID: <1277220189-3485-1-git-send-email-sjayaraman@suse.de> +References: <yes> +Cc: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +To: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Tue Jun 22 17:43:52 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1OR5de-0007xC-Ov + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Tue, 22 Jun 2010 17:43:51 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1753125Ab0FVPnt (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Tue, 22 Jun 2010 11:43:49 -0400 +Received: from victor.provo.novell.com ([137.65.250.26]:55866 "EHLO + victor.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1751261Ab0FVPnt (ORCPT + <rfc822;groupwise-SJayaraman-Et1tbQHTxzrQT0dZR+AlfA@public.gmane.org:0:0>); + Tue, 22 Jun 2010 11:43:49 -0400 +Received: from localhost (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) + by victor.provo.novell.com with ESMTP; Tue, 22 Jun 2010 09:23:11 -0600 +X-Mailer: git-send-email 1.6.4.2 +In-Reply-To: <yes> +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1001759> + +Define CIFS for FS-Cache and register for caching. Upon registration the +top-level index object cookie will be stuck to the netfs definition by +FS-Cache. + +Signed-off-by: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +--- + fs/cifs/Makefile | 2 ++ + fs/cifs/cache.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + fs/cifs/cifsfs.c | 8 ++++++++ + fs/cifs/fscache.h | 40 ++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 103 insertions(+), 0 deletions(-) + create mode 100644 fs/cifs/cache.c + create mode 100644 fs/cifs/fscache.h + +diff --git a/fs/cifs/Makefile b/fs/cifs/Makefile +index 9948c00..e2de709 100644 +--- a/fs/cifs/Makefile ++++ b/fs/cifs/Makefile +@@ -11,3 +11,5 @@ cifs-y := cifsfs.o cifssmb.o cifs_debug.o connect.o dir.o file.o inode.o \ + cifs-$(CONFIG_CIFS_UPCALL) += cifs_spnego.o + + cifs-$(CONFIG_CIFS_DFS_UPCALL) += dns_resolve.o cifs_dfs_ref.o ++ ++cifs-$(CONFIG_CIFS_FSCACHE) += cache.o +diff --git a/fs/cifs/cache.c b/fs/cifs/cache.c +new file mode 100644 +index 0000000..1080b96 +--- /dev/null ++++ b/fs/cifs/cache.c +@@ -0,0 +1,53 @@ ++/* ++ * fs/cifs/cache.c - CIFS filesystem cache index structure definitions ++ * ++ * Copyright (c) 2010 Novell, Inc. ++ * Authors(s): Suresh Jayaraman (sjayaraman-l3A5Bk7waGM@public.gmane.org> ++ * ++ * This library is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU Lesser General Public License as published ++ * by the Free Software Foundation; either version 2.1 of the License, or ++ * (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public License ++ * along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++#include <linux/init.h> ++#include <linux/kernel.h> ++#include <linux/sched.h> ++#include <linux/mm.h> ++ ++#include "fscache.h" ++#include "cifsglob.h" ++#include "cifs_debug.h" ++ ++/* ++ * CIFS filesystem definition for FS-Cache ++ */ ++struct fscache_netfs cifs_fscache_netfs = { ++ .name = "cifs", ++ .version = 0, ++}; ++ ++/* ++ * Register CIFS for caching with FS-Cache ++ */ ++int cifs_fscache_register(void) ++{ ++ return fscache_register_netfs(&cifs_fscache_netfs); ++} ++ ++/* ++ * Unregister CIFS for caching ++ */ ++void cifs_fscache_unregister(void) ++{ ++ fscache_unregister_netfs(&cifs_fscache_netfs); ++} ++ +diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c +index 484e52b..c2a7aa9 100644 +--- a/fs/cifs/cifsfs.c ++++ b/fs/cifs/cifsfs.c +@@ -47,6 +47,7 @@ + #include <linux/key-type.h> + #include "dns_resolve.h" + #include "cifs_spnego.h" ++#include "fscache.h" + #define CIFS_MAGIC_NUMBER 0xFF534D42 /* the first four bytes of SMB PDUs */ + + int cifsFYI = 0; +@@ -902,6 +903,10 @@ init_cifs(void) + cFYI(1, "cifs_max_pending set to max of 256"); + } + ++ rc = cifs_fscache_register(); ++ if (rc) ++ goto out; ++ + rc = cifs_init_inodecache(); + if (rc) + goto out_clean_proc; +@@ -949,8 +954,10 @@ init_cifs(void) + cifs_destroy_mids(); + out_destroy_inodecache: + cifs_destroy_inodecache(); ++ cifs_fscache_unregister(); + out_clean_proc: + cifs_proc_clean(); ++ out: + return rc; + } + +@@ -959,6 +966,7 @@ exit_cifs(void) + { + cFYI(DBG2, "exit_cifs"); + cifs_proc_clean(); ++ cifs_fscache_unregister(); + #ifdef CONFIG_CIFS_DFS_UPCALL + cifs_dfs_release_automount_timer(); + unregister_key_type(&key_type_dns_resolver); +diff --git a/fs/cifs/fscache.h b/fs/cifs/fscache.h +new file mode 100644 +index 0000000..cec9e2b +--- /dev/null ++++ b/fs/cifs/fscache.h +@@ -0,0 +1,40 @@ ++/* ++ * fs/cifs/fscache.h - CIFS filesystem cache interface definitions ++ * ++ * Copyright (c) 2010 Novell, Inc. ++ * Authors(s): Suresh Jayaraman (sjayaraman-l3A5Bk7waGM@public.gmane.org> ++ * ++ * This library is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU Lesser General Public License as published ++ * by the Free Software Foundation; either version 2.1 of the License, or ++ * (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public License ++ * along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++#ifndef _CIFS_FSCACHE_H ++#define _CIFS_FSCACHE_H ++ ++#include <linux/fscache.h> ++#include "cifsglob.h" ++ ++#ifdef CONFIG_CIFS_FSCACHE ++ ++extern struct fscache_netfs cifs_fscache_netfs; ++ ++extern int cifs_fscache_register(void); ++extern void cifs_fscache_unregister(void); ++ ++#else /* CONFIG_CIFS_FSCACHE */ ++static inline int cifs_fscache_register(void) { return 0; } ++static inline void cifs_fscache_unregister(void) {} ++ ++#endif /* CONFIG_CIFS_FSCACHE */ ++ ++#endif /* _CIFS_FSCACHE_H */ +-- +1.6.4.2 + + + diff --git a/test/corpora/lkml/cur/1382298770.001734:2, b/test/corpora/lkml/cur/1382298770.001734:2, new file mode 100644 index 00000000..4b64bc3b --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.001734:2, @@ -0,0 +1,223 @@ +From: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +Subject: [RFC][PATCH 04/10] cifs: define server-level cache index objects and register them with FS-Cache +Date: Tue, 22 Jun 2010 20:53:18 +0530 +Lines: 186 +Message-ID: <1277220198-3522-1-git-send-email-sjayaraman@suse.de> +References: <yes> +Cc: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +To: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Tue Jun 22 17:44:26 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1OR5eD-0008G7-KP + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Tue, 22 Jun 2010 17:44:26 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1753942Ab0FVPoC (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Tue, 22 Jun 2010 11:44:02 -0400 +Received: from victor.provo.novell.com ([137.65.250.26]:58783 "EHLO + victor.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1751265Ab0FVPoA (ORCPT + <rfc822;groupwise-SJayaraman-Et1tbQHTxzrQT0dZR+AlfA@public.gmane.org:0:0>); + Tue, 22 Jun 2010 11:44:00 -0400 +Received: from localhost (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) + by victor.provo.novell.com with ESMTP; Tue, 22 Jun 2010 09:23:20 -0600 +X-Mailer: git-send-email 1.6.4.2 +In-Reply-To: <yes> +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1001760> + +Define server-level cache index objects (as managed by TCP_ServerInfo structs). +Each server object is created in the CIFS top-level index object and is itself +an index into which superblock-level objects are inserted. + +Currently, the server objects are keyed by hostname. + +Signed-off-by: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +--- + fs/cifs/Makefile | 2 +- + fs/cifs/cache.c | 25 +++++++++++++++++++++++++ + fs/cifs/cifsglob.h | 3 +++ + fs/cifs/connect.c | 4 ++++ + fs/cifs/fscache.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ + fs/cifs/fscache.h | 12 ++++++++++++ + 6 files changed, 92 insertions(+), 1 deletion(-) + create mode 100644 fs/cifs/fscache.c + +Index: cifs-2.6/fs/cifs/Makefile +=================================================================== +--- cifs-2.6.orig/fs/cifs/Makefile ++++ cifs-2.6/fs/cifs/Makefile +@@ -12,4 +12,4 @@ cifs-$(CONFIG_CIFS_UPCALL) += cifs_spneg + + cifs-$(CONFIG_CIFS_DFS_UPCALL) += dns_resolve.o cifs_dfs_ref.o + +-cifs-$(CONFIG_CIFS_FSCACHE) += cache.o ++cifs-$(CONFIG_CIFS_FSCACHE) += fscache.o cache.o +Index: cifs-2.6/fs/cifs/cache.c +=================================================================== +--- cifs-2.6.orig/fs/cifs/cache.c ++++ cifs-2.6/fs/cifs/cache.c +@@ -51,3 +51,28 @@ void cifs_fscache_unregister(void) + fscache_unregister_netfs(&cifs_fscache_netfs); + } + ++/* ++ * Server object currently keyed by hostname ++ */ ++static uint16_t cifs_server_get_key(const void *cookie_netfs_data, ++ void *buffer, uint16_t maxbuf) ++{ ++ const struct TCP_Server_Info *server = cookie_netfs_data; ++ uint16_t len = strnlen(server->hostname, sizeof(server->hostname)); ++ ++ if (len > maxbuf) ++ return 0; ++ ++ memcpy(buffer, server->hostname, len); ++ ++ return len; ++} ++ ++/* ++ * Server object for FS-Cache ++ */ ++const struct fscache_cookie_def cifs_fscache_server_index_def = { ++ .name = "CIFS.server", ++ .type = FSCACHE_COOKIE_TYPE_INDEX, ++ .get_key = cifs_server_get_key, ++}; +Index: cifs-2.6/fs/cifs/cifsglob.h +=================================================================== +--- cifs-2.6.orig/fs/cifs/cifsglob.h ++++ cifs-2.6/fs/cifs/cifsglob.h +@@ -193,6 +193,9 @@ struct TCP_Server_Info { + bool sec_mskerberos; /* supports legacy MS Kerberos */ + bool sec_kerberosu2u; /* supports U2U Kerberos */ + bool sec_ntlmssp; /* supports NTLMSSP */ ++#ifdef CONFIG_CIFS_FSCACHE ++ struct fscache_cookie *fscache; /* client index cache cookie */ ++#endif + }; + + /* +Index: cifs-2.6/fs/cifs/connect.c +=================================================================== +--- cifs-2.6.orig/fs/cifs/connect.c ++++ cifs-2.6/fs/cifs/connect.c +@@ -48,6 +48,7 @@ + #include "nterr.h" + #include "rfc1002pdu.h" + #include "cn_cifs.h" ++#include "fscache.h" + + #define CIFS_PORT 445 + #define RFC1001_PORT 139 +@@ -1453,6 +1454,8 @@ cifs_put_tcp_session(struct TCP_Server_I + return; + } + ++ cifs_fscache_release_client_cookie(server); ++ + list_del_init(&server->tcp_ses_list); + write_unlock(&cifs_tcp_ses_lock); + +@@ -1572,6 +1575,7 @@ cifs_get_tcp_session(struct smb_vol *vol + goto out_err; + } + ++ cifs_fscache_get_client_cookie(tcp_ses); + /* thread spawned, put it on the list */ + write_lock(&cifs_tcp_ses_lock); + list_add(&tcp_ses->tcp_ses_list, &cifs_tcp_ses_list); +Index: cifs-2.6/fs/cifs/fscache.c +=================================================================== +--- /dev/null ++++ cifs-2.6/fs/cifs/fscache.c +@@ -0,0 +1,47 @@ ++/* ++ * fs/cifs/fscache.c - CIFS filesystem cache interface ++ * ++ * Copyright (c) 2010 Novell, Inc. ++ * Authors(s): Suresh Jayaraman (sjayaraman-l3A5Bk7waGM@public.gmane.org> ++ * ++ * This library is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU Lesser General Public License as published ++ * by the Free Software Foundation; either version 2.1 of the License, or ++ * (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public License ++ * along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++#include <linux/init.h> ++#include <linux/kernel.h> ++#include <linux/sched.h> ++#include <linux/mm.h> ++#include <linux/in6.h> ++ ++#include "fscache.h" ++#include "cifsglob.h" ++#include "cifs_debug.h" ++ ++void cifs_fscache_get_client_cookie(struct TCP_Server_Info *server) ++{ ++ server->fscache = ++ fscache_acquire_cookie(cifs_fscache_netfs.primary_index, ++ &cifs_fscache_server_index_def, server); ++ cFYI(1, "CIFS: get client cookie (0x%p/0x%p)\n", ++ server, server->fscache); ++} ++ ++void cifs_fscache_release_client_cookie(struct TCP_Server_Info *server) ++{ ++ cFYI(1, "CIFS: release client cookie (0x%p/0x%p)\n", ++ server, server->fscache); ++ fscache_relinquish_cookie(server->fscache, 0); ++ server->fscache = NULL; ++} ++ +Index: cifs-2.6/fs/cifs/fscache.h +=================================================================== +--- cifs-2.6.orig/fs/cifs/fscache.h ++++ cifs-2.6/fs/cifs/fscache.h +@@ -27,14 +27,26 @@ + #ifdef CONFIG_CIFS_FSCACHE + + extern struct fscache_netfs cifs_fscache_netfs; ++extern const struct fscache_cookie_def cifs_fscache_server_index_def; + + extern int cifs_fscache_register(void); + extern void cifs_fscache_unregister(void); + ++/* ++ * fscache.c ++ */ ++extern void cifs_fscache_get_client_cookie(struct TCP_Server_Info *); ++extern void cifs_fscache_release_client_cookie(struct TCP_Server_Info *); ++ + #else /* CONFIG_CIFS_FSCACHE */ + static inline int cifs_fscache_register(void) { return 0; } + static inline void cifs_fscache_unregister(void) {} + ++static inline void ++cifs_fscache_get_client_cookie(struct TCP_Server_Info *server) {} ++static inline void ++cifs_fscache_get_client_cookie(struct TCP_Server_Info *server); {} ++ + #endif /* CONFIG_CIFS_FSCACHE */ + + #endif /* _CIFS_FSCACHE_H */ + + diff --git a/test/corpora/lkml/cur/1382298770.001735:2, b/test/corpora/lkml/cur/1382298770.001735:2, new file mode 100644 index 00000000..d76da353 --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.001735:2, @@ -0,0 +1,212 @@ +From: Suresh Jayaraman <sjayaraman@suse.de> +Subject: [RFC][PATCH 07/10] cifs: FS-Cache page management +Date: Tue, 22 Jun 2010 20:53:48 +0530 +Lines: 175 +Message-ID: <1277220228-3635-1-git-send-email-sjayaraman@suse.de> +References: <yes> +Cc: linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, + linux-kernel@vger.kernel.org, David Howells <dhowells@redhat.com> +To: Steve French <smfrench@gmail.com> +X-From: linux-kernel-owner@vger.kernel.org Tue Jun 22 17:44:27 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1OR5eF-0008G7-BK + for glk-linux-kernel-3@lo.gmane.org; Tue, 22 Jun 2010 17:44:27 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1754757Ab0FVPoS (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Tue, 22 Jun 2010 11:44:18 -0400 +Received: from victor.provo.novell.com ([137.65.250.26]:54214 "EHLO + victor.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1752542Ab0FVPoB (ORCPT + <rfc822;groupwise-SJayaraman@novell.com:0:0>); + Tue, 22 Jun 2010 11:44:01 -0400 +Received: from localhost (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) + by victor.provo.novell.com with ESMTP; Tue, 22 Jun 2010 09:23:50 -0600 +X-Mailer: git-send-email 1.6.4.2 +In-Reply-To: <yes> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1001761> + +Takes care of invalidation and release of FS-Cache marked pages and also +invalidation of the FsCache page flag when the inode is removed. + +Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de> +--- + fs/cifs/cache.c | 31 +++++++++++++++++++++++++++++++ + fs/cifs/file.c | 20 ++++++++++++++++++++ + fs/cifs/fscache.c | 26 ++++++++++++++++++++++++++ + fs/cifs/fscache.h | 16 ++++++++++++++++ + 4 files changed, 93 insertions(+), 0 deletions(-) + +diff --git a/fs/cifs/cache.c b/fs/cifs/cache.c +index b205424..3a733c1 100644 +--- a/fs/cifs/cache.c ++++ b/fs/cifs/cache.c +@@ -210,6 +210,36 @@ fscache_checkaux cifs_fscache_inode_check_aux(void *cookie_netfs_data, + return FSCACHE_CHECKAUX_OKAY; + } + ++static void cifs_fscache_inode_now_uncached(void *cookie_netfs_data) ++{ ++ struct cifsInodeInfo *cifsi = cookie_netfs_data; ++ struct pagevec pvec; ++ pgoff_t first; ++ int loop, nr_pages; ++ ++ pagevec_init(&pvec, 0); ++ first = 0; ++ ++ cFYI(1, "cifs inode 0x%p now uncached\n", cifsi); ++ ++ for (;;) { ++ nr_pages = pagevec_lookup(&pvec, ++ cifsi->vfs_inode.i_mapping, first, ++ PAGEVEC_SIZE - pagevec_count(&pvec)); ++ if (!nr_pages) ++ break; ++ ++ for (loop = 0; loop < nr_pages; loop++) ++ ClearPageFsCache(pvec.pages[loop]); ++ ++ first = pvec.pages[nr_pages - 1]->index + 1; ++ ++ pvec.nr = nr_pages; ++ pagevec_release(&pvec); ++ cond_resched(); ++ } ++} ++ + const struct fscache_cookie_def cifs_fscache_inode_object_def = { + .name = "CIFS.uniqueid", + .type = FSCACHE_COOKIE_TYPE_DATAFILE, +@@ -217,4 +247,5 @@ const struct fscache_cookie_def cifs_fscache_inode_object_def = { + .get_attr = cifs_fscache_inode_get_attr, + .get_aux = cifs_fscache_inode_get_aux, + .check_aux = cifs_fscache_inode_check_aux, ++ .now_uncached = cifs_fscache_inode_now_uncached, + }; +diff --git a/fs/cifs/file.c b/fs/cifs/file.c +index 55ecb55..786ec04 100644 +--- a/fs/cifs/file.c ++++ b/fs/cifs/file.c +@@ -2271,6 +2271,22 @@ out: + return rc; + } + ++static int cifs_release_page(struct page *page, gfp_t gfp) ++{ ++ if (PagePrivate(page)) ++ return 0; ++ ++ return cifs_fscache_release_page(page, gfp); ++} ++ ++static void cifs_invalidate_page(struct page *page, unsigned long offset) ++{ ++ struct cifsInodeInfo *cifsi = CIFS_I(page->mapping->host); ++ ++ if (offset == 0) ++ cifs_fscache_invalidate_page(page, &cifsi->vfs_inode); ++} ++ + static void + cifs_oplock_break(struct slow_work *work) + { +@@ -2344,6 +2360,8 @@ const struct address_space_operations cifs_addr_ops = { + .write_begin = cifs_write_begin, + .write_end = cifs_write_end, + .set_page_dirty = __set_page_dirty_nobuffers, ++ .releasepage = cifs_release_page, ++ .invalidatepage = cifs_invalidate_page, + /* .sync_page = cifs_sync_page, */ + /* .direct_IO = */ + }; +@@ -2360,6 +2378,8 @@ const struct address_space_operations cifs_addr_ops_smallbuf = { + .write_begin = cifs_write_begin, + .write_end = cifs_write_end, + .set_page_dirty = __set_page_dirty_nobuffers, ++ .releasepage = cifs_release_page, ++ .invalidatepage = cifs_invalidate_page, + /* .sync_page = cifs_sync_page, */ + /* .direct_IO = */ + }; +diff --git a/fs/cifs/fscache.c b/fs/cifs/fscache.c +index ddfd355..c09d3b8 100644 +--- a/fs/cifs/fscache.c ++++ b/fs/cifs/fscache.c +@@ -130,3 +130,29 @@ void cifs_fscache_reset_inode_cookie(struct inode *inode) + } + } + ++int cifs_fscache_release_page(struct page *page, gfp_t gfp) ++{ ++ if (PageFsCache(page)) { ++ struct inode *inode = page->mapping->host; ++ struct cifsInodeInfo *cifsi = CIFS_I(inode); ++ ++ cFYI(1, "CIFS: fscache release page (0x%p/0x%p)\n", ++ cifsi->fscache, page); ++ if (!fscache_maybe_release_page(cifsi->fscache, page, gfp)) ++ return 0; ++ } ++ ++ return 1; ++} ++ ++void __cifs_fscache_invalidate_page(struct page *page, struct inode *inode) ++{ ++ struct cifsInodeInfo *cifsi = CIFS_I(inode); ++ struct fscache_cookie *cookie = cifsi->fscache; ++ ++ cFYI(1, "CIFS: fscache invalidatepage (0x%p/0x%p/0x%p)\n", ++ cookie, page, cifsi); ++ fscache_wait_on_page_write(cookie, page); ++ fscache_uncache_page(cookie, page); ++} ++ +diff --git a/fs/cifs/fscache.h b/fs/cifs/fscache.h +index 836bb02..127cb0a 100644 +--- a/fs/cifs/fscache.h ++++ b/fs/cifs/fscache.h +@@ -47,6 +47,16 @@ extern void cifs_fscache_release_inode_cookie(struct inode *); + extern void cifs_fscache_set_inode_cookie(struct inode *, struct file *); + extern void cifs_fscache_reset_inode_cookie(struct inode *); + ++extern void __cifs_fscache_invalidate_page(struct page *, struct inode *); ++extern int cifs_fscache_release_page(struct page *page, gfp_t gfp); ++ ++static inline void cifs_fscache_invalidate_page(struct page *page, ++ struct inode *inode) ++{ ++ if (PageFsCache(page)) ++ __cifs_fscache_invalidate_page(page, inode); ++} ++ + #else /* CONFIG_CIFS_FSCACHE */ + static inline int cifs_fscache_register(void) { return 0; } + static inline void cifs_fscache_unregister(void) {} +@@ -63,7 +73,13 @@ static inline void cifs_fscache_release_inode_cookie(struct inode *inode) {} + static inline void cifs_fscache_set_inode_cookie(struct inode *inode, + struct file *filp) {} + static inline void cifs_fscache_reset_inode_cookie(struct inode *inode) {} ++static inline void cifs_fscache_release_page(struct page *page, gfp_t gfp) ++{ ++ return 1; /* May release page */ ++} + ++static inline int cifs_fscache_invalidate_page(struct page *page, ++ struct inode *) {} + + #endif /* CONFIG_CIFS_FSCACHE */ + +-- +1.6.4.2 + + + diff --git a/test/corpora/lkml/cur/1382298770.001736:2, b/test/corpora/lkml/cur/1382298770.001736:2, new file mode 100644 index 00000000..f972891b --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.001736:2, @@ -0,0 +1,256 @@ +From: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +Subject: [RFC][PATCH 09/10] cifs: read pages from FS-Cache +Date: Tue, 22 Jun 2010 20:54:21 +0530 +Lines: 219 +Message-ID: <1277220261-3717-1-git-send-email-sjayaraman@suse.de> +References: <yes> +Cc: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +To: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Tue Jun 22 17:44:46 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1OR5eX-0008O2-Q4 + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Tue, 22 Jun 2010 17:44:46 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1752563Ab0FVPom (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Tue, 22 Jun 2010 11:44:42 -0400 +Received: from victor.provo.novell.com ([137.65.250.26]:42741 "EHLO + victor.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1752542Ab0FVPok (ORCPT + <rfc822;groupwise-SJayaraman-Et1tbQHTxzrQT0dZR+AlfA@public.gmane.org:0:0>); + Tue, 22 Jun 2010 11:44:40 -0400 +Received: from localhost (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) + by victor.provo.novell.com with ESMTP; Tue, 22 Jun 2010 09:24:22 -0600 +X-Mailer: git-send-email 1.6.4.2 +In-Reply-To: <yes> +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1001762> + +Read pages from a FS-Cache data storage object into a CIFS inode. + +Signed-off-by: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +--- + fs/cifs/file.c | 19 ++++++++++++++ + fs/cifs/fscache.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + fs/cifs/fscache.h | 40 ++++++++++++++++++++++++++++- + 3 files changed, 131 insertions(+), 1 deletions(-) + +diff --git a/fs/cifs/file.c b/fs/cifs/file.c +index 39c1ce0..42d2f25 100644 +--- a/fs/cifs/file.c ++++ b/fs/cifs/file.c +@@ -1978,6 +1978,16 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, + cifs_sb = CIFS_SB(file->f_path.dentry->d_sb); + pTcon = cifs_sb->tcon; + ++ /* ++ * Reads as many pages as possible from fscache. Returns -ENOBUFS ++ * immediately if the cookie is negative ++ */ ++ rc = cifs_readpages_from_fscache(mapping->host, mapping, page_list, ++ &num_pages); ++ cFYI(1, "CIFS: readpages_from_fscache returned %d\n", rc); ++ if (rc == 0) ++ goto read_complete; ++ + cFYI(DBG2, "rpages: num pages %d", num_pages); + for (i = 0; i < num_pages; ) { + unsigned contig_pages; +@@ -2090,6 +2100,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, + smb_read_data = NULL; + } + ++read_complete: + FreeXid(xid); + return rc; + } +@@ -2100,6 +2111,12 @@ static int cifs_readpage_worker(struct file *file, struct page *page, + char *read_data; + int rc; + ++ /* Is the page cached? */ ++ rc = cifs_readpage_from_fscache(file->f_path.dentry->d_inode, page); ++ cFYI(1, "CIFS: cifs_readpage_from_fscache returned %d\n", rc); ++ if (rc == 0) ++ goto read_complete; ++ + page_cache_get(page); + read_data = kmap(page); + /* for reads over a certain size could initiate async read ahead */ +@@ -2128,6 +2145,8 @@ static int cifs_readpage_worker(struct file *file, struct page *page, + io_error: + kunmap(page); + page_cache_release(page); ++ ++read_complete: + return rc; + } + +diff --git a/fs/cifs/fscache.c b/fs/cifs/fscache.c +index 13e47d5..6813737 100644 +--- a/fs/cifs/fscache.c ++++ b/fs/cifs/fscache.c +@@ -145,6 +145,79 @@ int cifs_fscache_release_page(struct page *page, gfp_t gfp) + return 1; + } + ++static void cifs_readpage_from_fscache_complete(struct page *page, void *ctx, ++ int error) ++{ ++ cFYI(1, "CFS: readpage_from_fscache_complete (0x%p/%d)\n", ++ page, error); ++ if (!error) ++ SetPageUptodate(page); ++ unlock_page(page); ++} ++ ++/* ++ * Retrieve a page from FS-Cache ++ */ ++int __cifs_readpage_from_fscache(struct inode *inode, struct page *page) ++{ ++ int ret; ++ ++ cFYI(1, "CIFS: readpage_from_fscache(fsc:%p, p:%p, i:0x%p\n", ++ CIFS_I(inode)->fscache, page, inode); ++ ret = fscache_read_or_alloc_page(CIFS_I(inode)->fscache, page, ++ cifs_readpage_from_fscache_complete, ++ NULL, ++ GFP_KERNEL); ++ switch (ret) { ++ ++ case 0: /* page found in fscache, read submitted */ ++ cFYI(1, "CIFS: readpage_from_fscache: submitted\n"); ++ return ret; ++ case -ENOBUFS: /* page won't be cached */ ++ case -ENODATA: /* page not in cache */ ++ cFYI(1, "CIFS: readpage_from_fscache %d\n", ret); ++ return 1; ++ ++ default: ++ cFYI(1, "unknown error ret = %d", ret); ++ } ++ return ret; ++} ++ ++/* ++ * Retrieve a set of pages from FS-Cache ++ */ ++int __cifs_readpages_from_fscache(struct inode *inode, ++ struct address_space *mapping, ++ struct list_head *pages, ++ unsigned *nr_pages) ++{ ++ int ret; ++ ++ cFYI(1, "CIFS: __cifs_readpages_from_fscache (0x%p/%u/0x%p)\n", ++ CIFS_I(inode)->fscache, *nr_pages, inode); ++ ret = fscache_read_or_alloc_pages(CIFS_I(inode)->fscache, mapping, ++ pages, nr_pages, ++ cifs_readpage_from_fscache_complete, ++ NULL, ++ mapping_gfp_mask(mapping)); ++ switch (ret) { ++ case 0: /* read submitted to the cache for all pages */ ++ cFYI(1, "CIFS: readpages_from_fscache\n"); ++ return ret; ++ ++ case -ENOBUFS: /* some pages are not cached and can't be */ ++ case -ENODATA: /* some pages are not cached */ ++ cFYI(1, "CIFS: readpages_from_fscache: no page\n"); ++ return 1; ++ ++ default: ++ cFYI(1, "unknown error ret = %d", ret); ++ } ++ ++ return ret; ++} ++ + void __cifs_readpage_to_fscache(struct inode *inode, struct page *page) + { + int ret; +diff --git a/fs/cifs/fscache.h b/fs/cifs/fscache.h +index e34d8ab..03bd3fe 100644 +--- a/fs/cifs/fscache.h ++++ b/fs/cifs/fscache.h +@@ -31,7 +31,6 @@ extern const struct fscache_cookie_def cifs_fscache_server_index_def; + extern const struct fscache_cookie_def cifs_fscache_super_index_def; + extern const struct fscache_cookie_def cifs_fscache_inode_object_def; + +- + extern int cifs_fscache_register(void); + extern void cifs_fscache_unregister(void); + +@@ -49,6 +48,11 @@ extern void cifs_fscache_reset_inode_cookie(struct inode *); + + extern void __cifs_fscache_invalidate_page(struct page *, struct inode *); + extern int cifs_fscache_release_page(struct page *page, gfp_t gfp); ++extern int __cifs_readpage_from_fscache(struct inode *, struct page *); ++extern int __cifs_readpages_from_fscache(struct inode *, ++ struct address_space *, ++ struct list_head *, ++ unsigned *); + + extern void __cifs_readpage_to_fscache(struct inode *, struct page *); + +@@ -59,6 +63,26 @@ static inline void cifs_fscache_invalidate_page(struct page *page, + __cifs_fscache_invalidate_page(page, inode); + } + ++static inline int cifs_readpage_from_fscache(struct inode *inode, ++ struct page *page) ++{ ++ if (CIFS_I(inode)->fscache) ++ return __cifs_readpage_from_fscache(inode, page); ++ ++ return -ENOBUFS; ++} ++ ++static inline int cifs_readpages_from_fscache(struct inode *inode, ++ struct address_space *mapping, ++ struct list_head *pages, ++ unsigned *nr_pages) ++{ ++ if (CIFS_I(inode)->fscache) ++ return __cifs_readpages_from_fscache(inode, mapping, pages, ++ nr_pages); ++ return -ENOBUFS; ++} ++ + static inline void cifs_readpage_to_fscache(struct inode *inode, + struct page *page) + { +@@ -89,6 +113,20 @@ static inline void cifs_fscache_release_page(struct page *page, gfp_t gfp) + + static inline int cifs_fscache_invalidate_page(struct page *page, + struct inode *) {} ++static inline int ++cifs_readpage_from_fscache(struct inode *inode, struct page *page) ++{ ++ return -ENOBUFS; ++} ++ ++static inline int cifs_readpages_from_fscache(struct inode *inode, ++ struct address_space *mapping, ++ struct list_head *pages, ++ unsigned *nr_pages) ++{ ++ return -ENOBUFS; ++} ++ + static inline void cifs_readpage_to_fscache(struct inode *inode, + struct page *page) {} + +-- +1.6.4.2 + + + diff --git a/test/corpora/lkml/cur/1382298770.001738:2, b/test/corpora/lkml/cur/1382298770.001738:2, new file mode 100644 index 00000000..b1e0edfb --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.001738:2, @@ -0,0 +1,139 @@ +From: Suresh Jayaraman <sjayaraman@suse.de> +Subject: [RFC][PATCH 08/10] cifs: store pages into local cache +Date: Tue, 22 Jun 2010 20:54:00 +0530 +Lines: 102 +Message-ID: <1277220240-3674-1-git-send-email-sjayaraman@suse.de> +References: <yes> +Cc: linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, + linux-kernel@vger.kernel.org, David Howells <dhowells@redhat.com> +To: Steve French <smfrench@gmail.com> +X-From: linux-fsdevel-owner@vger.kernel.org Tue Jun 22 17:45:09 2010 +Return-path: <linux-fsdevel-owner@vger.kernel.org> +Envelope-to: lnx-linux-fsdevel@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-fsdevel-owner@vger.kernel.org>) + id 1OR5ev-00007O-6e + for lnx-linux-fsdevel@lo.gmane.org; Tue, 22 Jun 2010 17:45:09 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1755015Ab0FVPon (ORCPT <rfc822;lnx-linux-fsdevel@m.gmane.org>); + Tue, 22 Jun 2010 11:44:43 -0400 +Received: from victor.provo.novell.com ([137.65.250.26]:58250 "EHLO + victor.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1751265Ab0FVPok (ORCPT + <rfc822;groupwise-SJayaraman@novell.com:0:0>); + Tue, 22 Jun 2010 11:44:40 -0400 +Received: from localhost (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) + by victor.provo.novell.com with ESMTP; Tue, 22 Jun 2010 09:24:02 -0600 +X-Mailer: git-send-email 1.6.4.2 +In-Reply-To: <yes> +Sender: linux-fsdevel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-fsdevel.vger.kernel.org> +X-Mailing-List: linux-fsdevel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1001764> + +Store pages from an CIFS inode into the data storage object associated with +that inode. + +Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de> +--- + fs/cifs/file.c | 6 ++++++ + fs/cifs/fscache.c | 13 +++++++++++++ + fs/cifs/fscache.h | 11 +++++++++++ + 3 files changed, 30 insertions(+), 0 deletions(-) + +diff --git a/fs/cifs/file.c b/fs/cifs/file.c +index 786ec04..39c1ce0 100644 +--- a/fs/cifs/file.c ++++ b/fs/cifs/file.c +@@ -2060,6 +2060,8 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, + we will hit it on next read */ + + /* break; */ ++ /* send this page to FS-Cache */ ++ cifs_readpage_to_fscache(mapping->host, page); + } + } else { + cFYI(1, "No bytes read (%d) at offset %lld . " +@@ -2117,6 +2119,10 @@ static int cifs_readpage_worker(struct file *file, struct page *page, + + flush_dcache_page(page); + SetPageUptodate(page); ++ ++ /* send this page to the cache */ ++ cifs_readpage_to_fscache(file->f_path.dentry->d_inode, page); ++ + rc = 0; + + io_error: +diff --git a/fs/cifs/fscache.c b/fs/cifs/fscache.c +index c09d3b8..13e47d5 100644 +--- a/fs/cifs/fscache.c ++++ b/fs/cifs/fscache.c +@@ -145,6 +145,19 @@ int cifs_fscache_release_page(struct page *page, gfp_t gfp) + return 1; + } + ++void __cifs_readpage_to_fscache(struct inode *inode, struct page *page) ++{ ++ int ret; ++ ++ cFYI(1, "CIFS: readpage_to_fscache(fsc: %p, p: %p, i: %p\n", ++ CIFS_I(inode)->fscache, page, inode); ++ ret = fscache_write_page(CIFS_I(inode)->fscache, page, GFP_KERNEL); ++ cFYI(1, "CIFS: fscache_write_page returned %d\n", ret); ++ ++ if (ret != 0) ++ fscache_uncache_page(CIFS_I(inode)->fscache, page); ++} ++ + void __cifs_fscache_invalidate_page(struct page *page, struct inode *inode) + { + struct cifsInodeInfo *cifsi = CIFS_I(inode); +diff --git a/fs/cifs/fscache.h b/fs/cifs/fscache.h +index 127cb0a..e34d8ab 100644 +--- a/fs/cifs/fscache.h ++++ b/fs/cifs/fscache.h +@@ -50,6 +50,8 @@ extern void cifs_fscache_reset_inode_cookie(struct inode *); + extern void __cifs_fscache_invalidate_page(struct page *, struct inode *); + extern int cifs_fscache_release_page(struct page *page, gfp_t gfp); + ++extern void __cifs_readpage_to_fscache(struct inode *, struct page *); ++ + static inline void cifs_fscache_invalidate_page(struct page *page, + struct inode *inode) + { +@@ -57,6 +59,13 @@ static inline void cifs_fscache_invalidate_page(struct page *page, + __cifs_fscache_invalidate_page(page, inode); + } + ++static inline void cifs_readpage_to_fscache(struct inode *inode, ++ struct page *page) ++{ ++ if (PageFsCache(page)) ++ __cifs_readpage_to_fscache(inode, page); ++} ++ + #else /* CONFIG_CIFS_FSCACHE */ + static inline int cifs_fscache_register(void) { return 0; } + static inline void cifs_fscache_unregister(void) {} +@@ -80,6 +89,8 @@ static inline void cifs_fscache_release_page(struct page *page, gfp_t gfp) + + static inline int cifs_fscache_invalidate_page(struct page *page, + struct inode *) {} ++static inline void cifs_readpage_to_fscache(struct inode *inode, ++ struct page *page) {} + + #endif /* CONFIG_CIFS_FSCACHE */ + +-- +1.6.4.2 + +-- +To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + + diff --git a/test/corpora/lkml/cur/1382298770.001739:2, b/test/corpora/lkml/cur/1382298770.001739:2, new file mode 100644 index 00000000..d0abda0a --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.001739:2, @@ -0,0 +1,355 @@ +From: Suresh Jayaraman <sjayaraman@suse.de> +Subject: [RFC][PATCH 06/10] cifs: define inode-level cache object and register them +Date: Tue, 22 Jun 2010 20:53:33 +0530 +Lines: 318 +Message-ID: <1277220214-3597-1-git-send-email-sjayaraman@suse.de> +References: <yes> +Cc: linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, + linux-kernel@vger.kernel.org, David Howells <dhowells@redhat.com> +To: Steve French <smfrench@gmail.com> +X-From: linux-kernel-owner@vger.kernel.org Tue Jun 22 17:45:30 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1OR5fF-0000Ka-Na + for glk-linux-kernel-3@lo.gmane.org; Tue, 22 Jun 2010 17:45:30 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1755952Ab0FVPpP (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Tue, 22 Jun 2010 11:45:15 -0400 +Received: from victor.provo.novell.com ([137.65.250.26]:59441 "EHLO + victor.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1751397Ab0FVPoA (ORCPT + <rfc822;groupwise-SJayaraman@novell.com:0:0>); + Tue, 22 Jun 2010 11:44:00 -0400 +Received: from localhost (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) + by victor.provo.novell.com with ESMTP; Tue, 22 Jun 2010 09:23:35 -0600 +X-Mailer: git-send-email 1.6.4.2 +In-Reply-To: <yes> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1001765> + +Define inode-level data storage objects (managed by cifsInodeInfo structs). +Each inode-level object is created in a super-block level object and is itself +a data storage object in to which pages from the inode are stored. + +The inode object is keyed by UniqueId. The coherency data being used is +LastWriteTime and the file size. + +Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de> +--- + fs/cifs/cache.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + fs/cifs/cifsfs.c | 7 ++++ + fs/cifs/cifsglob.h | 3 + + fs/cifs/file.c | 6 +++ + fs/cifs/fscache.c | 68 +++++++++++++++++++++++++++++++++++++++++++++ + fs/cifs/fscache.h | 12 +++++++ + fs/cifs/inode.c | 4 ++ + 7 files changed, 180 insertions(+) + +Index: cifs-2.6/fs/cifs/cache.c +=================================================================== +--- cifs-2.6.orig/fs/cifs/cache.c ++++ cifs-2.6/fs/cifs/cache.c +@@ -138,3 +138,83 @@ const struct fscache_cookie_def cifs_fsc + .get_key = cifs_super_get_key, + }; + ++/* ++ * Auxiliary data attached to CIFS inode within the cache ++ */ ++struct cifs_fscache_inode_auxdata { ++ struct timespec last_write_time; ++ loff_t size; ++}; ++ ++static uint16_t cifs_fscache_inode_get_key(const void *cookie_netfs_data, ++ void *buffer, uint16_t maxbuf) ++{ ++ const struct cifsInodeInfo *cifsi = cookie_netfs_data; ++ uint16_t keylen; ++ ++ /* use the UniqueId as the key */ ++ keylen = sizeof(cifsi->uniqueid); ++ if (keylen > maxbuf) ++ keylen = 0; ++ else ++ memcpy(buffer, &cifsi->uniqueid, keylen); ++ ++ return keylen; ++} ++ ++static void ++cifs_fscache_inode_get_attr(const void *cookie_netfs_data, uint64_t *size) ++{ ++ const struct cifsInodeInfo *cifsi = cookie_netfs_data; ++ ++ *size = cifsi->vfs_inode.i_size; ++} ++ ++static uint16_t ++cifs_fscache_inode_get_aux(const void *cookie_netfs_data, void *buffer, ++ uint16_t maxbuf) ++{ ++ struct cifs_fscache_inode_auxdata auxdata; ++ const struct cifsInodeInfo *cifsi = cookie_netfs_data; ++ ++ memset(&auxdata, 0, sizeof(auxdata)); ++ auxdata.size = cifsi->vfs_inode.i_size; ++ auxdata.last_write_time = cifsi->vfs_inode.i_ctime; ++ ++ if (maxbuf > sizeof(auxdata)) ++ maxbuf = sizeof(auxdata); ++ ++ memcpy(buffer, &auxdata, maxbuf); ++ ++ return maxbuf; ++} ++ ++static enum ++fscache_checkaux cifs_fscache_inode_check_aux(void *cookie_netfs_data, ++ const void *data, ++ uint16_t datalen) ++{ ++ struct cifs_fscache_inode_auxdata auxdata; ++ struct cifsInodeInfo *cifsi = cookie_netfs_data; ++ ++ if (datalen != sizeof(auxdata)) ++ return FSCACHE_CHECKAUX_OBSOLETE; ++ ++ memset(&auxdata, 0, sizeof(auxdata)); ++ auxdata.size = cifsi->vfs_inode.i_size; ++ auxdata.last_write_time = cifsi->vfs_inode.i_ctime; ++ ++ if (memcmp(data, &auxdata, datalen) != 0) ++ return FSCACHE_CHECKAUX_OBSOLETE; ++ ++ return FSCACHE_CHECKAUX_OKAY; ++} ++ ++const struct fscache_cookie_def cifs_fscache_inode_object_def = { ++ .name = "CIFS.uniqueid", ++ .type = FSCACHE_COOKIE_TYPE_DATAFILE, ++ .get_key = cifs_fscache_inode_get_key, ++ .get_attr = cifs_fscache_inode_get_attr, ++ .get_aux = cifs_fscache_inode_get_aux, ++ .check_aux = cifs_fscache_inode_check_aux, ++}; +Index: cifs-2.6/fs/cifs/cifsfs.c +=================================================================== +--- cifs-2.6.orig/fs/cifs/cifsfs.c ++++ cifs-2.6/fs/cifs/cifsfs.c +@@ -330,6 +330,12 @@ cifs_destroy_inode(struct inode *inode) + } + + static void ++cifs_clear_inode(struct inode *inode) ++{ ++ cifs_fscache_release_inode_cookie(inode); ++} ++ ++static void + cifs_show_address(struct seq_file *s, struct TCP_Server_Info *server) + { + seq_printf(s, ",addr="); +@@ -490,6 +496,7 @@ static const struct super_operations cif + .alloc_inode = cifs_alloc_inode, + .destroy_inode = cifs_destroy_inode, + .drop_inode = cifs_drop_inode, ++ .clear_inode = cifs_clear_inode, + /* .delete_inode = cifs_delete_inode, */ /* Do not need above + function unless later we add lazy close of inodes or unless the + kernel forgets to call us with the same number of releases (closes) +Index: cifs-2.6/fs/cifs/cifsglob.h +=================================================================== +--- cifs-2.6.orig/fs/cifs/cifsglob.h ++++ cifs-2.6/fs/cifs/cifsglob.h +@@ -407,6 +407,9 @@ struct cifsInodeInfo { + bool invalid_mapping:1; /* pagecache is invalid */ + u64 server_eof; /* current file size on server */ + u64 uniqueid; /* server inode number */ ++#ifdef CONFIG_CIFS_FSCACHE ++ struct fscache_cookie *fscache; ++#endif + struct inode vfs_inode; + }; + +Index: cifs-2.6/fs/cifs/file.c +=================================================================== +--- cifs-2.6.orig/fs/cifs/file.c ++++ cifs-2.6/fs/cifs/file.c +@@ -40,6 +40,7 @@ + #include "cifs_unicode.h" + #include "cifs_debug.h" + #include "cifs_fs_sb.h" ++#include "fscache.h" + + static inline int cifs_convert_flags(unsigned int flags) + { +@@ -282,6 +283,9 @@ int cifs_open(struct inode *inode, struc + CIFSSMBClose(xid, tcon, netfid); + rc = -ENOMEM; + } ++ ++ cifs_fscache_set_inode_cookie(inode, file); ++ + goto out; + } else if ((rc == -EINVAL) || (rc == -EOPNOTSUPP)) { + if (tcon->ses->serverNOS) +@@ -373,6 +377,8 @@ int cifs_open(struct inode *inode, struc + goto out; + } + ++ cifs_fscache_set_inode_cookie(inode, file); ++ + if (oplock & CIFS_CREATE_ACTION) { + /* time to set mode which we can not set earlier due to + problems creating new read-only files */ +Index: cifs-2.6/fs/cifs/fscache.c +=================================================================== +--- cifs-2.6.orig/fs/cifs/fscache.c ++++ cifs-2.6/fs/cifs/fscache.c +@@ -62,3 +62,71 @@ void cifs_fscache_release_super_cookie(s + tcon->fscache = NULL; + } + ++static void cifs_fscache_enable_inode_cookie(struct inode *inode) ++{ ++ struct cifsInodeInfo *cifsi = CIFS_I(inode); ++ struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb); ++ ++ if (cifsi->fscache) ++ return; ++ ++ cifsi->fscache = fscache_acquire_cookie(cifs_sb->tcon->fscache, ++ &cifs_fscache_inode_object_def, ++ cifsi); ++ cFYI(1, "CIFS: got FH cookie (0x%p/0x%p/0x%p)\n", ++ cifs_sb->tcon, cifsi, cifsi->fscache); ++} ++ ++void cifs_fscache_release_inode_cookie(struct inode *inode) ++{ ++ struct cifsInodeInfo *cifsi = CIFS_I(inode); ++ ++ if (cifsi->fscache) { ++ cFYI(1, "CIFS releasing inode cookie (0x%p/0x%p)\n", ++ cifsi, cifsi->fscache); ++ fscache_relinquish_cookie(cifsi->fscache, 0); ++ cifsi->fscache = NULL; ++ } ++} ++ ++static void cifs_fscache_disable_inode_cookie(struct inode *inode) ++{ ++ struct cifsInodeInfo *cifsi = CIFS_I(inode); ++ ++ if (cifsi->fscache) { ++ cFYI(1, "CIFS disabling inode cookie (0x%p/0x%p)\n", ++ cifsi, cifsi->fscache); ++ fscache_relinquish_cookie(cifsi->fscache, 1); ++ cifsi->fscache = NULL; ++ } ++} ++ ++void cifs_fscache_set_inode_cookie(struct inode *inode, struct file *filp) ++{ ++ /* BB: parallel opens - need locking? */ ++ if ((filp->f_flags & O_ACCMODE) != O_RDONLY) ++ cifs_fscache_disable_inode_cookie(inode); ++ else { ++ cifs_fscache_enable_inode_cookie(inode); ++ cFYI(1, "CIFS: fscache inode cookie set\n"); ++ } ++} ++ ++void cifs_fscache_reset_inode_cookie(struct inode *inode) ++{ ++ struct cifsInodeInfo *cifsi = CIFS_I(inode); ++ struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb); ++ struct fscache_cookie *old = cifsi->fscache; ++ ++ if (cifsi->fscache) { ++ /* retire the current fscache cache and get a new one */ ++ fscache_relinquish_cookie(cifsi->fscache, 1); ++ ++ cifsi->fscache = fscache_acquire_cookie(cifs_sb->tcon->fscache, ++ &cifs_fscache_inode_object_def, ++ cifsi); ++ cFYI(1, "CIFS: new cookie (0x%p/0x%p) oldcookie 0x%p\n", ++ cifsi, cifsi->fscache, old); ++ } ++} ++ +Index: cifs-2.6/fs/cifs/fscache.h +=================================================================== +--- cifs-2.6.orig/fs/cifs/fscache.h ++++ cifs-2.6/fs/cifs/fscache.h +@@ -29,6 +29,8 @@ + extern struct fscache_netfs cifs_fscache_netfs; + extern const struct fscache_cookie_def cifs_fscache_server_index_def; + extern const struct fscache_cookie_def cifs_fscache_super_index_def; ++extern const struct fscache_cookie_def cifs_fscache_inode_object_def; ++ + + extern int cifs_fscache_register(void); + extern void cifs_fscache_unregister(void); +@@ -41,6 +43,10 @@ extern void cifs_fscache_release_client_ + extern void cifs_fscache_get_super_cookie(struct cifsTconInfo *); + extern void cifs_fscache_release_super_cookie(struct cifsTconInfo *); + ++extern void cifs_fscache_release_inode_cookie(struct inode *); ++extern void cifs_fscache_set_inode_cookie(struct inode *, struct file *); ++extern void cifs_fscache_reset_inode_cookie(struct inode *); ++ + #else /* CONFIG_CIFS_FSCACHE */ + static inline int cifs_fscache_register(void) { return 0; } + static inline void cifs_fscache_unregister(void) {} +@@ -53,6 +59,12 @@ static inline void cifs_fscache_get_supe + static inline void + cifs_fscache_release_super_cookie(struct cifsTconInfo *tcon) {} + ++static inline void cifs_fscache_release_inode_cookie(struct inode *inode) {} ++static inline void cifs_fscache_set_inode_cookie(struct inode *inode, ++ struct file *filp) {} ++static inline void cifs_fscache_reset_inode_cookie(struct inode *inode) {} ++ ++ + #endif /* CONFIG_CIFS_FSCACHE */ + + #endif /* _CIFS_FSCACHE_H */ +Index: cifs-2.6/fs/cifs/inode.c +=================================================================== +--- cifs-2.6.orig/fs/cifs/inode.c ++++ cifs-2.6/fs/cifs/inode.c +@@ -29,6 +29,7 @@ + #include "cifsproto.h" + #include "cifs_debug.h" + #include "cifs_fs_sb.h" ++#include "fscache.h" + + + static void cifs_set_ops(struct inode *inode, const bool is_dfs_referral) +@@ -776,6 +777,8 @@ retry_iget5_locked: + inode->i_flags |= S_NOATIME | S_NOCMTIME; + if (inode->i_state & I_NEW) { + inode->i_ino = hash; ++ /* initialize per-inode cache cookie pointer */ ++ CIFS_I(inode)->fscache = NULL; + unlock_new_inode(inode); + } + } +@@ -1568,6 +1571,7 @@ cifs_invalidate_mapping(struct inode *in + cifs_i->write_behind_rc = rc; + } + invalidate_remote_inode(inode); ++ cifs_fscache_reset_inode_cookie(inode); + } + + int cifs_revalidate_file(struct file *filp) + + diff --git a/test/corpora/lkml/cur/1382298770.001740:2, b/test/corpora/lkml/cur/1382298770.001740:2, new file mode 100644 index 00000000..ef0f657b --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.001740:2, @@ -0,0 +1,214 @@ +From: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +Subject: [RFC][PATCH 05/10] cifs: define superblock-level cache index objects and register them +Date: Tue, 22 Jun 2010 20:53:26 +0530 +Lines: 177 +Message-ID: <1277220206-3559-1-git-send-email-sjayaraman@suse.de> +References: <yes> +Cc: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +To: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Tue Jun 22 17:45:50 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1OR5fZ-0000Vj-Mj + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Tue, 22 Jun 2010 17:45:50 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1752511Ab0FVPpJ (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Tue, 22 Jun 2010 11:45:09 -0400 +Received: from victor.provo.novell.com ([137.65.250.26]:56189 "EHLO + victor.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1752441Ab0FVPoA (ORCPT + <rfc822;groupwise-SJayaraman-Et1tbQHTxzrQT0dZR+AlfA@public.gmane.org:0:0>); + Tue, 22 Jun 2010 11:44:00 -0400 +Received: from localhost (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) + by victor.provo.novell.com with ESMTP; Tue, 22 Jun 2010 09:23:29 -0600 +X-Mailer: git-send-email 1.6.4.2 +In-Reply-To: <yes> +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1001766> + +Define superblock-level cache index objects (managed by cifsTconInfo structs). +Each superblock object is created in a server-level index object and in itself +an index into which inode-level objects are inserted. + +Currently, the superblock objects are keyed by sharename. + +Signed-off-by: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +--- + fs/cifs/cache.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + fs/cifs/cifsglob.h | 3 ++ + fs/cifs/connect.c | 4 +++ + fs/cifs/fscache.c | 17 ++++++++++++++ + fs/cifs/fscache.h | 6 +++++ + 5 files changed, 92 insertions(+) + +Index: cifs-2.6/fs/cifs/cache.c +=================================================================== +--- cifs-2.6.orig/fs/cifs/cache.c ++++ cifs-2.6/fs/cifs/cache.c +@@ -76,3 +76,65 @@ const struct fscache_cookie_def cifs_fsc + .type = FSCACHE_COOKIE_TYPE_INDEX, + .get_key = cifs_server_get_key, + }; ++ ++static char *extract_sharename(const char *treename) ++{ ++ const char *src; ++ char *delim, *dst; ++ int len; ++ ++ /* skip double chars at the beginning */ ++ src = treename + 2; ++ ++ /* share name is always preceded by '\\' now */ ++ delim = strchr(src, '\\'); ++ if (!delim) ++ return ERR_PTR(-EINVAL); ++ delim++; ++ len = strlen(delim); ++ ++ /* caller has to free the memory */ ++ dst = kstrndup(delim, len, GFP_KERNEL); ++ if (!dst) ++ return ERR_PTR(-ENOMEM); ++ ++ return dst; ++} ++ ++/* ++ * Superblock object currently keyed by share name ++ */ ++static uint16_t cifs_super_get_key(const void *cookie_netfs_data, void *buffer, ++ uint16_t maxbuf) ++{ ++ const struct cifsTconInfo *tcon = cookie_netfs_data; ++ char *sharename; ++ uint16_t len; ++ ++ sharename = extract_sharename(tcon->treeName); ++ if (IS_ERR(sharename)) { ++ cFYI(1, "CIFS: couldn't extract sharename\n"); ++ sharename = NULL; ++ return 0; ++ } ++ ++ len = strlen(sharename); ++ if (len > maxbuf) ++ return 0; ++ ++ memcpy(buffer, sharename, len); ++ ++ kfree(sharename); ++ ++ return len; ++} ++ ++/* ++ * Superblock object for FS-Cache ++ */ ++const struct fscache_cookie_def cifs_fscache_super_index_def = { ++ .name = "CIFS.super", ++ .type = FSCACHE_COOKIE_TYPE_INDEX, ++ .get_key = cifs_super_get_key, ++}; ++ +Index: cifs-2.6/fs/cifs/cifsglob.h +=================================================================== +--- cifs-2.6.orig/fs/cifs/cifsglob.h ++++ cifs-2.6/fs/cifs/cifsglob.h +@@ -317,6 +317,9 @@ struct cifsTconInfo { + bool local_lease:1; /* check leases (only) on local system not remote */ + bool broken_posix_open; /* e.g. Samba server versions < 3.3.2, 3.2.9 */ + bool need_reconnect:1; /* connection reset, tid now invalid */ ++#ifdef CONFIG_CIFS_FSCACHE ++ struct fscache_cookie *fscache; /* cookie for share */ ++#endif + /* BB add field for back pointer to sb struct(s)? */ + }; + +Index: cifs-2.6/fs/cifs/connect.c +=================================================================== +--- cifs-2.6.orig/fs/cifs/connect.c ++++ cifs-2.6/fs/cifs/connect.c +@@ -1773,6 +1773,8 @@ cifs_put_tcon(struct cifsTconInfo *tcon) + list_del_init(&tcon->tcon_list); + write_unlock(&cifs_tcp_ses_lock); + ++ cifs_fscache_release_super_cookie(tcon); ++ + xid = GetXid(); + CIFSSMBTDis(xid, tcon); + _FreeXid(xid); +@@ -1843,6 +1845,8 @@ cifs_get_tcon(struct cifsSesInfo *ses, s + tcon->nocase = volume_info->nocase; + tcon->local_lease = volume_info->local_lease; + ++ cifs_fscache_get_super_cookie(tcon); ++ + write_lock(&cifs_tcp_ses_lock); + list_add(&tcon->tcon_list, &ses->tcon_list); + write_unlock(&cifs_tcp_ses_lock); +Index: cifs-2.6/fs/cifs/fscache.c +=================================================================== +--- cifs-2.6.orig/fs/cifs/fscache.c ++++ cifs-2.6/fs/cifs/fscache.c +@@ -45,3 +45,20 @@ void cifs_fscache_release_client_cookie( + server->fscache = NULL; + } + ++void cifs_fscache_get_super_cookie(struct cifsTconInfo *tcon) ++{ ++ tcon->fscache = ++ fscache_acquire_cookie(tcon->ses->server->fscache, ++ &cifs_fscache_super_index_def, tcon); ++ cFYI(1, "CIFS: get superblock cookie (0x%p/0x%p)\n", ++ tcon, tcon->fscache); ++} ++ ++void cifs_fscache_release_super_cookie(struct cifsTconInfo *tcon) ++{ ++ cFYI(1, "CIFS: releasing superblock cookie (0x%p/0x%p)\n", ++ tcon, tcon->fscache); ++ fscache_relinquish_cookie(tcon->fscache, 0); ++ tcon->fscache = NULL; ++} ++ +Index: cifs-2.6/fs/cifs/fscache.h +=================================================================== +--- cifs-2.6.orig/fs/cifs/fscache.h ++++ cifs-2.6/fs/cifs/fscache.h +@@ -28,6 +28,7 @@ + + extern struct fscache_netfs cifs_fscache_netfs; + extern const struct fscache_cookie_def cifs_fscache_server_index_def; ++extern const struct fscache_cookie_def cifs_fscache_super_index_def; + + extern int cifs_fscache_register(void); + extern void cifs_fscache_unregister(void); +@@ -37,6 +38,8 @@ extern void cifs_fscache_unregister(void + */ + extern void cifs_fscache_get_client_cookie(struct TCP_Server_Info *); + extern void cifs_fscache_release_client_cookie(struct TCP_Server_Info *); ++extern void cifs_fscache_get_super_cookie(struct cifsTconInfo *); ++extern void cifs_fscache_release_super_cookie(struct cifsTconInfo *); + + #else /* CONFIG_CIFS_FSCACHE */ + static inline int cifs_fscache_register(void) { return 0; } +@@ -46,6 +49,9 @@ static inline void + cifs_fscache_get_client_cookie(struct TCP_Server_Info *server) {} + static inline void + cifs_fscache_get_client_cookie(struct TCP_Server_Info *server); {} ++static inline void cifs_fscache_get_super_cookie(struct cifsTconInfo *tcon) {} ++static inline void ++cifs_fscache_release_super_cookie(struct cifsTconInfo *tcon) {} + + #endif /* CONFIG_CIFS_FSCACHE */ + + + diff --git a/test/corpora/lkml/cur/1382298770.001887:2, b/test/corpora/lkml/cur/1382298770.001887:2, new file mode 100644 index 00000000..81290484 --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.001887:2, @@ -0,0 +1,85 @@ +From: Jeff Layton <jlayton-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org> +Subject: Re: [RFC][PATCH 02/10] cifs: guard cifsglob.h against multiple + inclusion +Date: Tue, 22 Jun 2010 17:37:42 -0400 +Lines: 35 +Message-ID: <20100622173742.448e1e94@corrin.poochiereds.net> +References: <yes> + <1277220170-3442-1-git-send-email-sjayaraman@suse.de> +Mime-Version: 1.0 +Content-Type: text/plain; charset=US-ASCII +Content-Transfer-Encoding: 7bit +Cc: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +To: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Tue Jun 22 23:36:08 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1ORB8Z-00027v-R8 + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Tue, 22 Jun 2010 23:36:08 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1751663Ab0FVVfq (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Tue, 22 Jun 2010 17:35:46 -0400 +Received: from cdptpa-omtalb.mail.rr.com ([75.180.132.121]:46190 "EHLO + cdptpa-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1751933Ab0FVVfo (ORCPT + <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); Tue, 22 Jun 2010 17:35:44 -0400 +X-Authority-Analysis: v=1.0 c=1 a=Y4kVDsoNLLAA:10 a=yQWWgrYGNuUA:10 a=kj9zAlcOel0A:10 a=hGzw-44bAAAA:8 a=6UT2YofcClCzWf3PPoQA:9 a=Ipo6nwFRv7ENfF13HvmH_iG48b8A:4 a=CjuIK1q_8ugA:10 a=0kPLrQdw3YYA:10 a=dowx1zmaLagA:10 +X-Cloudmark-Score: 0 +X-Originating-IP: 71.70.153.3 +Received: from [71.70.153.3] ([71.70.153.3:49036] helo=mail.poochiereds.net) + by cdptpa-oedge01.mail.rr.com (envelope-from <jlayton-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org>) + (ecelerity 2.2.2.39 r()) with ESMTP + id 29/22-24471-DAC212C4; Tue, 22 Jun 2010 21:35:42 +0000 +Received: from corrin.poochiereds.net (unknown [65.88.2.5]) + by mail.poochiereds.net (Postfix) with ESMTPSA id 1C5A1580F4; + Tue, 22 Jun 2010 17:35:41 -0400 (EDT) +In-Reply-To: <1277220170-3442-1-git-send-email-sjayaraman-l3A5Bk7waGM@public.gmane.org> +X-Mailer: Claws Mail 3.7.6 (GTK+ 2.20.1; x86_64-redhat-linux-gnu) +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1001913> + +On Tue, 22 Jun 2010 20:52:50 +0530 +Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> wrote: + +> Add conditional compile macros to guard the header file against multiple +> inclusion. +> +> Signed-off-by: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +> --- +> fs/cifs/cifsglob.h | 5 +++++ +> 1 files changed, 5 insertions(+), 0 deletions(-) +> +> diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h +> index a88479c..6b2c39d 100644 +> --- a/fs/cifs/cifsglob.h +> +++ b/fs/cifs/cifsglob.h +> @@ -16,6 +16,9 @@ +> * the GNU Lesser General Public License for more details. +> * +> */ +> +#ifndef _CIFS_GLOB_H +> +#define _CIFS_GLOB_H +> + +> #include <linux/in.h> +> #include <linux/in6.h> +> #include <linux/slab.h> +> @@ -733,3 +736,5 @@ GLOBAL_EXTERN unsigned int cifs_min_small; /* min size of small buf pool */ +> GLOBAL_EXTERN unsigned int cifs_max_pending; /* MAX requests at once to server*/ +> +> extern const struct slow_work_ops cifs_oplock_break_ops; +> + +> +#endif /* _CIFS_GLOB_H */ + +Strong ACK + +Acked-by: Jeff Layton <jlayton-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org> + + diff --git a/test/corpora/lkml/cur/1382298770.001892:2, b/test/corpora/lkml/cur/1382298770.001892:2, new file mode 100644 index 00000000..82603bf1 --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.001892:2, @@ -0,0 +1,254 @@ +From: Jeff Layton <jlayton-vpEMnDpepFuMZCB2o+C8xQ@public.gmane.org> +Subject: Re: [RFC][PATCH 04/10] cifs: define server-level cache index + objects and register them with FS-Cache +Date: Tue, 22 Jun 2010 17:52:14 -0400 +Lines: 204 +Message-ID: <20100622175214.4c56234f@corrin.poochiereds.net> +References: <yes> + <1277220198-3522-1-git-send-email-sjayaraman@suse.de> +Mime-Version: 1.0 +Content-Type: text/plain; charset=US-ASCII +Content-Transfer-Encoding: 7bit +Cc: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +To: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Tue Jun 22 23:50:23 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1ORBMJ-0005WJ-Lj + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Tue, 22 Jun 2010 23:50:20 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1750777Ab0FVVuS (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Tue, 22 Jun 2010 17:50:18 -0400 +Received: from cdptpa-omtalb.mail.rr.com ([75.180.132.120]:55670 "EHLO + cdptpa-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1750749Ab0FVVuR (ORCPT + <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); Tue, 22 Jun 2010 17:50:17 -0400 +X-Authority-Analysis: v=1.1 cv=8MuG1bpxLlSbaYWWtODGdBCK7StbFcRsMXhWm1NVx/I= c=1 sm=0 a=wpY4Lvx3kJcA:10 a=UBIxAjGgU1YA:10 a=kj9zAlcOel0A:10 a=ld/erqUjW76FpBUqCqkKeA==:17 a=VwQbUJbxAAAA:8 a=qYub2k57AAAA:8 a=uYIlwBZcjrF9BUCsR4kA:9 a=OO1ZLbZb6q4TPdC5pcAA:7 a=jFshslHAf8hJVDYUYRlYN4n-w5YA:4 a=CjuIK1q_8ugA:10 a=x8gzFH9gYPwA:10 a=0kPLrQdw3YYA:10 a=jBoGP612-tUA:10 a=t5DF_bUGhurCx8LQ:21 a=W6P_Gh1y2IibdbqZ:21 a=ld/erqUjW76FpBUqCqkKeA==:117 +X-Cloudmark-Score: 0 +X-Originating-IP: 71.70.153.3 +Received: from [71.70.153.3] ([71.70.153.3:59154] helo=mail.poochiereds.net) + by cdptpa-oedge03.mail.rr.com (envelope-from <jlayton-vpEMnDpepFuMZCB2o+C8xQ@public.gmane.org>) + (ecelerity 2.2.2.39 r()) with ESMTP + id AC/10-00502-710312C4; Tue, 22 Jun 2010 21:50:16 +0000 +Received: from corrin.poochiereds.net (unknown [65.88.2.5]) + by mail.poochiereds.net (Postfix) with ESMTPSA id 03B11580F4; + Tue, 22 Jun 2010 17:50:14 -0400 (EDT) +In-Reply-To: <1277220198-3522-1-git-send-email-sjayaraman-l3A5Bk7waGM@public.gmane.org> +X-Mailer: Claws Mail 3.7.6 (GTK+ 2.20.1; x86_64-redhat-linux-gnu) +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1001918> + +On Tue, 22 Jun 2010 20:53:18 +0530 +Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> wrote: + +> Define server-level cache index objects (as managed by TCP_ServerInfo structs). +> Each server object is created in the CIFS top-level index object and is itself +> an index into which superblock-level objects are inserted. +> +> Currently, the server objects are keyed by hostname. +> +> Signed-off-by: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +> --- +> fs/cifs/Makefile | 2 +- +> fs/cifs/cache.c | 25 +++++++++++++++++++++++++ +> fs/cifs/cifsglob.h | 3 +++ +> fs/cifs/connect.c | 4 ++++ +> fs/cifs/fscache.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ +> fs/cifs/fscache.h | 12 ++++++++++++ +> 6 files changed, 92 insertions(+), 1 deletion(-) +> create mode 100644 fs/cifs/fscache.c +> +> Index: cifs-2.6/fs/cifs/Makefile +> =================================================================== +> --- cifs-2.6.orig/fs/cifs/Makefile +> +++ cifs-2.6/fs/cifs/Makefile +> @@ -12,4 +12,4 @@ cifs-$(CONFIG_CIFS_UPCALL) += cifs_spneg +> +> cifs-$(CONFIG_CIFS_DFS_UPCALL) += dns_resolve.o cifs_dfs_ref.o +> +> -cifs-$(CONFIG_CIFS_FSCACHE) += cache.o +> +cifs-$(CONFIG_CIFS_FSCACHE) += fscache.o cache.o +> Index: cifs-2.6/fs/cifs/cache.c +> =================================================================== +> --- cifs-2.6.orig/fs/cifs/cache.c +> +++ cifs-2.6/fs/cifs/cache.c +> @@ -51,3 +51,28 @@ void cifs_fscache_unregister(void) +> fscache_unregister_netfs(&cifs_fscache_netfs); +> } +> +> +/* +> + * Server object currently keyed by hostname +> + */ +> +static uint16_t cifs_server_get_key(const void *cookie_netfs_data, +> + void *buffer, uint16_t maxbuf) +> +{ +> + const struct TCP_Server_Info *server = cookie_netfs_data; +> + uint16_t len = strnlen(server->hostname, sizeof(server->hostname)); +> + + +Would a tuple of address/family/port be a better choice here? Imagine I +mount "foo" and then later mount "foor.bar.baz". If they are the same +address and only the UNC differs, then you won't get the benefit of +the cache, right? + +> + if (len > maxbuf) +> + return 0; +> + +> + memcpy(buffer, server->hostname, len); +> + +> + return len; +> +} +> + +> +/* +> + * Server object for FS-Cache +> + */ +> +const struct fscache_cookie_def cifs_fscache_server_index_def = { +> + .name = "CIFS.server", +> + .type = FSCACHE_COOKIE_TYPE_INDEX, +> + .get_key = cifs_server_get_key, +> +}; +> Index: cifs-2.6/fs/cifs/cifsglob.h +> =================================================================== +> --- cifs-2.6.orig/fs/cifs/cifsglob.h +> +++ cifs-2.6/fs/cifs/cifsglob.h +> @@ -193,6 +193,9 @@ struct TCP_Server_Info { +> bool sec_mskerberos; /* supports legacy MS Kerberos */ +> bool sec_kerberosu2u; /* supports U2U Kerberos */ +> bool sec_ntlmssp; /* supports NTLMSSP */ +> +#ifdef CONFIG_CIFS_FSCACHE +> + struct fscache_cookie *fscache; /* client index cache cookie */ +> +#endif +> }; +> +> /* +> Index: cifs-2.6/fs/cifs/connect.c +> =================================================================== +> --- cifs-2.6.orig/fs/cifs/connect.c +> +++ cifs-2.6/fs/cifs/connect.c +> @@ -48,6 +48,7 @@ +> #include "nterr.h" +> #include "rfc1002pdu.h" +> #include "cn_cifs.h" +> +#include "fscache.h" +> +> #define CIFS_PORT 445 +> #define RFC1001_PORT 139 +> @@ -1453,6 +1454,8 @@ cifs_put_tcp_session(struct TCP_Server_I +> return; +> } +> +> + cifs_fscache_release_client_cookie(server); +> + +> list_del_init(&server->tcp_ses_list); +> write_unlock(&cifs_tcp_ses_lock); +> +> @@ -1572,6 +1575,7 @@ cifs_get_tcp_session(struct smb_vol *vol +> goto out_err; +> } +> +> + cifs_fscache_get_client_cookie(tcp_ses); +> /* thread spawned, put it on the list */ +> write_lock(&cifs_tcp_ses_lock); +> list_add(&tcp_ses->tcp_ses_list, &cifs_tcp_ses_list); +> Index: cifs-2.6/fs/cifs/fscache.c +> =================================================================== +> --- /dev/null +> +++ cifs-2.6/fs/cifs/fscache.c +> @@ -0,0 +1,47 @@ +> +/* +> + * fs/cifs/fscache.c - CIFS filesystem cache interface +> + * +> + * Copyright (c) 2010 Novell, Inc. +> + * Authors(s): Suresh Jayaraman (sjayaraman-l3A5Bk7waGM@public.gmane.org> +> + * +> + * This library is free software; you can redistribute it and/or modify +> + * it under the terms of the GNU Lesser General Public License as published +> + * by the Free Software Foundation; either version 2.1 of the License, or +> + * (at your option) any later version. +> + * +> + * This library is distributed in the hope that it will be useful, +> + * but WITHOUT ANY WARRANTY; without even the implied warranty of +> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See +> + * the GNU Lesser General Public License for more details. +> + * +> + * You should have received a copy of the GNU Lesser General Public License +> + * along with this library; if not, write to the Free Software +> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +> + */ +> +#include <linux/init.h> +> +#include <linux/kernel.h> +> +#include <linux/sched.h> +> +#include <linux/mm.h> +> +#include <linux/in6.h> +> + +> +#include "fscache.h" +> +#include "cifsglob.h" +> +#include "cifs_debug.h" +> + +> +void cifs_fscache_get_client_cookie(struct TCP_Server_Info *server) +> +{ +> + server->fscache = +> + fscache_acquire_cookie(cifs_fscache_netfs.primary_index, +> + &cifs_fscache_server_index_def, server); +> + cFYI(1, "CIFS: get client cookie (0x%p/0x%p)\n", +> + server, server->fscache); +> +} +> + +> +void cifs_fscache_release_client_cookie(struct TCP_Server_Info *server) +> +{ +> + cFYI(1, "CIFS: release client cookie (0x%p/0x%p)\n", +> + server, server->fscache); +> + fscache_relinquish_cookie(server->fscache, 0); +> + server->fscache = NULL; +> +} +> + +> Index: cifs-2.6/fs/cifs/fscache.h +> =================================================================== +> --- cifs-2.6.orig/fs/cifs/fscache.h +> +++ cifs-2.6/fs/cifs/fscache.h +> @@ -27,14 +27,26 @@ +> #ifdef CONFIG_CIFS_FSCACHE +> +> extern struct fscache_netfs cifs_fscache_netfs; +> +extern const struct fscache_cookie_def cifs_fscache_server_index_def; +> +> extern int cifs_fscache_register(void); +> extern void cifs_fscache_unregister(void); +> +> +/* +> + * fscache.c +> + */ +> +extern void cifs_fscache_get_client_cookie(struct TCP_Server_Info *); +> +extern void cifs_fscache_release_client_cookie(struct TCP_Server_Info *); +> + +> #else /* CONFIG_CIFS_FSCACHE */ +> static inline int cifs_fscache_register(void) { return 0; } +> static inline void cifs_fscache_unregister(void) {} +> +> +static inline void +> +cifs_fscache_get_client_cookie(struct TCP_Server_Info *server) {} +> +static inline void +> +cifs_fscache_get_client_cookie(struct TCP_Server_Info *server); {} +> + +> #endif /* CONFIG_CIFS_FSCACHE */ +> +> #endif /* _CIFS_FSCACHE_H */ +> -- +> To unsubscribe from this list: send the line "unsubscribe linux-cifs" in +> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +> More majordomo info at http://vger.kernel.org/majordomo-info.html +> + + +-- +Jeff Layton <jlayton-vpEMnDpepFuMZCB2o+C8xQ@public.gmane.org> + + diff --git a/test/corpora/lkml/cur/1382298770.002189:2, b/test/corpora/lkml/cur/1382298770.002189:2, new file mode 100644 index 00000000..3cfc62e0 --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.002189:2, @@ -0,0 +1,66 @@ +From: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +Subject: Re: [RFC][PATCH 03/10] cifs: register CIFS for caching +Date: Wed, 23 Jun 2010 17:51:17 +0100 +Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley + Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United + Kingdom. + Registered in England and Wales under Company Registration No. 3798903 +Lines: 20 +Message-ID: <9603.1277311877@redhat.com> +References: <1277220189-3485-1-git-send-email-sjayaraman@suse.de> <yes> +Cc: dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, + linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +To: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Wed Jun 23 18:51:32 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1ORTAg-0008Bt-CT + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Wed, 23 Jun 2010 18:51:30 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1751915Ab0FWQv3 (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Wed, 23 Jun 2010 12:51:29 -0400 +Received: from mx1.redhat.com ([209.132.183.28]:50923 "EHLO mx1.redhat.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1751520Ab0FWQv3 (ORCPT <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); + Wed, 23 Jun 2010 12:51:29 -0400 +Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) + by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5NGpLFc028550 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); + Wed, 23 Jun 2010 12:51:21 -0400 +Received: from redhat.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) + by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5NGpHIG010890; + Wed, 23 Jun 2010 12:51:18 -0400 +In-Reply-To: <1277220189-3485-1-git-send-email-sjayaraman-l3A5Bk7waGM@public.gmane.org> +X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1002219> + +Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> wrote: + +> + rc = cifs_fscache_register(); +> + if (rc) +> + goto out; +> + +> rc = cifs_init_inodecache(); +> if (rc) +> goto out_clean_proc; +> @@ -949,8 +954,10 @@ init_cifs(void) +> cifs_destroy_mids(); +> out_destroy_inodecache: +> cifs_destroy_inodecache(); +> + cifs_fscache_unregister(); +> out_clean_proc: + +This is incorrect. You need to call cifs_fscache_unregister() if +cifs_init_inodecache() fails. + +David + + diff --git a/test/corpora/lkml/cur/1382298770.002191:2, b/test/corpora/lkml/cur/1382298770.002191:2, new file mode 100644 index 00000000..56752a9f --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.002191:2, @@ -0,0 +1,65 @@ +From: David Howells <dhowells@redhat.com> +Subject: Re: [RFC][PATCH 04/10] cifs: define server-level cache index objects and register them with FS-Cache +Date: Wed, 23 Jun 2010 17:54:52 +0100 +Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley + Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United + Kingdom. + Registered in England and Wales under Company Registration No. 3798903 +Lines: 19 +Message-ID: <9658.1277312092@redhat.com> +References: <1277220198-3522-1-git-send-email-sjayaraman@suse.de> <yes> +Cc: dhowells@redhat.com, Steve French <smfrench@gmail.com>, + linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, + linux-kernel@vger.kernel.org +To: Suresh Jayaraman <sjayaraman@suse.de> +X-From: linux-fsdevel-owner@vger.kernel.org Wed Jun 23 18:55:07 2010 +Return-path: <linux-fsdevel-owner@vger.kernel.org> +Envelope-to: lnx-linux-fsdevel@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-fsdevel-owner@vger.kernel.org>) + id 1ORTE8-0002ll-VF + for lnx-linux-fsdevel@lo.gmane.org; Wed, 23 Jun 2010 18:55:05 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1752263Ab0FWQzD (ORCPT <rfc822;lnx-linux-fsdevel@m.gmane.org>); + Wed, 23 Jun 2010 12:55:03 -0400 +Received: from mx1.redhat.com ([209.132.183.28]:18394 "EHLO mx1.redhat.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1751794Ab0FWQzB (ORCPT <rfc822;linux-fsdevel@vger.kernel.org>); + Wed, 23 Jun 2010 12:55:01 -0400 +Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) + by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5NGsu1L000993 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); + Wed, 23 Jun 2010 12:54:56 -0400 +Received: from redhat.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) + by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5NGsrUG016433; + Wed, 23 Jun 2010 12:54:54 -0400 +In-Reply-To: <1277220198-3522-1-git-send-email-sjayaraman@suse.de> +X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 +Sender: linux-fsdevel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-fsdevel.vger.kernel.org> +X-Mailing-List: linux-fsdevel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1002221> + +Suresh Jayaraman <sjayaraman@suse.de> wrote: + +> Define server-level cache index objects (as managed by TCP_ServerInfo +> structs). Each server object is created in the CIFS top-level index object +> and is itself an index into which superblock-level objects are inserted. +> +> Currently, the server objects are keyed by hostname. +> +> Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de> + +Looks reasonable, apart from the index key. I agree with Jeff that you +probably want {address,port,family} rather than a hostname. + +David +-- +To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + + diff --git a/test/corpora/lkml/cur/1382298770.002193:2, b/test/corpora/lkml/cur/1382298770.002193:2, new file mode 100644 index 00000000..e2ea6266 --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.002193:2, @@ -0,0 +1,59 @@ +From: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +Subject: Re: [RFC][PATCH 05/10] cifs: define superblock-level cache index objects and register them +Date: Wed, 23 Jun 2010 17:58:10 +0100 +Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley + Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United + Kingdom. + Registered in England and Wales under Company Registration No. 3798903 +Lines: 13 +Message-ID: <9720.1277312290@redhat.com> +References: <1277220206-3559-1-git-send-email-sjayaraman@suse.de> <yes> +Cc: dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, + linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +To: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Wed Jun 23 18:58:19 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1ORTHG-0003Az-Ge + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Wed, 23 Jun 2010 18:58:18 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1751520Ab0FWQ6R (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Wed, 23 Jun 2010 12:58:17 -0400 +Received: from mx1.redhat.com ([209.132.183.28]:62343 "EHLO mx1.redhat.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1751372Ab0FWQ6R (ORCPT <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); + Wed, 23 Jun 2010 12:58:17 -0400 +Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) + by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5NGwDC2031683 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); + Wed, 23 Jun 2010 12:58:13 -0400 +Received: from redhat.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) + by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5NGwAfq021298; + Wed, 23 Jun 2010 12:58:11 -0400 +In-Reply-To: <1277220206-3559-1-git-send-email-sjayaraman-l3A5Bk7waGM@public.gmane.org> +X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1002223> + +Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> wrote: + +> Define superblock-level cache index objects (managed by cifsTconInfo +> structs). Each superblock object is created in a server-level index object +> and in itself an index into which inode-level objects are inserted. +> +> Currently, the superblock objects are keyed by sharename. + +Seems reasonable. Is there any way you can check that the share you are +looking at on a server is the same as the last time you looked? Can you +validate the root directory of the share in some way? + +David + + diff --git a/test/corpora/lkml/cur/1382298770.002194:2, b/test/corpora/lkml/cur/1382298770.002194:2, new file mode 100644 index 00000000..d2d1efdb --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.002194:2, @@ -0,0 +1,61 @@ +From: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +Subject: Re: [RFC][PATCH 06/10] cifs: define inode-level cache object and register them +Date: Wed, 23 Jun 2010 18:02:53 +0100 +Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley + Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United + Kingdom. + Registered in England and Wales under Company Registration No. 3798903 +Lines: 15 +Message-ID: <9822.1277312573@redhat.com> +References: <1277220214-3597-1-git-send-email-sjayaraman@suse.de> <yes> +Cc: dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, + linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +To: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Wed Jun 23 19:03:04 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1ORTLr-0007Bh-Cs + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Wed, 23 Jun 2010 19:03:03 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1752063Ab0FWRDB (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Wed, 23 Jun 2010 13:03:01 -0400 +Received: from mx1.redhat.com ([209.132.183.28]:30823 "EHLO mx1.redhat.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1751804Ab0FWRDA (ORCPT <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); + Wed, 23 Jun 2010 13:03:00 -0400 +Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) + by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5NH2v0J030982 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); + Wed, 23 Jun 2010 13:02:57 -0400 +Received: from redhat.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) + by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5NH2r9N014323; + Wed, 23 Jun 2010 13:02:54 -0400 +In-Reply-To: <1277220214-3597-1-git-send-email-sjayaraman-l3A5Bk7waGM@public.gmane.org> +X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1002224> + +Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> wrote: + +> Define inode-level data storage objects (managed by cifsInodeInfo structs). +> Each inode-level object is created in a super-block level object and is +> itself a data storage object in to which pages from the inode are stored. +> +> The inode object is keyed by UniqueId. The coherency data being used is +> LastWriteTime and the file size. + +Isn't there a file creation time too? + +I take it you don't support caching on files that are open for writing at this +time? + +David + + diff --git a/test/corpora/lkml/cur/1382298770.002195:2, b/test/corpora/lkml/cur/1382298770.002195:2, new file mode 100644 index 00000000..ec54a814 --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.002195:2, @@ -0,0 +1,59 @@ +From: David Howells <dhowells@redhat.com> +Subject: Re: [RFC][PATCH 07/10] cifs: FS-Cache page management +Date: Wed, 23 Jun 2010 18:05:01 +0100 +Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley + Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United + Kingdom. + Registered in England and Wales under Company Registration No. 3798903 +Lines: 13 +Message-ID: <9866.1277312701@redhat.com> +References: <1277220228-3635-1-git-send-email-sjayaraman@suse.de> <yes> +Cc: dhowells@redhat.com, Steve French <smfrench@gmail.com>, + linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, + linux-kernel@vger.kernel.org +To: Suresh Jayaraman <sjayaraman@suse.de> +X-From: linux-fsdevel-owner@vger.kernel.org Wed Jun 23 19:05:19 2010 +Return-path: <linux-fsdevel-owner@vger.kernel.org> +Envelope-to: lnx-linux-fsdevel@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-fsdevel-owner@vger.kernel.org>) + id 1ORTNz-0008Oj-Ho + for lnx-linux-fsdevel@lo.gmane.org; Wed, 23 Jun 2010 19:05:15 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1752145Ab0FWRFO (ORCPT <rfc822;lnx-linux-fsdevel@m.gmane.org>); + Wed, 23 Jun 2010 13:05:14 -0400 +Received: from mx1.redhat.com ([209.132.183.28]:1689 "EHLO mx1.redhat.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1751804Ab0FWRFN (ORCPT <rfc822;linux-fsdevel@vger.kernel.org>); + Wed, 23 Jun 2010 13:05:13 -0400 +Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) + by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5NH59sl011966 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); + Wed, 23 Jun 2010 13:05:09 -0400 +Received: from redhat.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) + by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5NH52Jl022163; + Wed, 23 Jun 2010 13:05:03 -0400 +In-Reply-To: <1277220228-3635-1-git-send-email-sjayaraman@suse.de> +X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 +Sender: linux-fsdevel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-fsdevel.vger.kernel.org> +X-Mailing-List: linux-fsdevel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1002225> + +Suresh Jayaraman <sjayaraman@suse.de> wrote: + +> Takes care of invalidation and release of FS-Cache marked pages and also +> invalidation of the FsCache page flag when the inode is removed. +> +> Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de> + +Acked-by: David Howells <dhowells@redhat.com> +-- +To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + + diff --git a/test/corpora/lkml/cur/1382298770.002196:2, b/test/corpora/lkml/cur/1382298770.002196:2, new file mode 100644 index 00000000..63838dc7 --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.002196:2, @@ -0,0 +1,54 @@ +From: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +Subject: Re: [RFC][PATCH 08/10] cifs: store pages into local cache +Date: Wed, 23 Jun 2010 18:06:12 +0100 +Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley + Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United + Kingdom. + Registered in England and Wales under Company Registration No. 3798903 +Lines: 8 +Message-ID: <9890.1277312772@redhat.com> +References: <1277220240-3674-1-git-send-email-sjayaraman@suse.de> <yes> +Cc: dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, + linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +To: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Wed Jun 23 19:06:21 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1ORTP3-0000fp-01 + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Wed, 23 Jun 2010 19:06:21 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1752403Ab0FWRGU (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Wed, 23 Jun 2010 13:06:20 -0400 +Received: from mx1.redhat.com ([209.132.183.28]:63621 "EHLO mx1.redhat.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1751804Ab0FWRGT (ORCPT <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); + Wed, 23 Jun 2010 13:06:19 -0400 +Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) + by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5NH6FCB012081 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); + Wed, 23 Jun 2010 13:06:15 -0400 +Received: from redhat.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) + by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5NH6CKG013414; + Wed, 23 Jun 2010 13:06:13 -0400 +In-Reply-To: <1277220240-3674-1-git-send-email-sjayaraman-l3A5Bk7waGM@public.gmane.org> +X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1002226> + +Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> wrote: + +> Store pages from an CIFS inode into the data storage object associated with +> that inode. +> +> Signed-off-by: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> + +Acked-by: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> + + diff --git a/test/corpora/lkml/cur/1382298770.002197:2, b/test/corpora/lkml/cur/1382298770.002197:2, new file mode 100644 index 00000000..765c3993 --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.002197:2, @@ -0,0 +1,53 @@ +From: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +Subject: Re: [RFC][PATCH 09/10] cifs: read pages from FS-Cache +Date: Wed, 23 Jun 2010 18:07:40 +0100 +Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley + Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United + Kingdom. + Registered in England and Wales under Company Registration No. 3798903 +Lines: 7 +Message-ID: <9918.1277312860@redhat.com> +References: <1277220261-3717-1-git-send-email-sjayaraman@suse.de> <yes> +Cc: dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, + linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +To: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Wed Jun 23 19:07:51 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1ORTQR-0000nv-JF + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Wed, 23 Jun 2010 19:07:47 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1751708Ab0FWRHr (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Wed, 23 Jun 2010 13:07:47 -0400 +Received: from mx1.redhat.com ([209.132.183.28]:34413 "EHLO mx1.redhat.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1750954Ab0FWRHq (ORCPT <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); + Wed, 23 Jun 2010 13:07:46 -0400 +Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) + by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5NH7h3Y005904 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); + Wed, 23 Jun 2010 13:07:43 -0400 +Received: from redhat.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) + by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5NH7efR020683; + Wed, 23 Jun 2010 13:07:41 -0400 +In-Reply-To: <1277220261-3717-1-git-send-email-sjayaraman-l3A5Bk7waGM@public.gmane.org> +X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1002227> + +Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> wrote: + +> Read pages from a FS-Cache data storage object into a CIFS inode. +> +> Signed-off-by: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> + +Acked-by: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> + + diff --git a/test/corpora/lkml/cur/1382298770.002201:2, b/test/corpora/lkml/cur/1382298770.002201:2, new file mode 100644 index 00000000..bae1eefe --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.002201:2, @@ -0,0 +1,58 @@ +From: David Howells <dhowells@redhat.com> +Subject: Re: [RFC][PATCH 10/10] cifs: add mount option to enable local caching +Date: Wed, 23 Jun 2010 18:08:34 +0100 +Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley + Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United + Kingdom. + Registered in England and Wales under Company Registration No. 3798903 +Lines: 12 +Message-ID: <9942.1277312914@redhat.com> +References: <1277220309-3757-1-git-send-email-sjayaraman@suse.de> <yes> +Cc: dhowells@redhat.com, Steve French <smfrench@gmail.com>, + linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, + linux-kernel@vger.kernel.org +To: Suresh Jayaraman <sjayaraman@suse.de> +X-From: linux-kernel-owner@vger.kernel.org Wed Jun 23 19:09:22 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1ORTRv-0002J8-2s + for glk-linux-kernel-3@lo.gmane.org; Wed, 23 Jun 2010 19:09:19 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1753275Ab0FWRIt (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Wed, 23 Jun 2010 13:08:49 -0400 +Received: from mx1.redhat.com ([209.132.183.28]:6156 "EHLO mx1.redhat.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1753203Ab0FWRIr (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Wed, 23 Jun 2010 13:08:47 -0400 +Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) + by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5NH8dax006028 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); + Wed, 23 Jun 2010 13:08:39 -0400 +Received: from redhat.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) + by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5NH8YmA020846; + Wed, 23 Jun 2010 13:08:36 -0400 +In-Reply-To: <1277220309-3757-1-git-send-email-sjayaraman@suse.de> +X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1002231> + +Suresh Jayaraman <sjayaraman@suse.de> wrote: + +> Add a mount option 'fsc' to enable local caching on CIFS. +> +> As the cifs-utils (userspace) changes are not done yet, this patch enables +> 'fsc' by default to assist testing. +> +> Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de> + +Acked-by: David Howells <dhowells@redhat.com> + +(Give or take the debugging bit) + + diff --git a/test/corpora/lkml/cur/1382298770.002878:2, b/test/corpora/lkml/cur/1382298770.002878:2, new file mode 100644 index 00000000..66a3e223 --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.002878:2, @@ -0,0 +1,90 @@ +From: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +Subject: Re: [RFC][PATCH 10/10] cifs: add mount option to enable local caching +Date: Fri, 25 Jun 2010 16:18:12 +0530 +Lines: 47 +Message-ID: <4C24896C.4000903@suse.de> +References: <yes> <1277220309-3757-1-git-send-email-sjayaraman@suse.de> <4C225338.9010807@gmail.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 7bit +Cc: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +To: Scott Lovenberg <scott.lovenberg-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Fri Jun 25 12:48:27 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1OS6SO-0003QF-NW + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Fri, 25 Jun 2010 12:48:25 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1753965Ab0FYKsX (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Fri, 25 Jun 2010 06:48:23 -0400 +Received: from cantor.suse.de ([195.135.220.2]:46395 "EHLO mx1.suse.de" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1752612Ab0FYKsW (ORCPT <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); + Fri, 25 Jun 2010 06:48:22 -0400 +Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by mx1.suse.de (Postfix) with ESMTP id 60CED6CB00; + Fri, 25 Jun 2010 12:48:21 +0200 (CEST) +User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.5) Gecko/20091130 SUSE/3.0.0-1.1.1 Thunderbird/3.0 +In-Reply-To: <4C225338.9010807-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1002912> + +On 06/24/2010 12:02 AM, Scott Lovenberg wrote: +> On 6/22/2010 11:25 AM, Suresh Jayaraman wrote: +>> Add a mount option 'fsc' to enable local caching on CIFS. +>> +>> As the cifs-utils (userspace) changes are not done yet, this patch +>> enables +>> 'fsc' by default to assist testing. +>> +> [...] +>> @@ -1332,6 +1336,8 @@ cifs_parse_mount_options(char *options, const +>> char *devname, +>> printk(KERN_WARNING "CIFS: Mount option noac not " +>> "supported. Instead set " +>> "/proc/fs/cifs/LookupCacheEnabled to 0\n"); +>> + } else if (strnicmp(data, "fsc", 3) == 0) { +>> + vol->fsc = true; +>> } else +>> printk(KERN_WARNING "CIFS: Unknown mount option %s\n", +>> data); +>> @@ -2405,6 +2411,8 @@ static void setup_cifs_sb(struct smb_vol +>> *pvolume_info, +>> cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_OVERR_GID; +>> if (pvolume_info->dynperm) +>> cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_DYNPERM; +>> + if (pvolume_info->fsc) +>> + cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_FSCACHE; +>> if (pvolume_info->direct_io) { +>> cFYI(1, "mounting share using direct i/o"); +>> cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_DIRECT_IO; +>> +> I reworked the CIFS mount option parsing a while back; I'm not sure +> whether that patch was going to be in the 2.6.35 tree or not (the window +> just opened, didn't it?). + +Not a problem, I could redo this patch alone when the reworked option +parsing patches get in. + +> Jeff, Steve, can you confirm if that patch is going to be in 2.6.35? +> +> Patch refs: http://patchwork.ozlabs.org/patch/53059/ and +> http://patchwork.ozlabs.org/patch/53674/ +> + +Thanks, + +-- +Suresh Jayaraman + + diff --git a/test/corpora/lkml/cur/1382298770.002879:2, b/test/corpora/lkml/cur/1382298770.002879:2, new file mode 100644 index 00000000..5782037a --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.002879:2, @@ -0,0 +1,68 @@ +From: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +Subject: Re: [RFC][PATCH 03/10] cifs: register CIFS for caching +Date: Fri, 25 Jun 2010 16:26:22 +0530 +Lines: 26 +Message-ID: <4C248B56.8030207@suse.de> +References: <1277220189-3485-1-git-send-email-sjayaraman@suse.de> <yes> <9603.1277311877@redhat.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 7bit +Cc: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +To: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Fri Jun 25 12:56:32 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1OS6aG-00066f-1L + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Fri, 25 Jun 2010 12:56:32 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1754188Ab0FYK4b (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Fri, 25 Jun 2010 06:56:31 -0400 +Received: from cantor.suse.de ([195.135.220.2]:46564 "EHLO mx1.suse.de" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1753651Ab0FYK4a (ORCPT <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); + Fri, 25 Jun 2010 06:56:30 -0400 +Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by mx1.suse.de (Postfix) with ESMTP id 17F1E6CB00; + Fri, 25 Jun 2010 12:56:30 +0200 (CEST) +User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.5) Gecko/20091130 SUSE/3.0.0-1.1.1 Thunderbird/3.0 +In-Reply-To: <9603.1277311877-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1002913> + +On 06/23/2010 10:21 PM, David Howells wrote: +> Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> wrote: +> +>> + rc = cifs_fscache_register(); +>> + if (rc) +>> + goto out; +>> + +>> rc = cifs_init_inodecache(); +>> if (rc) +>> goto out_clean_proc; +>> @@ -949,8 +954,10 @@ init_cifs(void) +>> cifs_destroy_mids(); +>> out_destroy_inodecache: +>> cifs_destroy_inodecache(); +>> + cifs_fscache_unregister(); +>> out_clean_proc: +> +> This is incorrect. You need to call cifs_fscache_unregister() if +> cifs_init_inodecache() fails. +> + +Doh! I'll fix it. + + +-- +Suresh Jayaraman + + diff --git a/test/corpora/lkml/cur/1382298770.002911:2, b/test/corpora/lkml/cur/1382298770.002911:2, new file mode 100644 index 00000000..8e172cb2 --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.002911:2, @@ -0,0 +1,84 @@ +From: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +Subject: Re: [RFC][PATCH 05/10] cifs: define superblock-level cache index + objects and register them +Date: Fri, 25 Jun 2010 18:14:16 +0530 +Lines: 41 +Message-ID: <4C24A4A0.90408@suse.de> +References: <1277220206-3559-1-git-send-email-sjayaraman@suse.de> <yes> <9720.1277312290@redhat.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 7bit +Cc: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +To: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Fri Jun 25 14:44:28 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1OS8Gh-0005Bb-E2 + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Fri, 25 Jun 2010 14:44:27 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1754703Ab0FYMo0 (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Fri, 25 Jun 2010 08:44:26 -0400 +Received: from cantor.suse.de ([195.135.220.2]:51036 "EHLO mx1.suse.de" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1754222Ab0FYMoZ (ORCPT <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); + Fri, 25 Jun 2010 08:44:25 -0400 +Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by mx1.suse.de (Postfix) with ESMTP id E07FF8FEA2; + Fri, 25 Jun 2010 14:44:24 +0200 (CEST) +User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.5) Gecko/20091130 SUSE/3.0.0-1.1.1 Thunderbird/3.0 +In-Reply-To: <9720.1277312290-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1002945> + +On 06/23/2010 10:28 PM, David Howells wrote: +> Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> wrote: +> +>> Define superblock-level cache index objects (managed by cifsTconInfo +>> structs). Each superblock object is created in a server-level index object +>> and in itself an index into which inode-level objects are inserted. +>> +>> Currently, the superblock objects are keyed by sharename. +> +> Seems reasonable. Is there any way you can check that the share you are +> looking at on a server is the same as the last time you looked? Can you + +Good point. + +I thought of using TID (Tree identifier; a unique ID for a resource in +use by client) along with sharename. But, Server is free to reuse them +when the tree connection closes and does not guarantee the same Tid for +a particular resource across tree connections. + +Also, considering the UNC name of the resource (//server/share) may not +be a good idea too as the cache will not be used when for e.g. IPaddress +is used to mount. + +So, if a server does something like this: + - export a share 'foo' (original server path: /export/vol1/foo) + - client mounts and uses it + - server unexports the share 'foo' + - server exports 'foo' (original sever path: /export/vol2/foo) + +we have a bit of problem.. + +> validate the root directory of the share in some way? +> + +I don't know if there is a way to do this. + +Thanks, + + +-- +Suresh Jayaraman + + diff --git a/test/corpora/lkml/cur/1382298770.002912:2, b/test/corpora/lkml/cur/1382298770.002912:2, new file mode 100644 index 00000000..d9c761de --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.002912:2, @@ -0,0 +1,65 @@ +From: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +Subject: Re: [RFC][PATCH 06/10] cifs: define inode-level cache object and + register them +Date: Fri, 25 Jun 2010 18:20:14 +0530 +Lines: 24 +Message-ID: <4C24A606.5040001@suse.de> +References: <1277220214-3597-1-git-send-email-sjayaraman@suse.de> <yes> <9822.1277312573@redhat.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 7bit +Cc: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +To: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Fri Jun 25 14:50:26 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1OS8MR-0007EU-OS + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Fri, 25 Jun 2010 14:50:24 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1754607Ab0FYMuX (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Fri, 25 Jun 2010 08:50:23 -0400 +Received: from cantor2.suse.de ([195.135.220.15]:38716 "EHLO mx2.suse.de" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1753675Ab0FYMuW (ORCPT <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); + Fri, 25 Jun 2010 08:50:22 -0400 +Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) + by mx2.suse.de (Postfix) with ESMTP id B05E686A2E; + Fri, 25 Jun 2010 14:50:21 +0200 (CEST) +User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.5) Gecko/20091130 SUSE/3.0.0-1.1.1 Thunderbird/3.0 +In-Reply-To: <9822.1277312573-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1002946> + +On 06/23/2010 10:32 PM, David Howells wrote: +> Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> wrote: +> +>> Define inode-level data storage objects (managed by cifsInodeInfo structs). +>> Each inode-level object is created in a super-block level object and is +>> itself a data storage object in to which pages from the inode are stored. +>> +>> The inode object is keyed by UniqueId. The coherency data being used is +>> LastWriteTime and the file size. +> +> Isn't there a file creation time too? + +I think the creation time is currently being ignored as we won't be able +to accomodate in POSIX stat struct. + +> I take it you don't support caching on files that are open for writing at this +> time? +> + +Yes. + + +-- +Suresh Jayaraman + + diff --git a/test/corpora/lkml/cur/1382298770.002915:2, b/test/corpora/lkml/cur/1382298770.002915:2, new file mode 100644 index 00000000..e43c909f --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.002915:2, @@ -0,0 +1,58 @@ +From: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +Subject: Re: [RFC][PATCH 06/10] cifs: define inode-level cache object and register them +Date: Fri, 25 Jun 2010 13:55:49 +0100 +Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley + Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United + Kingdom. + Registered in England and Wales under Company Registration No. 3798903 +Lines: 12 +Message-ID: <22697.1277470549@redhat.com> +References: <4C24A606.5040001@suse.de> <1277220214-3597-1-git-send-email-sjayaraman@suse.de> <yes> <9822.1277312573@redhat.com> +Cc: dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, + linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +To: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Fri Jun 25 14:56:04 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1OS8Rw-0002tq-3k + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Fri, 25 Jun 2010 14:56:04 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1753622Ab0FYM4B (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Fri, 25 Jun 2010 08:56:01 -0400 +Received: from mx1.redhat.com ([209.132.183.28]:50162 "EHLO mx1.redhat.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1752535Ab0FYM4B (ORCPT <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); + Fri, 25 Jun 2010 08:56:01 -0400 +Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) + by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5PCtqOd018091 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); + Fri, 25 Jun 2010 08:55:52 -0400 +Received: from redhat.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) + by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5PCtn4G016466; + Fri, 25 Jun 2010 08:55:51 -0400 +In-Reply-To: <4C24A606.5040001-l3A5Bk7waGM@public.gmane.org> +X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1002949> + +Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> wrote: + +> I think the creation time is currently being ignored as we won't be able +> to accomodate in POSIX stat struct. + +The FS-Cache interface doesn't use the POSIX stat struct, but it could be +really useful to save it and use it for cache coherency inside the kernel. + +Out of interest, what does Samba do when it comes to generating a creation time +for UNIX where one does not exist? + +David + + diff --git a/test/corpora/lkml/cur/1382298770.002917:2, b/test/corpora/lkml/cur/1382298770.002917:2, new file mode 100644 index 00000000..f7047f84 --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.002917:2, @@ -0,0 +1,67 @@ +From: David Howells <dhowells@redhat.com> +Subject: Re: [RFC][PATCH 05/10] cifs: define superblock-level cache index objects and register them +Date: Fri, 25 Jun 2010 13:58:33 +0100 +Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley + Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United + Kingdom. + Registered in England and Wales under Company Registration No. 3798903 +Lines: 21 +Message-ID: <22746.1277470713@redhat.com> +References: <4C24A4A0.90408@suse.de> <1277220206-3559-1-git-send-email-sjayaraman@suse.de> <yes> <9720.1277312290@redhat.com> +Cc: dhowells@redhat.com, Steve French <smfrench@gmail.com>, + linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, + linux-kernel@vger.kernel.org +To: Suresh Jayaraman <sjayaraman@suse.de> +X-From: linux-fsdevel-owner@vger.kernel.org Fri Jun 25 15:02:20 2010 +Return-path: <linux-fsdevel-owner@vger.kernel.org> +Envelope-to: lnx-linux-fsdevel@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with smtp (Exim 4.69) + (envelope-from <linux-fsdevel-owner@vger.kernel.org>) + id 1OS8Xz-000628-FG + for lnx-linux-fsdevel@lo.gmane.org; Fri, 25 Jun 2010 15:02:19 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1755357Ab0FYM6k (ORCPT <rfc822;lnx-linux-fsdevel@m.gmane.org>); + Fri, 25 Jun 2010 08:58:40 -0400 +Received: from mx1.redhat.com ([209.132.183.28]:50417 "EHLO mx1.redhat.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1754086Ab0FYM6j (ORCPT <rfc822;linux-fsdevel@vger.kernel.org>); + Fri, 25 Jun 2010 08:58:39 -0400 +Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) + by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5PCwa7Z005113 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); + Fri, 25 Jun 2010 08:58:36 -0400 +Received: from redhat.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) + by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5PCwXVB011094; + Fri, 25 Jun 2010 08:58:34 -0400 +In-Reply-To: <4C24A4A0.90408@suse.de> +X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 +Sender: linux-fsdevel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-fsdevel.vger.kernel.org> +X-Mailing-List: linux-fsdevel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1002951> + +Suresh Jayaraman <sjayaraman@suse.de> wrote: + +> Also, considering the UNC name of the resource (//server/share) may not +> be a good idea too as the cache will not be used when for e.g. IPaddress +> is used to mount. + +You could convert the UNC name to an IP address, and just use that as your +key. + +> > validate the root directory of the share in some way? +> +> I don't know if there is a way to do this. + +Is there an inode number or something? Even the creation time might do. + +David +-- +To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + + diff --git a/test/corpora/lkml/cur/1382298770.002930:2, b/test/corpora/lkml/cur/1382298770.002930:2, new file mode 100644 index 00000000..20410165 --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.002930:2, @@ -0,0 +1,81 @@ +From: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +Subject: Re: [RFC][PATCH 05/10] cifs: define superblock-level cache index objects and register them +Date: Fri, 25 Jun 2010 14:26:52 +0100 +Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley + Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United + Kingdom. + Registered in England and Wales under Company Registration No. 3798903 +Lines: 35 +Message-ID: <23204.1277472412@redhat.com> +References: <22746.1277470713@redhat.com> <4C24A4A0.90408@suse.de> <1277220206-3559-1-git-send-email-sjayaraman@suse.de> <yes> <9720.1277312290@redhat.com> +Cc: dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org>, + Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +To: unlisted-recipients:; (no To-header on input) +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Fri Jun 25 15:27:01 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1OS8vt-0000Xv-FL + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Fri, 25 Jun 2010 15:27:01 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1755944Ab0FYN1A (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Fri, 25 Jun 2010 09:27:00 -0400 +Received: from mx1.redhat.com ([209.132.183.28]:15634 "EHLO mx1.redhat.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1755398Ab0FYN07 (ORCPT <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); + Fri, 25 Jun 2010 09:26:59 -0400 +Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) + by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5PDQu1D020638 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); + Fri, 25 Jun 2010 09:26:56 -0400 +Received: from redhat.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) + by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5PDQruU018472; + Fri, 25 Jun 2010 09:26:54 -0400 +In-Reply-To: <22746.1277470713-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1002964> + +David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote: + +> > > validate the root directory of the share in some way? +> > +> > I don't know if there is a way to do this. +> +> Is there an inode number or something? Even the creation time might do. + +Looking in cifspdu.h, there are a number of things that it might be possible +to use. + + (1) FILE_ALL_INFO: CreationTime, IndexNumber, IndexNumber1, FileName + (assuming this isn't flattened to '\' or something for the root of a + share. + + (2) FILE_UNIX_BASIC_INFO: DevMajor, DevMinor, UniqueId. + + (3) FILE_INFO_STANDARD: CreationDate, CreationTime. + + (4) FILE_INFO_BASIC: CreationTime. + + (5) FILE_DIRECTORY_INFO: FileIndex, CreationTime, FileName. + + (6) SEARCH_ID_FULL_DIR_INFO: FileIndex, CreationTime, UniqueId, FileName. + + (7) FILE_BOTH_DIRECTORY_INFO: FileIndex, CreationTime, ShortName, FileName. + + (8) OPEN_RSP_EXT: Fid, CreationTime, VolumeGUID, FileId. + +You may have to choose different sets of things, depending on what the server +has on offer. Also, don't forget, if you can't work out whether a share is +coherent or not from the above, you can always use LastWriteTime, ChangeTime +and EndOfFile and just discard the whole subtree if they differ. + +David + + diff --git a/test/corpora/lkml/cur/1382298770.002997:2, b/test/corpora/lkml/cur/1382298770.002997:2, new file mode 100644 index 00000000..b78073cd --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.002997:2, @@ -0,0 +1,90 @@ +From: Jeff Layton <jlayton-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org> +Subject: Re: [RFC][PATCH 06/10] cifs: define inode-level cache object and + register them +Date: Fri, 25 Jun 2010 12:53:06 -0400 +Lines: 36 +Message-ID: <20100625125306.7f9b1966@tlielax.poochiereds.net> +References: <4C24A606.5040001@suse.de> + <1277220214-3597-1-git-send-email-sjayaraman@suse.de> + <yes> + <9822.1277312573@redhat.com> + <22697.1277470549@redhat.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=US-ASCII +Content-Transfer-Encoding: 7bit +Cc: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org>, + Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + samba-technical-w/Ol4Ecudpl8XjKLYN78aQ@public.gmane.org +To: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Fri Jun 25 18:53:12 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1OSC9P-0005Eb-SU + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Fri, 25 Jun 2010 18:53:12 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S932199Ab0FYQxK (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Fri, 25 Jun 2010 12:53:10 -0400 +Received: from cdptpa-omtalb.mail.rr.com ([75.180.132.122]:53512 "EHLO + cdptpa-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S932187Ab0FYQxJ (ORCPT + <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); Fri, 25 Jun 2010 12:53:09 -0400 +X-Authority-Analysis: v=1.0 c=1 a=iVNVO0OCT3kA:10 a=yQWWgrYGNuUA:10 a=kj9zAlcOel0A:10 a=20KFwNOVAAAA:8 a=hGzw-44bAAAA:8 a=f0L6POiToRdS6aViIA4A:9 a=tdNtT7bw1iHNm6ggrCkIte35EhAA:4 a=CjuIK1q_8ugA:10 a=jEp0ucaQiEUA:10 a=0kPLrQdw3YYA:10 a=dowx1zmaLagA:10 a=00U40p1LBqVLw4jT:21 a=gh7LVOPznGai4vo_:21 +X-Cloudmark-Score: 0 +X-Originating-IP: 71.70.153.3 +Received: from [71.70.153.3] ([71.70.153.3:42266] helo=mail.poochiereds.net) + by cdptpa-oedge01.mail.rr.com (envelope-from <jlayton-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org>) + (ecelerity 2.2.2.39 r()) with ESMTP + id 2D/E0-24471-3FED42C4; Fri, 25 Jun 2010 16:53:08 +0000 +Received: from tlielax.poochiereds.net (tlielax.poochiereds.net [192.168.1.3]) + by mail.poochiereds.net (Postfix) with ESMTPS id E9B19580FA; + Fri, 25 Jun 2010 12:53:06 -0400 (EDT) +In-Reply-To: <22697.1277470549-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +X-Mailer: Claws Mail 3.7.6 (GTK+ 2.20.1; x86_64-redhat-linux-gnu) +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1003033> + +On Fri, 25 Jun 2010 13:55:49 +0100 +David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote: + +> Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> wrote: +> +> > I think the creation time is currently being ignored as we won't be able +> > to accomodate in POSIX stat struct. +> +> The FS-Cache interface doesn't use the POSIX stat struct, but it could be +> really useful to save it and use it for cache coherency inside the kernel. +> +> Out of interest, what does Samba do when it comes to generating a creation time +> for UNIX where one does not exist? +> + +(cc'ing samba-technical since we're talking about the create time) + +Looks like it mostly uses the ctime. IMO, the mtime would be a better +choice since it changes less frequently, but I don't guess that it +matters very much. + +I have a few patches that make the cifs_iget code do more stringent +checks. One of those makes it use the create time like an i_generation +field to guard against matching inodes that have the same number but +that have undergone a delete/create cycle. They need a bit more testing +but I'm planning to post them in time for 2.6.36. + +Because of how samba generates this number, it could be somewhat +problematic to do this. What may save us though is that Linux<->Samba +mostly uses unix extensions unless someone has specifically disabled +them on either end. The unix extension calls don't generally send any +sort of create time field, so we can't rely on it in those codepaths +anyway. + +-- +Jeff Layton <jlayton-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org> + + diff --git a/test/corpora/lkml/cur/1382298770.003106:2, b/test/corpora/lkml/cur/1382298770.003106:2, new file mode 100644 index 00000000..19ea381d --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.003106:2, @@ -0,0 +1,60 @@ +From: David Howells <dhowells@redhat.com> +Subject: Re: [RFC][PATCH 06/10] cifs: define inode-level cache object and register them +Date: Fri, 25 Jun 2010 22:46:38 +0100 +Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley + Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United + Kingdom. + Registered in England and Wales under Company Registration No. 3798903 +Lines: 13 +Message-ID: <18628.1277502398@redhat.com> +References: <20100625125306.7f9b1966@tlielax.poochiereds.net> <4C24A606.5040001@suse.de> <1277220214-3597-1-git-send-email-sjayaraman@suse.de> <yes> <9822.1277312573@redhat.com> <22697.1277470549@redhat.com> +Cc: dhowells@redhat.com, Suresh Jayaraman <sjayaraman@suse.de>, + Steve French <smfrench@gmail.com>, linux-cifs@vger.kernel.org, + linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, + samba-technical@lists.samba.org +To: Jeff Layton <jlayton@samba.org> +X-From: linux-kernel-owner@vger.kernel.org Fri Jun 25 23:47:07 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1OSGjo-0006q8-ME + for glk-linux-kernel-3@lo.gmane.org; Fri, 25 Jun 2010 23:47:05 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S932250Ab0FYVqv (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Fri, 25 Jun 2010 17:46:51 -0400 +Received: from mx1.redhat.com ([209.132.183.28]:55406 "EHLO mx1.redhat.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932088Ab0FYVqs (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Fri, 25 Jun 2010 17:46:48 -0400 +Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) + by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5PLkhIG005974 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); + Fri, 25 Jun 2010 17:46:43 -0400 +Received: from redhat.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) + by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5PLkd77017768; + Fri, 25 Jun 2010 17:46:40 -0400 +In-Reply-To: <20100625125306.7f9b1966@tlielax.poochiereds.net> +X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1003142> + +Jeff Layton <jlayton@samba.org> wrote: + +> Looks like it mostly uses the ctime. IMO, the mtime would be a better +> choice since it changes less frequently, but I don't guess that it +> matters very much. + +I'd've thought mtime changes more frequently since that's altered when data is +written. ctime is changed when attributes are changed. + +Note that Ext4 appears to have a file creation time field in its inode +(struct ext4_inode::i_crtime[_extra]). Can Samba be made to use that? + +David + + diff --git a/test/corpora/lkml/cur/1382298770.003117:2, b/test/corpora/lkml/cur/1382298770.003117:2, new file mode 100644 index 00000000..7f53e34b --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.003117:2, @@ -0,0 +1,65 @@ +From: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +Subject: Re: [RFC][PATCH 06/10] cifs: define inode-level cache object and register them +Date: Sat, 26 Jun 2010 00:04:28 +0100 +Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley + Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United + Kingdom. + Registered in England and Wales under Company Registration No. 3798903 +Lines: 18 +Message-ID: <20123.1277507068@redhat.com> +References: <20100625182651.36800d06@tlielax.poochiereds.net> <20100625125306.7f9b1966@tlielax.poochiereds.net> <4C24A606.5040001@suse.de> <1277220214-3597-1-git-send-email-sjayaraman@suse.de> <yes> <9822.1277312573@redhat.com> <22697.1277470549@redhat.com> <18628.1277502398@redhat.com> +Cc: dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org>, + Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + samba-technical-w/Ol4Ecudpl8XjKLYN78aQ@public.gmane.org +To: Jeff Layton <jlayton-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Sat Jun 26 01:04:45 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1OSHww-0006Jk-NV + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Sat, 26 Jun 2010 01:04:43 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1751807Ab0FYXEl (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Fri, 25 Jun 2010 19:04:41 -0400 +Received: from mx1.redhat.com ([209.132.183.28]:62977 "EHLO mx1.redhat.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1752149Ab0FYXEl (ORCPT <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); + Fri, 25 Jun 2010 19:04:41 -0400 +Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) + by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5PN4X40004498 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); + Fri, 25 Jun 2010 19:04:34 -0400 +Received: from redhat.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) + by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5PN4Sld008220; + Fri, 25 Jun 2010 19:04:30 -0400 +In-Reply-To: <20100625182651.36800d06-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org> +X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1003153> + +Jeff Layton <jlayton-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org> wrote: + +> IIUC, updating mtime for a write is also an attribute change, and that +> affects ctime. According to the stat(2) manpage: + +You're right. Okay, ctime is the more frequently changed. + +> > Note that Ext4 appears to have a file creation time field in its inode +> > (struct ext4_inode::i_crtime[_extra]). Can Samba be made to use that? +> +> Is it exposed to userspace in any (standard) way? It would be handy to +> have that. While we're wishing...it might also be nice to have a +> standard way to get at the i_generation from userspace too. + +Not at present, but it's something that could be exported by ioctl() or +getxattr(). + +David + + diff --git a/test/corpora/lkml/cur/1382298770.003118:2, b/test/corpora/lkml/cur/1382298770.003118:2, new file mode 100644 index 00000000..a1ec438b --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.003118:2, @@ -0,0 +1,122 @@ +From: Steve French <smfrench@gmail.com> +Subject: Re: [RFC][PATCH 06/10] cifs: define inode-level cache object and + register them +Date: Fri, 25 Jun 2010 18:05:30 -0500 +Lines: 51 +Message-ID: <AANLkTilOTrHLvLv4XWYZO6xCnYZgYT7gO2M-oKZ6VvqM@mail.gmail.com> +References: <20100625125306.7f9b1966@tlielax.poochiereds.net> + <4C24A606.5040001@suse.de> + <1277220214-3597-1-git-send-email-sjayaraman@suse.de> + <9822.1277312573@redhat.com> + <22697.1277470549@redhat.com> + <18628.1277502398@redhat.com> + <20100625182651.36800d06@tlielax.poochiereds.net> +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: QUOTED-PRINTABLE +Cc: David Howells <dhowells@redhat.com>, + Suresh Jayaraman <sjayaraman@suse.de>, + linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, + linux-kernel@vger.kernel.org, samba-technical@lists.samba.org, + Jeff Layton <jlayton@redhat.com> +To: Jeff Layton <jlayton@samba.org>, + "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>, + Mingming Cao <mcao@us.ibm.com> +X-From: linux-kernel-owner@vger.kernel.org Sat Jun 26 01:05:41 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1OSHxs-0006a8-BA + for glk-linux-kernel-3@lo.gmane.org; Sat, 26 Jun 2010 01:05:40 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1756188Ab0FYXFd convert rfc822-to-quoted-printable (ORCPT + <rfc822;glk-linux-kernel-3@m.gmane.org>); + Fri, 25 Jun 2010 19:05:33 -0400 +Received: from mail-qw0-f46.google.com ([209.85.216.46]:51369 "EHLO + mail-qw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1751575Ab0FYXFb convert rfc822-to-8bit (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Fri, 25 Jun 2010 19:05:31 -0400 +Received: by qwi4 with SMTP id 4so742644qwi.19 + for <multiple recipients>; Fri, 25 Jun 2010 16:05:30 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=gmail.com; s=gamma; + h=domainkey-signature:mime-version:received:received:in-reply-to + :references:date:message-id:subject:from:to:cc:content-type + :content-transfer-encoding; + bh=6wKQkGOEeUGN4oPR3Nm4SRxtJr/EBwN8ENmpLnfdCDU=; + b=X7L6W0MtpQeW/4iBuj+oDlcP2yCJ3qwUs9lHBq1fRW6WdYblHXjmaN8o++3GDPLAg5 + 0MD07zxbYTGXRSrgCjCrGVm0tT88/6hY2a/rB8g68h/Qso2sIHa7B1iIN8JRR4pPWle0 + sVjp9Xy/bQn2e0uE481Ii1TLHuWYA/QDXZreU= +DomainKey-Signature: a=rsa-sha1; c=nofws; + d=gmail.com; s=gamma; + h=mime-version:in-reply-to:references:date:message-id:subject:from:to + :cc:content-type:content-transfer-encoding; + b=B+7qQvdOpN5a/KCRrDbssKZX8D3SnP73VMHd9RpkqP9nCHCmSLAgbeH03+/m6CLVAo + G+NKWqWtknwPBkYqT/bdP2XEak1yr+0rjOqjUaNvaT7AhzsyHEJBkaNnsbS3qaRy39OP + S7OkAyHfmgdeNAHkKnKRF73hfpvgAqR9X4bn8= +Received: by 10.224.59.223 with SMTP id m31mr1130670qah.63.1277507130411; Fri, + 25 Jun 2010 16:05:30 -0700 (PDT) +Received: by 10.229.46.136 with HTTP; Fri, 25 Jun 2010 16:05:30 -0700 (PDT) +In-Reply-To: <20100625182651.36800d06@tlielax.poochiereds.net> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1003154> + +On Fri, Jun 25, 2010 at 5:26 PM, Jeff Layton <jlayton@samba.org> wrote: +> +> On Fri, 25 Jun 2010 22:46:38 +0100 +> David Howells <dhowells@redhat.com> wrote: +> +> > Jeff Layton <jlayton@samba.org> wrote: +> > +> > > Looks like it mostly uses the ctime. IMO, the mtime would be a be= +tter +> > > choice since it changes less frequently, but I don't guess that i= +t +> > > matters very much. +> > +> > I'd've thought mtime changes more frequently since that's altered w= +hen data is +> > written. =A0ctime is changed when attributes are changed. +> > +> +> IIUC, updating mtime for a write is also an attribute change, and tha= +t +> affects ctime. According to the stat(2) manpage: +> +> =A0 =A0 =A0 The field st_ctime is changed by writing or by setting =A0= +inode =A0informa- +> =A0 =A0 =A0 tion (i.e., owner, group, link count, mode, etc.). +> +> > Note that Ext4 appears to have a file creation time field in its in= +ode +> > (struct ext4_inode::i_crtime[_extra]). =A0Can Samba be made to use = +that? +> > +> +> Is it exposed to userspace in any (standard) way? It would be handy t= +o +> have that. While we're wishing...it might also be nice to have a +> standard way to get at the i_generation from userspace too. +> + +Yes - I have talked with MingMing and Aneesh about those (NFS may +someday be able to use those too).=A0 An obstacle in the past had been +that samba server stores its own fake creation time in an ndr encoded +xattr which complicates things. + +MingMing/Annesh - +Xattr or other way to get at birth time? + + +-- +Thanks, + +Steve + + diff --git a/test/corpora/lkml/cur/1382298770.003171:2, b/test/corpora/lkml/cur/1382298770.003171:2, new file mode 100644 index 00000000..66e425ef --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.003171:2, @@ -0,0 +1,174 @@ +From: Mingming Cao <mcao@us.ibm.com> +Subject: Re: [RFC][PATCH 06/10] cifs: define inode-level cache object and + register them +Date: Fri, 25 Jun 2010 17:52:24 -0700 +Lines: 92 +Message-ID: <OFB55E8EC7.E8DD23D5-ON8725774E.0004921E-8825774E.0004CC31@us.ibm.com> +References: <20100625125306.7f9b1966@tlielax.poochiereds.net> <4C24A606.5040001@suse.de> + <1277220214-3597-1-git-send-email-sjayaraman@suse.de> <9822.1277312573@redhat.com> + <22697.1277470549@redhat.com> <18628.1277502398@redhat.com> <20100625182651.36800d06@tlielax.poochiereds.net> + <AANLkTilOTrHLvLv4XWYZO6xCnYZgYT7gO2M-oKZ6VvqM@mail.gmail.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: quoted-printable +Cc: linux-cifs@vger.kernel.org, Jeff Layton <jlayton@redhat.com>, + samba-technical@lists.samba.org, linux-kernel@vger.kernel.org, + David Howells <dhowells@redhat.com>, linux-fsdevel@vger.kernel.org, + "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> +To: Steve French <smfrench@gmail.com> +X-From: samba-technical-bounces@lists.samba.org Sat Jun 26 13:36:56 2010 +Return-path: <samba-technical-bounces@lists.samba.org> +Envelope-to: gnsi-samba-technical@m.gmane.org +Received: from fn.samba.org ([216.83.154.106] helo=lists.samba.org) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <samba-technical-bounces@lists.samba.org>) + id 1OSTgu-00025d-6P + for gnsi-samba-technical@m.gmane.org; Sat, 26 Jun 2010 13:36:56 +0200 +Received: from fn.samba.org (localhost [127.0.0.1]) + by lists.samba.org (Postfix) with ESMTP id 1ED11AD2C4; + Sat, 26 Jun 2010 05:36:45 -0600 (MDT) +X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on fn.samba.org +X-Spam-Level: +X-Spam-Status: No, score=-6.6 required=3.8 tests=BAYES_00,HTML_MESSAGE, + RCVD_IN_DNSWL_MED,SPF_PASS autolearn=ham version=3.2.5 +X-Original-To: samba-technical@lists.samba.org +Delivered-To: samba-technical@lists.samba.org +Received: from e34.co.us.ibm.com (e34.co.us.ibm.com [32.97.110.152]) + by lists.samba.org (Postfix) with ESMTP id 30F90AD282 + for <samba-technical@lists.samba.org>; + Fri, 25 Jun 2010 18:52:24 -0600 (MDT) +Received: from d03relay01.boulder.ibm.com (d03relay01.boulder.ibm.com + [9.17.195.226]) + by e34.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id o5Q0iN1h017083 + for <samba-technical@lists.samba.org>; Fri, 25 Jun 2010 18:44:23 -0600 +Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) + by d03relay01.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id + o5Q0qQTN175324 + for <samba-technical@lists.samba.org>; Fri, 25 Jun 2010 18:52:26 -0600 +Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) + by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP + id o5Q0qPCF006767 + for <samba-technical@lists.samba.org>; Fri, 25 Jun 2010 18:52:26 -0600 +Received: from d03nm128.boulder.ibm.com (d03nm128.boulder.ibm.com + [9.17.195.32]) + by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id + o5Q0qPrh006760; Fri, 25 Jun 2010 18:52:25 -0600 +In-Reply-To: <AANLkTilOTrHLvLv4XWYZO6xCnYZgYT7gO2M-oKZ6VvqM@mail.gmail.com> +X-KeepSent: B55E8EC7:E8DD23D5-8725774E:0004921E; + type=4; name=$KeepSent +X-Mailer: Lotus Notes Build V852_M2_03302010 March 30, 2010 +X-MIMETrack: Serialize by Router on D03NM128/03/M/IBM(Release 8.0.1|February + 07, 2008) at 06/25/2010 18:52:25 +X-Mailman-Approved-At: Sat, 26 Jun 2010 05:36:42 -0600 +X-Content-Filtered-By: Mailman/MimeDel 2.1.12 +X-BeenThere: samba-technical@lists.samba.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Discussions on Samba internals. For general questions please + subscribe to the list samba@samba.org" + <samba-technical.lists.samba.org> +List-Unsubscribe: <https://lists.samba.org/mailman/options/samba-technical>, + <mailto:samba-technical-request@lists.samba.org?subject=unsubscribe> +List-Archive: <http://lists.samba.org/pipermail/samba-technical> +List-Post: <mailto:samba-technical@lists.samba.org> +List-Help: <mailto:samba-technical-request@lists.samba.org?subject=help> +List-Subscribe: <https://lists.samba.org/mailman/listinfo/samba-technical>, + <mailto:samba-technical-request@lists.samba.org?subject=subscribe> +Sender: samba-technical-bounces@lists.samba.org +Errors-To: samba-technical-bounces@lists.samba.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1003208> + + + +Steve French <smfrench@gmail.com> wrote on 06/25/2010 04:05:30 PM: + +> Steve French <smfrench@gmail.com> +> 06/25/2010 04:05 PM +> +> To +> +> Jeff Layton <jlayton@samba.org>, "Aneesh Kumar K.V" +> <aneesh.kumar@linux.vnet.ibm.com>, Mingming Cao/Beaverton/IBM@IBMUS +> +> cc +> +> David Howells <dhowells@redhat.com>, Suresh Jayaraman +> <sjayaraman@suse.de>, linux-cifs@vger.kernel.org, linux- +> fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, samba- +> technical@lists.samba.org, Jeff Layton <jlayton@redhat.com> +> +> Subject +> +> Re: [RFC][PATCH 06/10] cifs: define inode-level cache object and +> register them +> +> On Fri, Jun 25, 2010 at 5:26 PM, Jeff Layton <jlayton@samba.org> wrot= +e: +> > +> > On Fri, 25 Jun 2010 22:46:38 +0100 +> > David Howells <dhowells@redhat.com> wrote: +> > +> > > Jeff Layton <jlayton@samba.org> wrote: +> > > +> > > > Looks like it mostly uses the ctime. IMO, the mtime would be a +better +> > > > choice since it changes less frequently, but I don't guess that= + it +> > > > matters very much. +> > > +> > > I'd've thought mtime changes more frequently since that's +> altered when data is +> > > written. =A0ctime is changed when attributes are changed. +> > > +> > +> > IIUC, updating mtime for a write is also an attribute change, and t= +hat +> > affects ctime. According to the stat(2) manpage: +> > +> > =A0 =A0 =A0 The field st_ctime is changed by writing or by setting +> =A0inode =A0informa- +> > =A0 =A0 =A0 tion (i.e., owner, group, link count, mode, etc.). +> > +> > > Note that Ext4 appears to have a file creation time field in its +inode +> > > (struct ext4_inode::i_crtime[_extra]). =A0Can Samba be made to us= +e +that? +> > > +> > +> > Is it exposed to userspace in any (standard) way? It would be handy= + to +> > have that. While we're wishing...it might also be nice to have a +> > standard way to get at the i_generation from userspace too. +> > +> +> Yes - I have talked with MingMing and Aneesh about those (NFS may +> someday be able to use those too).=A0 An obstacle in the past had bee= +n +> that samba server stores its own fake creation time in an ndr encoded= + +> xattr which complicates things. +> +> MingMing/Annesh - +> Xattr or other way to get at birth time? +> +> + +Not yet, + The ext4 file creation time only accesable from the kernel at the mome= +nt. +There were discussion +to make this information avaliable via xattr before, but was rejected, +since most people +agree that making this info avalibele via stat() is more standard. Howe= +ver +modifying stat() would imply +big interface change. thus no action has been taken yet. + +> -- +> Thanks, +> +> Steve= + + + diff --git a/test/corpora/lkml/cur/1382298770.003317:2, b/test/corpora/lkml/cur/1382298770.003317:2, new file mode 100644 index 00000000..6fce5182 --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.003317:2, @@ -0,0 +1,156 @@ +From: "Aneesh Kumar K. V" <aneesh.kumar@linux.vnet.ibm.com> +Subject: Re: [RFC][PATCH 06/10] cifs: define inode-level cache object and register them +Date: Sun, 27 Jun 2010 23:47:21 +0530 +Lines: 100 +Message-ID: <871vbscpce.fsf@linux.vnet.ibm.com> +References: <20100625125306.7f9b1966@tlielax.poochiereds.net> <4C24A606.5040001@suse.de> <1277220214-3597-1-git-send-email-sjayaraman@suse.de> <9822.1277312573@redhat.com> <22697.1277470549@redhat.com> <18628.1277502398@redhat.com> <20100625182651.36800d06@tlielax.poochiereds.net> <AANLkTilOTrHLvLv4XWYZO6xCnYZgYT7gO2M-oKZ6VvqM@mail.gmail.com> <OFB55E8EC7.E8DD23D5-ON8725774E.0004921E-8825774E.0004CC31@us.ibm.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: QUOTED-PRINTABLE +Cc: David Howells <dhowells@redhat.com>, + Jeff Layton <jlayton@redhat.com>, + Jeff Layton <jlayton@samba.org>, linux-cifs@vger.kernel.org, + linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, + samba-technical@lists.samba.org, + Suresh Jayaraman <sjayaraman@suse.de> +To: Mingming Cao <mcao@us.ibm.com>, Steve French <smfrench@gmail.com>, + "DENIEL Philippe" <philippe.deniel@cea.fr> +X-From: linux-kernel-owner@vger.kernel.org Sun Jun 27 20:18:00 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1OSwQZ-0003Kh-Vu + for glk-linux-kernel-3@lo.gmane.org; Sun, 27 Jun 2010 20:18:00 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1754631Ab0F0SRq convert rfc822-to-quoted-printable (ORCPT + <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 27 Jun 2010 14:17:46 -0400 +Received: from e23smtp07.au.ibm.com ([202.81.31.140]:52430 "EHLO + e23smtp07.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1753837Ab0F0SRl convert rfc822-to-8bit (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Sun, 27 Jun 2010 14:17:41 -0400 +Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [202.81.31.247]) + by e23smtp07.au.ibm.com (8.14.4/8.13.1) with ESMTP id o5RIHbfJ012483; + Mon, 28 Jun 2010 04:17:37 +1000 +Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) + by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o5RIHW9f1130634; + Mon, 28 Jun 2010 04:17:32 +1000 +Received: from d23av03.au.ibm.com (loopback [127.0.0.1]) + by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o5RIHVcR027534; + Mon, 28 Jun 2010 04:17:32 +1000 +Received: from skywalker.linux.vnet.ibm.com ([9.77.196.78]) + by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id o5RIHMFl027485; + Mon, 28 Jun 2010 04:17:24 +1000 +In-Reply-To: <OFB55E8EC7.E8DD23D5-ON8725774E.0004921E-8825774E.0004CC31@us.ibm.com> +User-Agent: Notmuch/ (http://notmuchmail.org) Emacs/24.0.50.1 (i686-pc-linux-gnu) +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1003357> + +On Fri, 25 Jun 2010 17:52:24 -0700, Mingming Cao <mcao@us.ibm.com> wrot= +e: +>=20 +>=20 +> Steve French <smfrench@gmail.com> wrote on 06/25/2010 04:05:30 PM: +>=20 +> > Steve French <smfrench@gmail.com> +> > 06/25/2010 04:05 PM +> > +> > To +> > +> > Jeff Layton <jlayton@samba.org>, "Aneesh Kumar K.V" +> > <aneesh.kumar@linux.vnet.ibm.com>, Mingming Cao/Beaverton/IBM@IBMUS +> > +> > cc +> > +> > David Howells <dhowells@redhat.com>, Suresh Jayaraman +> > <sjayaraman@suse.de>, linux-cifs@vger.kernel.org, linux- +> > fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, samba- +> > technical@lists.samba.org, Jeff Layton <jlayton@redhat.com> +> > +> > Subject +> > +> > Re: [RFC][PATCH 06/10] cifs: define inode-level cache object and +> > register them +> > +> > On Fri, Jun 25, 2010 at 5:26 PM, Jeff Layton <jlayton@samba.org> wr= +ote: +> > > +> > > On Fri, 25 Jun 2010 22:46:38 +0100 +> > > David Howells <dhowells@redhat.com> wrote: +> > > +> > > > Jeff Layton <jlayton@samba.org> wrote: +> > > > +> > > > > Looks like it mostly uses the ctime. IMO, the mtime would be = +a +> better +> > > > > choice since it changes less frequently, but I don't guess th= +at it +> > > > > matters very much. +> > > > +> > > > I'd've thought mtime changes more frequently since that's +> > altered when data is +> > > > written. =C2=A0ctime is changed when attributes are changed. +> > > > +> > > +> > > IIUC, updating mtime for a write is also an attribute change, and= + that +> > > affects ctime. According to the stat(2) manpage: +> > > +> > > =C2=A0 =C2=A0 =C2=A0 The field st_ctime is changed by writing or = +by setting +> > =C2=A0inode =C2=A0informa- +> > > =C2=A0 =C2=A0 =C2=A0 tion (i.e., owner, group, link count, mode, = +etc.). +> > > +> > > > Note that Ext4 appears to have a file creation time field in it= +s +> inode +> > > > (struct ext4_inode::i_crtime[_extra]). =C2=A0Can Samba be made = +to use +> that? +> > > > +> > > +> > > Is it exposed to userspace in any (standard) way? It would be han= +dy to +> > > have that. While we're wishing...it might also be nice to have a +> > > standard way to get at the i_generation from userspace too. +> > > +> > +> > Yes - I have talked with MingMing and Aneesh about those (NFS may +> > someday be able to use those too).=C2=A0 An obstacle in the past ha= +d been +> > that samba server stores its own fake creation time in an ndr encod= +ed +> > xattr which complicates things. +> > +> > MingMing/Annesh - +> > Xattr or other way to get at birth time? +> > +> > +>=20 +> Not yet, +> The ext4 file creation time only accesable from the kernel at the mo= +ment. +> There were discussion +> to make this information avaliable via xattr before, but was rejected= +, +> since most people +> agree that making this info avalibele via stat() is more standard. Ho= +wever +> modifying stat() would imply +> big interface change. thus no action has been taken yet. + +NFS ganesha pNFS also had a requirement for getting i_generation and +inode number in userspace. So may be we should now look at updating +stat or add a variant syscall that include i_generation and create time +in the return value + +-aneesh + + diff --git a/test/corpora/lkml/cur/1382298770.003318:2, b/test/corpora/lkml/cur/1382298770.003318:2, new file mode 100644 index 00000000..058d1477 --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.003318:2, @@ -0,0 +1,66 @@ +From: Christoph Hellwig <hch-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> +Subject: Re: [RFC][PATCH 06/10] cifs: define inode-level cache object and + register them +Date: Sun, 27 Jun 2010 14:22:29 -0400 +Lines: 9 +Message-ID: <20100627182229.GA492@infradead.org> +References: <20100625125306.7f9b1966@tlielax.poochiereds.net> + <4C24A606.5040001@suse.de> + <1277220214-3597-1-git-send-email-sjayaraman@suse.de> + <9822.1277312573@redhat.com> + <22697.1277470549@redhat.com> + <18628.1277502398@redhat.com> + <20100625182651.36800d06@tlielax.poochiereds.net> + <AANLkTilOTrHLvLv4XWYZO6xCnYZgYT7gO2M-oKZ6VvqM@mail.gmail.com> + <OFB55E8EC7.E8DD23D5-ON8725774E.0004921E-8825774E.0004CC31@us.ibm.com> + <871vbscpce.fsf@linux.vnet.ibm.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Cc: Mingming Cao <mcao-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>, Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, + DENIEL Philippe <philippe.deniel-KCE40YydGKI@public.gmane.org>, + David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>, + Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>, + Jeff Layton <jlayton-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org>, linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + samba-technical-w/Ol4Ecudpl8XjKLYN78aQ@public.gmane.org, + Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +To: "Aneesh Kumar K. V" <aneesh.kumar-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Sun Jun 27 20:22:46 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1OSwVB-0005TI-SG + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Sun, 27 Jun 2010 20:22:46 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1752811Ab0F0SWo (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Sun, 27 Jun 2010 14:22:44 -0400 +Received: from bombadil.infradead.org ([18.85.46.34]:55433 "EHLO + bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1752728Ab0F0SWn (ORCPT + <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); Sun, 27 Jun 2010 14:22:43 -0400 +Received: from hch by bombadil.infradead.org with local (Exim 4.72 #1 (Red Hat Linux)) + id 1OSwUv-00009z-9N; Sun, 27 Jun 2010 18:22:29 +0000 +Content-Disposition: inline +In-Reply-To: <871vbscpce.fsf-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org> +User-Agent: Mutt/1.5.20 (2009-08-17) +X-SRS-Rewrite: SMTP reverse-path rewritten from <hch-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> by bombadil.infradead.org + See http://www.infradead.org/rpr.html +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1003358> + +On Sun, Jun 27, 2010 at 11:47:21PM +0530, Aneesh Kumar K. V wrote: +> NFS ganesha pNFS also had a requirement for getting i_generation and +> inode number in userspace. So may be we should now look at updating +> stat or add a variant syscall that include i_generation and create time +> in the return value + +What's missing in knfsd that you feel the sudden urge to move backwards +to a userspace nfsd (one with a horribly crappy codebase, too). + + + diff --git a/test/corpora/lkml/cur/1382298770.003486:2, b/test/corpora/lkml/cur/1382298770.003486:2, new file mode 100644 index 00000000..8831b450 --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.003486:2, @@ -0,0 +1,89 @@ +From: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org> +Subject: Re: [RFC][PATCH 05/10] cifs: define superblock-level cache index + objects and register them +Date: Mon, 28 Jun 2010 18:23:13 +0530 +Lines: 48 +Message-ID: <4C289B39.4060901@suse.de> +References: <22746.1277470713@redhat.com> <4C24A4A0.90408@suse.de> <1277220206-3559-1-git-send-email-sjayaraman@suse.de> <yes> <9720.1277312290@redhat.com> <23204.1277472412@redhat.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 7bit +Cc: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +To: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +X-From: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Mon Jun 28 14:53:24 2010 +Return-path: <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1OTDq0-00054Q-At + for glkc-linux-cifs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Mon, 28 Jun 2010 14:53:24 +0200 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1754503Ab0F1MxX (ORCPT <rfc822;glkc-linux-cifs@m.gmane.org>); + Mon, 28 Jun 2010 08:53:23 -0400 +Received: from cantor2.suse.de ([195.135.220.15]:48374 "EHLO mx2.suse.de" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1754456Ab0F1MxW (ORCPT <rfc822;linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); + Mon, 28 Jun 2010 08:53:22 -0400 +Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) + by mx2.suse.de (Postfix) with ESMTP id 7BDC18672B; + Mon, 28 Jun 2010 14:53:21 +0200 (CEST) +User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.5) Gecko/20091130 SUSE/3.0.0-1.1.1 Thunderbird/3.0 +In-Reply-To: <23204.1277472412-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-cifs.vger.kernel.org> +X-Mailing-List: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1003530> + +On 06/25/2010 06:56 PM, David Howells wrote: +> David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote: +> +>>>> validate the root directory of the share in some way? +>>> +>>> I don't know if there is a way to do this. +>> +>> Is there an inode number or something? Even the creation time might do. +> +> Looking in cifspdu.h, there are a number of things that it might be possible +> to use. +> +> (1) FILE_ALL_INFO: CreationTime, IndexNumber, IndexNumber1, FileName +> (assuming this isn't flattened to '\' or something for the root of a +> share. +> +> (2) FILE_UNIX_BASIC_INFO: DevMajor, DevMinor, UniqueId. +> +> (3) FILE_INFO_STANDARD: CreationDate, CreationTime. +> +> (4) FILE_INFO_BASIC: CreationTime. +> +> (5) FILE_DIRECTORY_INFO: FileIndex, CreationTime, FileName. +> +> (6) SEARCH_ID_FULL_DIR_INFO: FileIndex, CreationTime, UniqueId, FileName. +> +> (7) FILE_BOTH_DIRECTORY_INFO: FileIndex, CreationTime, ShortName, FileName. +> +> (8) OPEN_RSP_EXT: Fid, CreationTime, VolumeGUID, FileId. +> +> You may have to choose different sets of things, depending on what the server +> has on offer. Also, don't forget, if you can't work out whether a share is + +Did you mean we need to validate differently for different servers? + +I just did some testing and it looks like we could rely on CreationTime, +IndexNumber for validating with Windows servers (FileName is relative to +the mapped drive) and UniqueId for validating with Samba servers. I did +not test all possibilities (there could be more). + +> coherent or not from the above, you can always use LastWriteTime, ChangeTime +> and EndOfFile and just discard the whole subtree if they differ. +> + +Thanks, + +-- +Suresh Jayaraman + + diff --git a/test/corpora/lkml/cur/1382298770.003499:2, b/test/corpora/lkml/cur/1382298770.003499:2, new file mode 100644 index 00000000..b10adc4e --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.003499:2, @@ -0,0 +1,63 @@ +From: David Howells <dhowells@redhat.com> +Subject: Re: [RFC][PATCH 05/10] cifs: define superblock-level cache index objects and register them +Date: Mon, 28 Jun 2010 14:24:45 +0100 +Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley + Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United + Kingdom. + Registered in England and Wales under Company Registration No. 3798903 +Lines: 17 +Message-ID: <9513.1277731485@redhat.com> +References: <4C289B39.4060901@suse.de> <22746.1277470713@redhat.com> <4C24A4A0.90408@suse.de> <1277220206-3559-1-git-send-email-sjayaraman@suse.de> <yes> <9720.1277312290@redhat.com> <23204.1277472412@redhat.com> +Cc: dhowells@redhat.com, Steve French <smfrench@gmail.com>, + linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, + linux-kernel@vger.kernel.org +To: Suresh Jayaraman <sjayaraman@suse.de> +X-From: linux-fsdevel-owner@vger.kernel.org Mon Jun 28 15:24:57 2010 +Return-path: <linux-fsdevel-owner@vger.kernel.org> +Envelope-to: lnx-linux-fsdevel@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-fsdevel-owner@vger.kernel.org>) + id 1OTEKW-00048k-S3 + for lnx-linux-fsdevel@lo.gmane.org; Mon, 28 Jun 2010 15:24:57 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1751608Ab0F1NYz (ORCPT <rfc822;lnx-linux-fsdevel@m.gmane.org>); + Mon, 28 Jun 2010 09:24:55 -0400 +Received: from mx1.redhat.com ([209.132.183.28]:26085 "EHLO mx1.redhat.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1751395Ab0F1NYy (ORCPT <rfc822;linux-fsdevel@vger.kernel.org>); + Mon, 28 Jun 2010 09:24:54 -0400 +Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) + by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5SDOmfA019811 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); + Mon, 28 Jun 2010 09:24:49 -0400 +Received: from redhat.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) + by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5SDOjHf030340; + Mon, 28 Jun 2010 09:24:47 -0400 +In-Reply-To: <4C289B39.4060901@suse.de> +X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 +Sender: linux-fsdevel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-fsdevel.vger.kernel.org> +X-Mailing-List: linux-fsdevel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1003543> + +Suresh Jayaraman <sjayaraman@suse.de> wrote: + +> Did you mean we need to validate differently for different servers? + +You may need to, yes, as different servers may make different attributes +available. + +This isn't too bad. Each server index record in the cache has freeform +auxiliary data, just as does each file data record. You could, say, stick a +byte at the front that indicates what you've stored in there. + +David +-- +To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + + diff --git a/test/corpora/lkml/cur/1382298770.004581:2, b/test/corpora/lkml/cur/1382298770.004581:2, new file mode 100644 index 00000000..732bfa09 --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.004581:2, @@ -0,0 +1,92 @@ +From: Timur Tabi <timur.tabi@gmail.com> +Subject: Re: [PATCH v2 5/7] powerpc/85xx: Add MChk handler for SRIO port +Date: Wed, 30 Jun 2010 15:55:58 -0500 +Lines: 33 +Message-ID: <AANLkTine3pc2Ai2Woj81Y9fS_KgGs1sIMb2NMR6G74ww@mail.gmail.com> +References: <20100308191005.GE4324@amak.tundra.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: QUOTED-PRINTABLE +Cc: mporter@kernel.crashing.org, linux-kernel@vger.kernel.org, + linuxppc-dev@lists.ozlabs.org, thomas.moll@sysgo.com +To: Alexandre Bounine <abounine@tundra.com> +X-From: linux-kernel-owner@vger.kernel.org Wed Jun 30 22:56:40 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1OU4Kl-0005Kf-V4 + for glk-linux-kernel-3@lo.gmane.org; Wed, 30 Jun 2010 22:56:40 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1756668Ab0F3U4b convert rfc822-to-quoted-printable (ORCPT + <rfc822;glk-linux-kernel-3@m.gmane.org>); + Wed, 30 Jun 2010 16:56:31 -0400 +Received: from mail-vw0-f46.google.com ([209.85.212.46]:41333 "EHLO + mail-vw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1753416Ab0F3U43 convert rfc822-to-8bit (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Wed, 30 Jun 2010 16:56:29 -0400 +Received: by vws5 with SMTP id 5so1449398vws.19 + for <linux-kernel@vger.kernel.org>; Wed, 30 Jun 2010 13:56:28 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=gmail.com; s=gamma; + h=domainkey-signature:received:mime-version:received:in-reply-to + :references:from:date:message-id:subject:to:cc:content-type + :content-transfer-encoding; + bh=FTlit9cHTz/9rLGcvA5/pEZlzxAQ5x20v8HE5XYFwYM=; + b=NFbjnxZ4KwcjTy4tFh+BnhWPEGeYTw6z918yIouRaMmbEDph56xq26K9aTBokuYHqe + UgFjBn7XWcxvqJPyCetfsDRG+F3M2XwCq/DSCswSPtXSLsy8WKm7cMXVS3hjiO8sMZ97 + mRMGZkYBJHjWP+ulkBXiq6q7/OQuE8Dkl+rWM= +DomainKey-Signature: a=rsa-sha1; c=nofws; + d=gmail.com; s=gamma; + h=mime-version:in-reply-to:references:from:date:message-id:subject:to + :cc:content-type:content-transfer-encoding; + b=r0N6AOAg+TSvY2kPQPahldj4iRU9oUoSLtHA7JXG2QU4CR9O5GBhxAtr2aY99qUPZd + tFS0ZWRAb9cmOgiZhTpNxsBjCJ/e/DQ1ccP5rZ/U40q1SJ1KwN92hqpOoppZ0tkqSB7/ + UlQtsvPSK7a0bYqufEmscfAi98w1+mfZIbK6U= +Received: by 10.220.161.203 with SMTP id s11mr5093041vcx.195.1277931388141; + Wed, 30 Jun 2010 13:56:28 -0700 (PDT) +Received: by 10.220.161.137 with HTTP; Wed, 30 Jun 2010 13:55:58 -0700 (PDT) +In-Reply-To: <20100308191005.GE4324@amak.tundra.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1004632> + +On Mon, Mar 8, 2010 at 2:10 PM, Alexandre Bounine <abounine@tundra.com>= + wrote: +> +> From: Alexandre Bounine <alexandre.bounine@idt.com> +> +> Add Machine Check exception handling into RapidIO port driver +> for Freescale SoCs (MPC85xx). +> +> Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com> +> Tested-by: Thomas Moll <thomas.moll@sysgo.com> +=2E.. + +> +static int fsl_rio_mcheck_exception(struct pt_regs *regs) +> +{ +> + =A0 =A0 =A0 const struct exception_table_entry *entry =3D NULL; +> + =A0 =A0 =A0 unsigned long reason =3D (mfspr(SPRN_MCSR) & MCSR_MASK)= +; + +MCSR_MASK is not defined anywhere, so when I compile this code, I get t= +his: + + CC arch/powerpc/sysdev/fsl_rio.o +arch/powerpc/sysdev/fsl_rio.c: In function 'fsl_rio_mcheck_exception': +arch/powerpc/sysdev/fsl_rio.c:248: error: 'MCSR_MASK' undeclared +(first use in this function) +arch/powerpc/sysdev/fsl_rio.c:248: error: (Each undeclared identifier +is reported only once +arch/powerpc/sysdev/fsl_rio.c:248: error: for each function it appears = +in.) + +--=20 +Timur Tabi +Linux kernel developer at Freescale + + diff --git a/test/corpora/lkml/cur/1382298770.004582:2, b/test/corpora/lkml/cur/1382298770.004582:2, new file mode 100644 index 00000000..d149b721 --- /dev/null +++ b/test/corpora/lkml/cur/1382298770.004582:2, @@ -0,0 +1,68 @@ +From: Timur Tabi <timur.tabi@gmail.com> +Subject: Re: [PATCH v2 5/7] powerpc/85xx: Add MChk handler for SRIO port +Date: Wed, 30 Jun 2010 16:00:56 -0500 +Lines: 12 +Message-ID: <AANLkTinKbimKyLpvFD7KOvavshu_n8gRcp2BvEJj0XZQ@mail.gmail.com> +References: <20100308191005.GE4324@amak.tundra.com> <AANLkTine3pc2Ai2Woj81Y9fS_KgGs1sIMb2NMR6G74ww@mail.gmail.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Cc: mporter@kernel.crashing.org, linux-kernel@vger.kernel.org, + linuxppc-dev@lists.ozlabs.org, thomas.moll@sysgo.com +To: Alexandre Bounine <abounine@tundra.com> +X-From: linux-kernel-owner@vger.kernel.org Wed Jun 30 23:01:37 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1OU4PZ-0000HS-0T + for glk-linux-kernel-3@lo.gmane.org; Wed, 30 Jun 2010 23:01:37 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1755703Ab0F3VB2 (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Wed, 30 Jun 2010 17:01:28 -0400 +Received: from mail-vw0-f46.google.com ([209.85.212.46]:53141 "EHLO + mail-vw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1751784Ab0F3VB1 (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Wed, 30 Jun 2010 17:01:27 -0400 +Received: by vws5 with SMTP id 5so1454517vws.19 + for <linux-kernel@vger.kernel.org>; Wed, 30 Jun 2010 14:01:26 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=gmail.com; s=gamma; + h=domainkey-signature:received:mime-version:received:in-reply-to + :references:from:date:message-id:subject:to:cc:content-type; + bh=+BUKti+Oa03CrnVvRyT591FhcoxqR7S2rzZHtD6WSuY=; + b=O/b04HLJrmTE0aIq2mNCRznQrXxAAGHSMarHR5mrgYptmr68froM6UgmDqTZFLhNiH + BcT8g+AziiqSV1k/ckXjRyVR0s9Jdv4g2phMNtp8NStbPfOPpLDkUKTQadphOTonCfeK + e+ZrLBwh+FCoYNAOjvFioBKj6CxN2Oi5xIhPc= +DomainKey-Signature: a=rsa-sha1; c=nofws; + d=gmail.com; s=gamma; + h=mime-version:in-reply-to:references:from:date:message-id:subject:to + :cc:content-type; + b=UcKGhJIXCTTcSvBWwGwLUefPONGygVPsUnTt4nDSl4udB8JKMyi0EghzzgNXUyq4Dz + UCxzZAyxzjvjgsgPS3kzPhSsWG2PRG66pC1OA68RJ5YVOjt55/yOz/yfTqXBVvRSq2fV + QNcKACYHSjkIZ7Uq7ZEW9bEGI5tTKdz++N2UA= +Received: by 10.220.124.73 with SMTP id t9mr5099129vcr.37.1277931686462; Wed, + 30 Jun 2010 14:01:26 -0700 (PDT) +Received: by 10.220.161.137 with HTTP; Wed, 30 Jun 2010 14:00:56 -0700 (PDT) +In-Reply-To: <AANLkTine3pc2Ai2Woj81Y9fS_KgGs1sIMb2NMR6G74ww@mail.gmail.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1004633> + +On Wed, Jun 30, 2010 at 3:55 PM, Timur Tabi <timur.tabi@gmail.com> wrote: + +> MCSR_MASK is not defined anywhere, so when I compile this code, I get this: + +Never mind. I see that it's been fixed already, and that the patch +that removed MCSR_MASK was posted around the same time that this patch +was posted. + + +-- +Timur Tabi +Linux kernel developer at Freescale + + diff --git a/test/corpora/lkml/cur/1382298775.002830:2, b/test/corpora/lkml/cur/1382298775.002830:2, new file mode 100644 index 00000000..1bf40bcd --- /dev/null +++ b/test/corpora/lkml/cur/1382298775.002830:2, @@ -0,0 +1,60 @@ +From: Michael Neuling <mikey@neuling.org> +Subject: Re: [PATCH v2 5/7] powerpc/85xx: Add MChk handler for SRIO port +Date: Tue, 03 Aug 2010 16:06:30 +1000 +Lines: 15 +Message-ID: <4381.1280815590@neuling.org> +References: <20100308191005.GE4324@amak.tundra.com> <AANLkTine3pc2Ai2Woj81Y9fS_KgGs1sIMb2NMR6G74ww@mail.gmail.com> <AANLkTinKbimKyLpvFD7KOvavshu_n8gRcp2BvEJj0XZQ@mail.gmail.com> +Cc: Alexandre Bounine <abounine@tundra.com>, + linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, + thomas.moll@sysgo.com +To: Timur Tabi <timur.tabi@gmail.com> +X-From: linux-kernel-owner@vger.kernel.org Tue Aug 03 08:06:45 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1OgAeD-00087x-ED + for glk-linux-kernel-3@lo.gmane.org; Tue, 03 Aug 2010 08:06:45 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1755287Ab0HCGGf (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Tue, 3 Aug 2010 02:06:35 -0400 +Received: from ozlabs.org ([203.10.76.45]:51158 "EHLO ozlabs.org" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1755139Ab0HCGGd (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Tue, 3 Aug 2010 02:06:33 -0400 +Received: from localhost.localdomain (localhost [127.0.0.1]) + by ozlabs.org (Postfix) with ESMTP id B7A371007D1; + Tue, 3 Aug 2010 16:06:31 +1000 (EST) +Received: by localhost.localdomain (Postfix, from userid 1000) + id EDBB7C5EB7; Tue, 3 Aug 2010 16:06:30 +1000 (EST) +Received: from neuling.org (localhost [127.0.0.1]) + by localhost.localdomain (Postfix) with ESMTP id E8003C51D3; + Tue, 3 Aug 2010 16:06:30 +1000 (EST) +In-reply-to: <AANLkTinKbimKyLpvFD7KOvavshu_n8gRcp2BvEJj0XZQ@mail.gmail.com> +Comments: In-reply-to Timur Tabi <timur.tabi@gmail.com> + message dated "Wed, 30 Jun 2010 16:00:56 -0500." +X-Mailer: MH-E 8.2; nmh 1.3; GNU Emacs 23.1.1 +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1017846> + +> > MCSR_MASK is not defined anywhere, so when I compile this code, I get this: +> +> Never mind. I see that it's been fixed already, and that the patch +> that removed MCSR_MASK was posted around the same time that this patch +> was posted. + +I don't know what happened here but 2.6.35 is broken because of this +problem: + +arch/powerpc/sysdev/fsl_rio.c:248: error: 'MCSR_MASK' undeclared (first use in this function) +arch/powerpc/sysdev/fsl_rio.c:248: error: (Each undeclared identifier is reported only once +arch/powerpc/sysdev/fsl_rio.c:248: error: for each function it appears in.) +arch/powerpc/sysdev/fsl_rio.c:250: error: 'MCSR_BUS_RBERR' undeclared (first use in this function) + +Mikey + + diff --git a/test/corpora/lkml/cur/1382298775.002978:2, b/test/corpora/lkml/cur/1382298775.002978:2, new file mode 100644 index 00000000..21e2a10a --- /dev/null +++ b/test/corpora/lkml/cur/1382298775.002978:2, @@ -0,0 +1,91 @@ +From: "Bounine, Alexandre" <Alexandre.Bounine@idt.com> +Subject: RE: [PATCH v2 5/7] powerpc/85xx: Add MChk handler for SRIO port +Date: Tue, 3 Aug 2010 05:17:54 -0700 +Lines: 34 +Message-ID: <0CE8B6BE3C4AD74AB97D9D29BD24E5520114309D@CORPEXCH1.na.ads.idt.com> +References: <20100308191005.GE4324@amak.tundra.com> <AANLkTine3pc2Ai2Woj81Y9fS_KgGs1sIMb2NMR6G74ww@mail.gmail.com> <AANLkTinKbimKyLpvFD7KOvavshu_n8gRcp2BvEJj0XZQ@mail.gmail.com> <4381.1280815590@neuling.org> +Mime-Version: 1.0 +Content-Type: text/plain; + charset="us-ascii" +Content-Transfer-Encoding: 8BIT +Cc: "Alexandre Bounine" <abounine@tundra.com>, + <linuxppc-dev@lists.ozlabs.org>, <linux-kernel@vger.kernel.org>, + <thomas.moll@sysgo.com> +To: "Michael Neuling" <mikey@neuling.org>, + "Timur Tabi" <timur.tabi@gmail.com> +X-From: linux-kernel-owner@vger.kernel.org Tue Aug 03 14:27:12 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1OgGaG-0002zE-Fr + for glk-linux-kernel-3@lo.gmane.org; Tue, 03 Aug 2010 14:27:04 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1756073Ab0HCM0x (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Tue, 3 Aug 2010 08:26:53 -0400 +Received: from mxout1.idt.com ([157.165.5.25]:35046 "EHLO mxout1.idt.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1756010Ab0HCM0w convert rfc822-to-8bit (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Tue, 3 Aug 2010 08:26:52 -0400 +X-Greylist: delayed 521 seconds by postgrey-1.27 at vger.kernel.org; Tue, 03 Aug 2010 08:26:52 EDT +Received: from mail.idt.com (localhost [127.0.0.1]) + by mxout1.idt.com (8.13.1/8.13.1) with ESMTP id o73CHxil001904; + Tue, 3 Aug 2010 05:17:59 -0700 +Received: from corpml3.corp.idt.com (corpml3.corp.idt.com [157.165.140.25]) + by mail.idt.com (8.13.8/8.13.8) with ESMTP id o73CHvit016488; + Tue, 3 Aug 2010 05:17:57 -0700 (PDT) +Received: from CORPEXCH1.na.ads.idt.com (localhost [127.0.0.1]) + by corpml3.corp.idt.com (8.11.7p1+Sun/8.11.7) with ESMTP id o73CHtN07516; + Tue, 3 Aug 2010 05:17:55 -0700 (PDT) +X-MimeOLE: Produced By Microsoft Exchange V6.5 +Content-class: urn:content-classes:message +In-Reply-To: <4381.1280815590@neuling.org> +X-MS-Has-Attach: +X-MS-TNEF-Correlator: +Thread-Topic: [PATCH v2 5/7] powerpc/85xx: Add MChk handler for SRIO port +Thread-Index: Acsy0pTOmhzzm4GETvS4r2R2pYb40wAMtx8w +X-Scanned-By: MIMEDefang 2.43 +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1017995> + +This happened after change to book-e definitions. +There are patches that address this issue. + +> -----Original Message----- +> From: Michael Neuling [mailto:mikey@neuling.org] +> Sent: Tuesday, August 03, 2010 2:07 AM +> To: Timur Tabi +> Cc: Alexandre Bounine; linuxppc-dev@lists.ozlabs.org; +linux-kernel@vger.kernel.org; +> thomas.moll@sysgo.com +> Subject: Re: [PATCH v2 5/7] powerpc/85xx: Add MChk handler for SRIO +port +> +> > > MCSR_MASK is not defined anywhere, so when I compile this code, I +get this: +> > +> > Never mind. I see that it's been fixed already, and that the patch +> > that removed MCSR_MASK was posted around the same time that this +patch +> > was posted. +> +> I don't know what happened here but 2.6.35 is broken because of this +> problem: +> +> arch/powerpc/sysdev/fsl_rio.c:248: error: 'MCSR_MASK' undeclared +(first use in this function) +> arch/powerpc/sysdev/fsl_rio.c:248: error: (Each undeclared identifier +is reported only once +> arch/powerpc/sysdev/fsl_rio.c:248: error: for each function it appears +in.) +> arch/powerpc/sysdev/fsl_rio.c:250: error: 'MCSR_BUS_RBERR' undeclared +(first use in this function) +> +> Mikey + + diff --git a/test/corpora/lkml/cur/1382298775.002992:2, b/test/corpora/lkml/cur/1382298775.002992:2, new file mode 100644 index 00000000..0f11acd5 --- /dev/null +++ b/test/corpora/lkml/cur/1382298775.002992:2, @@ -0,0 +1,87 @@ +From: Timur Tabi <timur@freescale.com> +Subject: Re: [PATCH v2 5/7] powerpc/85xx: Add MChk handler for SRIO port +Date: Tue, 3 Aug 2010 08:01:51 -0500 +Lines: 25 +Message-ID: <AANLkTinpwYnyc1oN1VbtBgUF6bk6E5q_Gq1Dj3WXV3wc@mail.gmail.com> +References: <20100308191005.GE4324@amak.tundra.com> <AANLkTine3pc2Ai2Woj81Y9fS_KgGs1sIMb2NMR6G74ww@mail.gmail.com> + <AANLkTinKbimKyLpvFD7KOvavshu_n8gRcp2BvEJj0XZQ@mail.gmail.com> + <4381.1280815590@neuling.org> <0CE8B6BE3C4AD74AB97D9D29BD24E5520114309D@CORPEXCH1.na.ads.idt.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Cc: Michael Neuling <mikey@neuling.org>, + Alexandre Bounine <abounine@tundra.com>, + linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, + thomas.moll@sysgo.com, Kumar Gala <galak@kernel.crashing.org> +To: "Bounine, Alexandre" <Alexandre.Bounine@idt.com> +X-From: linux-kernel-owner@vger.kernel.org Tue Aug 03 15:02:39 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1OgH8b-0003r0-5v + for glk-linux-kernel-3@lo.gmane.org; Tue, 03 Aug 2010 15:02:33 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1756383Ab0HCNCY (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Tue, 3 Aug 2010 09:02:24 -0400 +Received: from mail-qy0-f181.google.com ([209.85.216.181]:47377 "EHLO + mail-qy0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1754253Ab0HCNCX (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Tue, 3 Aug 2010 09:02:23 -0400 +Received: by qyk7 with SMTP id 7so647758qyk.19 + for <linux-kernel@vger.kernel.org>; Tue, 03 Aug 2010 06:02:22 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=gmail.com; s=gamma; + h=domainkey-signature:received:mime-version:sender:received + :in-reply-to:references:from:date:x-google-sender-auth:message-id + :subject:to:cc:content-type; + bh=vTJghTE4Rwcgvgu1RS/86u/ljjztFlVQ5ODYWXBRkUM=; + b=p7S+ZVc0INWI6uXFwsLVTTEnV8wFAB0u0cDLt5qp0gyuMbF9yqXhukSTbYS8Vf8gCk + UFDmrOGjzC1whtvZnRS+Q80vVTR3+1URt/RTCUqirvalLvgluNrzP6sQ3xccFy4LkdLi + nGsgcNEqVwPPZgg3uSqew6B5UIoH7S00YzAYU= +DomainKey-Signature: a=rsa-sha1; c=nofws; + d=gmail.com; s=gamma; + h=mime-version:sender:in-reply-to:references:from:date + :x-google-sender-auth:message-id:subject:to:cc:content-type; + b=qNVeIlTzozhY9MXH5PHYIsAL8T7zOBZ+0hWrBlbEy0PiBHW1AAv9nNd6FspugBZVUW + q7iPmhg0n6Oa3KFBNjs42dInyCPUqiQs10rGTQCJsSVITmZ/NA9sf8FFbI+Dg7xQiJKj + TN/8W0tBK9mUiqVvoO1avTKG1hqyMwTdMqlaM= +Received: by 10.224.73.18 with SMTP id o18mr2669587qaj.354.1280840541149; Tue, + 03 Aug 2010 06:02:21 -0700 (PDT) +Received: by 10.220.112.69 with HTTP; Tue, 3 Aug 2010 06:01:51 -0700 (PDT) +In-Reply-To: <0CE8B6BE3C4AD74AB97D9D29BD24E5520114309D@CORPEXCH1.na.ads.idt.com> +X-Google-Sender-Auth: lBedzmn1VMYh0pQjuCJuDw-lNh8 +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1018009> + +On Tue, Aug 3, 2010 at 7:17 AM, Bounine, Alexandre +<Alexandre.Bounine@idt.com> wrote: +> This happened after change to book-e definitions. +> There are patches that address this issue. + +And those patches should have been applied before 2.6.35 was released. + Someone dropped the ball. 2.6.35 is broken for a number of PowerPC +boards: + +$ make mpc85xx_defconfig +... +$ make +... + CC arch/powerpc/sysdev/fsl_rio.o +arch/powerpc/sysdev/fsl_rio.c: In function 'fsl_rio_mcheck_exception': +arch/powerpc/sysdev/fsl_rio.c:248: error: 'MCSR_MASK' undeclared +(first use in this function) +arch/powerpc/sysdev/fsl_rio.c:248: error: (Each undeclared identifier +is reported only once +arch/powerpc/sysdev/fsl_rio.c:248: error: for each function it appears in.) +make[1]: *** [arch/powerpc/sysdev/fsl_rio.o] Error 1 + +-- +Timur Tabi +Linux kernel developer at Freescale + + diff --git a/test/corpora/lkml/cur/1382298775.002999:2, b/test/corpora/lkml/cur/1382298775.002999:2, new file mode 100644 index 00000000..e6456b69 --- /dev/null +++ b/test/corpora/lkml/cur/1382298775.002999:2, @@ -0,0 +1,109 @@ +From: "Bounine, Alexandre" <Alexandre.Bounine@idt.com> +Subject: RE: [PATCH v2 5/7] powerpc/85xx: Add MChk handler for SRIO port +Date: Tue, 3 Aug 2010 06:24:47 -0700 +Lines: 40 +Message-ID: <0CE8B6BE3C4AD74AB97D9D29BD24E552011430BC@CORPEXCH1.na.ads.idt.com> +References: <20100308191005.GE4324@amak.tundra.com> + <AANLkTine3pc2Ai2Woj81Y9fS_KgGs1sIMb2NMR6G74ww@mail.gmail.com> + <AANLkTinKbimKyLpvFD7KOvavshu_n8gRcp2BvEJj0XZQ@mail.gmail.com> + <4381.1280815590@neuling.org> + <0CE8B6BE3C4AD74AB97D9D29BD24E5520114309D@CORPEXCH1.na.ads.idt.com> + <AANLkTinpwYnyc1oN1VbtBgUF6bk6E5q_Gq1Dj3WXV3wc@mail.gmail.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Cc: Michael Neuling <mikey@neuling.org>, linux-kernel@vger.kernel.org, + Alexandre Bounine <abounine@tundra.com>, thomas.moll@sysgo.com, + linuxppc-dev@lists.ozlabs.org +To: "Timur Tabi" <timur@freescale.com> +X-From: linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane.org@lists.ozlabs.org Tue Aug 03 15:25:22 2010 +Return-path: <linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane.org@lists.ozlabs.org> +Envelope-to: glppe-linuxppc-embedded-2@m.gmane.org +Received: from ozlabs.org ([203.10.76.45]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane.org@lists.ozlabs.org>) + id 1OgHUd-0006wG-MW + for glppe-linuxppc-embedded-2@m.gmane.org; Tue, 03 Aug 2010 15:25:20 +0200 +Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) + by ozlabs.org (Postfix) with ESMTP id 54FA51007E4 + for <glppe-linuxppc-embedded-2@m.gmane.org>; Tue, 3 Aug 2010 23:25:09 +1000 (EST) +Received: from mxout1.idt.com (mxout1.idt.com [157.165.5.25]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (Client CN "mxout1.idt.com", Issuer "idt.com" (not verified)) + by ozlabs.org (Postfix) with ESMTPS id 5C917B70A6 + for <linuxppc-dev@lists.ozlabs.org>; + Tue, 3 Aug 2010 23:25:00 +1000 (EST) +Received: from mail.idt.com (localhost [127.0.0.1]) + by mxout1.idt.com (8.13.1/8.13.1) with ESMTP id o73DOrjO005661; + Tue, 3 Aug 2010 06:24:54 -0700 +Received: from corpml1.corp.idt.com (corpml1.corp.idt.com [157.165.140.20]) + by mail.idt.com (8.13.8/8.13.8) with ESMTP id o73DOndw022603; + Tue, 3 Aug 2010 06:24:50 -0700 (PDT) +Received: from CORPEXCH1.na.ads.idt.com (localhost [127.0.0.1]) + by corpml1.corp.idt.com (8.11.7p1+Sun/8.11.7) with ESMTP id + o73DOml00291; Tue, 3 Aug 2010 06:24:48 -0700 (PDT) +X-MimeOLE: Produced By Microsoft Exchange V6.5 +Content-class: urn:content-classes:message +In-Reply-To: <AANLkTinpwYnyc1oN1VbtBgUF6bk6E5q_Gq1Dj3WXV3wc@mail.gmail.com> +X-MS-Has-Attach: +X-MS-TNEF-Correlator: +Thread-Topic: [PATCH v2 5/7] powerpc/85xx: Add MChk handler for SRIO port +Thread-Index: AcszC8UElBYHaZlHSsmvZEE2KBL+0wAAhg7A +X-Scanned-By: MIMEDefang 2.43 +X-BeenThere: linuxppc-dev@lists.ozlabs.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: Linux on PowerPC Developers Mail List <linuxppc-dev.lists.ozlabs.org> +List-Unsubscribe: <https://lists.ozlabs.org/options/linuxppc-dev>, + <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe> +List-Archive: <http://lists.ozlabs.org/pipermail/linuxppc-dev> +List-Post: <mailto:linuxppc-dev@lists.ozlabs.org> +List-Help: <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help> +List-Subscribe: <https://lists.ozlabs.org/listinfo/linuxppc-dev>, + <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe> +Sender: linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane.org@lists.ozlabs.org +Errors-To: linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane.org@lists.ozlabs.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1018016> + +Yang Li pointed to these patches in his post from July 23, 2010. +It would be nice to have these patches in mainline code. + +> -----Original Message----- +> From: timur.tabi@gmail.com [mailto:timur.tabi@gmail.com] On Behalf Of +Timur Tabi +> Sent: Tuesday, August 03, 2010 9:02 AM +> To: Bounine, Alexandre +> Cc: Michael Neuling; Alexandre Bounine; linuxppc-dev@lists.ozlabs.org; +linux-kernel@vger.kernel.org; +> thomas.moll@sysgo.com; Kumar Gala +> Subject: Re: [PATCH v2 5/7] powerpc/85xx: Add MChk handler for SRIO +port +> +> On Tue, Aug 3, 2010 at 7:17 AM, Bounine, Alexandre +> <Alexandre.Bounine@idt.com> wrote: +> > This happened after change to book-e definitions. +> > There are patches that address this issue. +> +> And those patches should have been applied before 2.6.35 was released. +> Someone dropped the ball. 2.6.35 is broken for a number of PowerPC +> boards: +> +> $ make mpc85xx_defconfig +> .... +> $ make +> .... +> CC arch/powerpc/sysdev/fsl_rio.o +> arch/powerpc/sysdev/fsl_rio.c: In function 'fsl_rio_mcheck_exception': +> arch/powerpc/sysdev/fsl_rio.c:248: error: 'MCSR_MASK' undeclared +> (first use in this function) +> arch/powerpc/sysdev/fsl_rio.c:248: error: (Each undeclared identifier +> is reported only once +> arch/powerpc/sysdev/fsl_rio.c:248: error: for each function it appears +in.) +> make[1]: *** [arch/powerpc/sysdev/fsl_rio.o] Error 1 +> +> -- +> Timur Tabi +> Linux kernel developer at Freescale + + diff --git a/test/corpora/lkml/cur/1382298775.003976:2, b/test/corpora/lkml/cur/1382298775.003976:2, new file mode 100644 index 00000000..a6ff6296 --- /dev/null +++ b/test/corpora/lkml/cur/1382298775.003976:2, @@ -0,0 +1,96 @@ +From: Michael Neuling <mikey@neuling.org> +Subject: Re: [PATCH v2 5/7] powerpc/85xx: Add MChk handler for SRIO port +Date: Thu, 05 Aug 2010 13:34:20 +1000 +Lines: 50 +Message-ID: <26581.1280979260@neuling.org> +References: <20100308191005.GE4324@amak.tundra.com> <AANLkTine3pc2Ai2Woj81Y9fS_KgGs1sIMb2NMR6G74ww@mail.gmail.com> <AANLkTinKbimKyLpvFD7KOvavshu_n8gRcp2BvEJj0XZQ@mail.gmail.com> <4381.1280815590@neuling.org> <0CE8B6BE3C4AD74AB97D9D29BD24E5520114309D@CORPEXCH1.na.ads.idt.com> <AANLkTinpwYnyc1oN1VbtBgUF6bk6E5q_Gq1Dj3WXV3wc@mail.gmail.com> <0CE8B6BE3C4AD74AB97D9D29BD24E552011430BC@CORPEXCH1.na.ads.idt.com> +Cc: "Timur Tabi" <timur@freescale.com>, + "Alexandre Bounine" <abounine@tundra.com>, + linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, + thomas.moll@sysgo.com, "Kumar Gala" <galak@kernel.crashing.org> +To: "Bounine, Alexandre" <Alexandre.Bounine@idt.com> +X-From: linux-kernel-owner@vger.kernel.org Thu Aug 05 05:34:37 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1OgrE1-00024O-Bh + for glk-linux-kernel-3@lo.gmane.org; Thu, 05 Aug 2010 05:34:33 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1758775Ab0HEDeX (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Wed, 4 Aug 2010 23:34:23 -0400 +Received: from ozlabs.org ([203.10.76.45]:40810 "EHLO ozlabs.org" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1758704Ab0HEDeV (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Wed, 4 Aug 2010 23:34:21 -0400 +Received: from localhost.localdomain (localhost [127.0.0.1]) + by ozlabs.org (Postfix) with ESMTP id 97995B70D8; + Thu, 5 Aug 2010 13:34:20 +1000 (EST) +Received: by localhost.localdomain (Postfix, from userid 1000) + id 456CDCC199; Thu, 5 Aug 2010 13:34:20 +1000 (EST) +Received: from neuling.org (localhost [127.0.0.1]) + by localhost.localdomain (Postfix) with ESMTP id 404C8C6123; + Thu, 5 Aug 2010 13:34:20 +1000 (EST) +In-reply-to: <0CE8B6BE3C4AD74AB97D9D29BD24E552011430BC@CORPEXCH1.na.ads.idt.com> +Comments: In-reply-to "Bounine, Alexandre" <Alexandre.Bounine@idt.com> + message dated "Tue, 03 Aug 2010 06:24:47 -0700." +X-Mailer: MH-E 8.2; nmh 1.3; GNU Emacs 23.1.1 +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1019004> + + + +In message <0CE8B6BE3C4AD74AB97D9D29BD24E552011430BC@CORPEXCH1.na.ads.idt.com> you wrote: +> Yang Li pointed to these patches in his post from July 23, 2010. +> It would be nice to have these patches in mainline code.=20 + +This is still broken in Kumar's latest tree. Do you guys wanna repost +them so Kumar can pick them up easily? + +Mikey + +> +> > -----Original Message----- +> > From: timur.tabi@gmail.com [mailto:timur.tabi@gmail.com] On Behalf Of +> Timur Tabi +> > Sent: Tuesday, August 03, 2010 9:02 AM +> > To: Bounine, Alexandre +> > Cc: Michael Neuling; Alexandre Bounine; linuxppc-dev@lists.ozlabs.org; +> linux-kernel@vger.kernel.org; +> > thomas.moll@sysgo.com; Kumar Gala +> > Subject: Re: [PATCH v2 5/7] powerpc/85xx: Add MChk handler for SRIO +> port +> >=20 +> > On Tue, Aug 3, 2010 at 7:17 AM, Bounine, Alexandre +> > <Alexandre.Bounine@idt.com> wrote: +> > > This happened after change to book-e definitions. +> > > There are patches that address this issue. +> >=20 +> > And those patches should have been applied before 2.6.35 was released. +> > Someone dropped the ball. 2.6.35 is broken for a number of PowerPC +> > boards: +> >=20 +> > $ make mpc85xx_defconfig +> > .... +> > $ make +> > .... +> > CC arch/powerpc/sysdev/fsl_rio.o +> > arch/powerpc/sysdev/fsl_rio.c: In function 'fsl_rio_mcheck_exception': +> > arch/powerpc/sysdev/fsl_rio.c:248: error: 'MCSR_MASK' undeclared +> > (first use in this function) +> > arch/powerpc/sysdev/fsl_rio.c:248: error: (Each undeclared identifier +> > is reported only once +> > arch/powerpc/sysdev/fsl_rio.c:248: error: for each function it appears +> in.) +> > make[1]: *** [arch/powerpc/sysdev/fsl_rio.o] Error 1 +> >=20 +> > -- +> > Timur Tabi +> > Linux kernel developer at Freescale +> + + diff --git a/test/corpora/lkml/cur/1382298775.004354:2, b/test/corpora/lkml/cur/1382298775.004354:2, new file mode 100644 index 00000000..2d69a129 --- /dev/null +++ b/test/corpora/lkml/cur/1382298775.004354:2, @@ -0,0 +1,170 @@ +From: "Bounine, Alexandre" <Alexandre.Bounine@idt.com> +Subject: RE: [PATCH v2 5/7] powerpc/85xx: Add MChk handler for SRIO port +Date: Thu, 5 Aug 2010 10:25:18 -0700 +Lines: 99 +Message-ID: <0CE8B6BE3C4AD74AB97D9D29BD24E552011935BD@CORPEXCH1.na.ads.idt.com> +References: <20100308191005.GE4324@amak.tundra.com> + <AANLkTine3pc2Ai2Woj81Y9fS_KgGs1sIMb2NMR6G74ww@mail.gmail.com> + <AANLkTinKbimKyLpvFD7KOvavshu_n8gRcp2BvEJj0XZQ@mail.gmail.com> + <4381.1280815590@neuling.org> + <0CE8B6BE3C4AD74AB97D9D29BD24E5520114309D@CORPEXCH1.na.ads.idt.com> + <AANLkTinpwYnyc1oN1VbtBgUF6bk6E5q_Gq1Dj3WXV3wc@mail.gmail.com> + <0CE8B6BE3C4AD74AB97D9D29BD24E552011430BC@CORPEXCH1.na.ads.idt.com> + <26581.1280979260@neuling.org> +Mime-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Cc: Li Yang-R58472 <r58472@freescale.com>, linux-kernel@vger.kernel.org, + Alexandre Bounine <abounine@tundra.com>, thomas.moll@sysgo.com, + linuxppc-dev@lists.ozlabs.org, Timur Tabi <timur@freescale.com> +To: "Michael Neuling" <mikey@neuling.org> +X-From: linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane.org@lists.ozlabs.org Thu Aug 05 19:25:54 2010 +Return-path: <linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane.org@lists.ozlabs.org> +Envelope-to: glppe-linuxppc-embedded-2@m.gmane.org +Received: from ozlabs.org ([203.10.76.45]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane.org@lists.ozlabs.org>) + id 1Oh4CX-0002Xd-Hu + for glppe-linuxppc-embedded-2@m.gmane.org; Thu, 05 Aug 2010 19:25:54 +0200 +Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) + by ozlabs.org (Postfix) with ESMTP id ED044100873 + for <glppe-linuxppc-embedded-2@m.gmane.org>; Fri, 6 Aug 2010 03:25:45 +1000 (EST) +Received: from mxout1.idt.com (mxout1.idt.com [157.165.5.25]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (Client CN "mxout1.idt.com", Issuer "idt.com" (not verified)) + by ozlabs.org (Postfix) with ESMTPS id 43F72B6EEA + for <linuxppc-dev@lists.ozlabs.org>; + Fri, 6 Aug 2010 03:25:34 +1000 (EST) +Received: from mail.idt.com (localhost [127.0.0.1]) + by mxout1.idt.com (8.13.1/8.13.1) with ESMTP id o75HPQdX013269; + Thu, 5 Aug 2010 10:25:26 -0700 +Received: from corpml1.corp.idt.com (corpml1.corp.idt.com [157.165.140.20]) + by mail.idt.com (8.13.8/8.13.8) with ESMTP id o75HPMOi016437; + Thu, 5 Aug 2010 10:25:23 -0700 (PDT) +Received: from CORPEXCH1.na.ads.idt.com (localhost [127.0.0.1]) + by corpml1.corp.idt.com (8.11.7p1+Sun/8.11.7) with ESMTP id + o75HPKp19185; Thu, 5 Aug 2010 10:25:21 -0700 (PDT) +X-MimeOLE: Produced By Microsoft Exchange V6.5 +Content-class: urn:content-classes:message +In-Reply-To: <26581.1280979260@neuling.org> +X-MS-Has-Attach: +X-MS-TNEF-Correlator: +Thread-Topic: [PATCH v2 5/7] powerpc/85xx: Add MChk handler for SRIO port +Thread-Index: Acs0TsVj0+lZKwxtSsOT8qDn1XxpJAAdBmhA +X-Scanned-By: MIMEDefang 2.43 +X-BeenThere: linuxppc-dev@lists.ozlabs.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: Linux on PowerPC Developers Mail List <linuxppc-dev.lists.ozlabs.org> +List-Unsubscribe: <https://lists.ozlabs.org/options/linuxppc-dev>, + <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe> +List-Archive: <http://lists.ozlabs.org/pipermail/linuxppc-dev> +List-Post: <mailto:linuxppc-dev@lists.ozlabs.org> +List-Help: <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help> +List-Subscribe: <https://lists.ozlabs.org/listinfo/linuxppc-dev>, + <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe> +Sender: linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane.org@lists.ozlabs.org +Errors-To: linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane.org@lists.ozlabs.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1019383> + +Below is a copy of Leo's message with pointers to the patches. + +Alex. + +>Subject: [PATCH] RapidIO,powerpc/85xx: remove MCSR_MASK in fsl_rio +> +>Fixes compile problem caused by MCSR_MASK removal from book-E +definitions. + +Hi Alex, + +Only with your patch, there will still be problem on SRIO platforms +other than MPC85xx. + +I have posted a patch series to fix this together with several +compatibility issues a month before. + +http://patchwork.ozlabs.org/patch/56135/ +http://patchwork.ozlabs.org/patch/56136/ +http://patchwork.ozlabs.org/patch/56138/ +http://patchwork.ozlabs.org/patch/56137/ + + +Can anyone pick the patch series quickly as currently there is a compile +error when SRIO is enabled. + +- Leo + + +> -----Original Message----- +> From: Michael Neuling [mailto:mikey@neuling.org] +> Sent: Wednesday, August 04, 2010 11:34 PM +> To: Bounine, Alexandre +> Cc: Timur Tabi; Alexandre Bounine; linuxppc-dev@lists.ozlabs.org; +linux-kernel@vger.kernel.org; +> thomas.moll@sysgo.com; Kumar Gala +> Subject: Re: [PATCH v2 5/7] powerpc/85xx: Add MChk handler for SRIO +port +> +> +> +> In message +<0CE8B6BE3C4AD74AB97D9D29BD24E552011430BC@CORPEXCH1.na.ads.idt.com> you +wrote: +> > Yang Li pointed to these patches in his post from July 23, 2010. +> > It would be nice to have these patches in mainline code.=20 +> +> This is still broken in Kumar's latest tree. Do you guys wanna repost +> them so Kumar can pick them up easily? +> +> Mikey +> +> > +> > > -----Original Message----- +> > > From: timur.tabi@gmail.com [mailto:timur.tabi@gmail.com] On Behalf +Of +> > Timur Tabi +> > > Sent: Tuesday, August 03, 2010 9:02 AM +> > > To: Bounine, Alexandre +> > > Cc: Michael Neuling; Alexandre Bounine; +linuxppc-dev@lists.ozlabs.org; +> > linux-kernel@vger.kernel.org; +> > > thomas.moll@sysgo.com; Kumar Gala +> > > Subject: Re: [PATCH v2 5/7] powerpc/85xx: Add MChk handler for +SRIO +> > port +> > >=20 +> > > On Tue, Aug 3, 2010 at 7:17 AM, Bounine, Alexandre +> > > <Alexandre.Bounine@idt.com> wrote: +> > > > This happened after change to book-e definitions. +> > > > There are patches that address this issue. +> > >=20 +> > > And those patches should have been applied before 2.6.35 was +released. +> > > Someone dropped the ball. 2.6.35 is broken for a number of +PowerPC +> > > boards: +> > >=20 +> > > $ make mpc85xx_defconfig +> > > .... +> > > $ make +> > > .... +> > > CC arch/powerpc/sysdev/fsl_rio.o +> > > arch/powerpc/sysdev/fsl_rio.c: In function +'fsl_rio_mcheck_exception': +> > > arch/powerpc/sysdev/fsl_rio.c:248: error: 'MCSR_MASK' undeclared +> > > (first use in this function) +> > > arch/powerpc/sysdev/fsl_rio.c:248: error: (Each undeclared +identifier +> > > is reported only once +> > > arch/powerpc/sysdev/fsl_rio.c:248: error: for each function it +appears +> > in.) +> > > make[1]: *** [arch/powerpc/sysdev/fsl_rio.o] Error 1 +> > >=20 +> > > -- +> > > Timur Tabi +> > > Linux kernel developer at Freescale +> > + + diff --git a/test/corpora/lkml/cur/1382298775.004363:2, b/test/corpora/lkml/cur/1382298775.004363:2, new file mode 100644 index 00000000..f4198fb4 --- /dev/null +++ b/test/corpora/lkml/cur/1382298775.004363:2, @@ -0,0 +1,95 @@ +From: Kumar Gala <galak@kernel.crashing.org> +Subject: Re: [PATCH v2 5/7] powerpc/85xx: Add MChk handler for SRIO port +Date: Thu, 5 Aug 2010 12:53:03 -0500 +Lines: 34 +Message-ID: <C9528078-D64C-4944-B960-0E985B3EE0BA@kernel.crashing.org> +References: <20100308191005.GE4324@amak.tundra.com> + <AANLkTine3pc2Ai2Woj81Y9fS_KgGs1sIMb2NMR6G74ww@mail.gmail.com> + <AANLkTinKbimKyLpvFD7KOvavshu_n8gRcp2BvEJj0XZQ@mail.gmail.com> + <4381.1280815590@neuling.org> + <0CE8B6BE3C4AD74AB97D9D29BD24E5520114309D@CORPEXCH1.na.ads.idt.com> + <AANLkTinpwYnyc1oN1VbtBgUF6bk6E5q_Gq1Dj3WXV3wc@mail.gmail.com> + <0CE8B6BE3C4AD74AB97D9D29BD24E552011430BC@CORPEXCH1.na.ads.idt.com> + <26581.1280979260@neuling.org> + <0CE8B6BE3C4AD74AB97D9D29BD24E552011935BD@CORPEXCH1.na.ads.idt.com> +Mime-Version: 1.0 (Apple Message framework v1081) +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Cc: Michael Neuling <mikey@neuling.org>, Li Yang-R58472 <r58472@freescale.com>, + linux-kernel@vger.kernel.org, + Alexandre Bounine <abounine@tundra.com>, thomas.moll@sysgo.com, + linuxppc-dev@lists.ozlabs.org, Timur Tabi <timur@freescale.com> +To: "Bounine, Alexandre" <Alexandre.Bounine@IDT.COM> +X-From: linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane.org@lists.ozlabs.org Thu Aug 05 19:53:49 2010 +Return-path: <linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane.org@lists.ozlabs.org> +Envelope-to: glppe-linuxppc-embedded-2@m.gmane.org +Received: from ozlabs.org ([203.10.76.45]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane.org@lists.ozlabs.org>) + id 1Oh4dY-0000mU-OI + for glppe-linuxppc-embedded-2@m.gmane.org; Thu, 05 Aug 2010 19:53:49 +0200 +Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) + by ozlabs.org (Postfix) with ESMTP id C0974B71BD + for <glppe-linuxppc-embedded-2@m.gmane.org>; Fri, 6 Aug 2010 03:53:41 +1000 (EST) +Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (Client did not present a certificate) + by ozlabs.org (Postfix) with ESMTPS id 707ADB6EF1 + for <linuxppc-dev@lists.ozlabs.org>; + Fri, 6 Aug 2010 03:53:31 +1000 (EST) +Received: from [IPv6:::1] (localhost.localdomain [127.0.0.1]) + by gate.crashing.org (8.14.1/8.13.8) with ESMTP id o75Hr4pE020296; + Thu, 5 Aug 2010 12:53:05 -0500 +In-Reply-To: <0CE8B6BE3C4AD74AB97D9D29BD24E552011935BD@CORPEXCH1.na.ads.idt.com> +X-Mailer: Apple Mail (2.1081) +X-BeenThere: linuxppc-dev@lists.ozlabs.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: Linux on PowerPC Developers Mail List <linuxppc-dev.lists.ozlabs.org> +List-Unsubscribe: <https://lists.ozlabs.org/options/linuxppc-dev>, + <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe> +List-Archive: <http://lists.ozlabs.org/pipermail/linuxppc-dev> +List-Post: <mailto:linuxppc-dev@lists.ozlabs.org> +List-Help: <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help> +List-Subscribe: <https://lists.ozlabs.org/listinfo/linuxppc-dev>, + <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe> +Sender: linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane.org@lists.ozlabs.org +Errors-To: linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane.org@lists.ozlabs.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1019393> + + +On Aug 5, 2010, at 12:25 PM, Bounine, Alexandre wrote: + +> Below is a copy of Leo's message with pointers to the patches. +> +> Alex. +> +>> Subject: [PATCH] RapidIO,powerpc/85xx: remove MCSR_MASK in fsl_rio +>> +>> Fixes compile problem caused by MCSR_MASK removal from book-E +> definitions. +> +> Hi Alex, +> +> Only with your patch, there will still be problem on SRIO platforms +> other than MPC85xx. +> +> I have posted a patch series to fix this together with several +> compatibility issues a month before. +> +> http://patchwork.ozlabs.org/patch/56135/ +> http://patchwork.ozlabs.org/patch/56136/ +> http://patchwork.ozlabs.org/patch/56138/ +> http://patchwork.ozlabs.org/patch/56137/ +> +> +> Can anyone pick the patch series quickly as currently there is a compile +> error when SRIO is enabled. +> +> - Leo + +I'm looking at this now and wondering what we added the mcheck handler for in the first place and what its trying to accomplish. + +- k + + diff --git a/test/corpora/lkml/cur/1382298775.004374:2, b/test/corpora/lkml/cur/1382298775.004374:2, new file mode 100644 index 00000000..48558ad6 --- /dev/null +++ b/test/corpora/lkml/cur/1382298775.004374:2, @@ -0,0 +1,75 @@ +From: "Bounine, Alexandre" <Alexandre.Bounine@idt.com> +Subject: RE: [PATCH v2 5/7] powerpc/85xx: Add MChk handler for SRIO port +Date: Thu, 5 Aug 2010 11:17:58 -0700 +Lines: 18 +Message-ID: <0CE8B6BE3C4AD74AB97D9D29BD24E55201193609@CORPEXCH1.na.ads.idt.com> +References: <20100308191005.GE4324@amak.tundra.com> <AANLkTine3pc2Ai2Woj81Y9fS_KgGs1sIMb2NMR6G74ww@mail.gmail.com> <AANLkTinKbimKyLpvFD7KOvavshu_n8gRcp2BvEJj0XZQ@mail.gmail.com> <4381.1280815590@neuling.org> <0CE8B6BE3C4AD74AB97D9D29BD24E5520114309D@CORPEXCH1.na.ads.idt.com> <AANLkTinpwYnyc1oN1VbtBgUF6bk6E5q_Gq1Dj3WXV3wc@mail.gmail.com> <0CE8B6BE3C4AD74AB97D9D29BD24E552011430BC@CORPEXCH1.na.ads.idt.com> <26581.1280979260@neuling.org> <0CE8B6BE3C4AD74AB97D9D29BD24E552011935BD@CORPEXCH1.na.ads.idt.com> <C9528078-D64C-4944-B960-0E985B3EE0BA@kernel.crashing.org> +Mime-Version: 1.0 +Content-Type: text/plain; + charset="us-ascii" +Content-Transfer-Encoding: 8BIT +Cc: "Michael Neuling" <mikey@neuling.org>, + "Timur Tabi" <timur@freescale.com>, + "Alexandre Bounine" <abounine@tundra.com>, + <linuxppc-dev@lists.ozlabs.org>, <linux-kernel@vger.kernel.org>, + <thomas.moll@sysgo.com>, "Li Yang-R58472" <r58472@freescale.com> +To: "Kumar Gala" <galak@kernel.crashing.org> +X-From: linux-kernel-owner@vger.kernel.org Thu Aug 05 20:18:33 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1Oh51V-00075S-1W + for glk-linux-kernel-3@lo.gmane.org; Thu, 05 Aug 2010 20:18:33 +0200 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S934019Ab0HESSU (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Thu, 5 Aug 2010 14:18:20 -0400 +Received: from mxout1.idt.com ([157.165.5.25]:47318 "EHLO mxout1.idt.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S933252Ab0HESSS convert rfc822-to-8bit (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Thu, 5 Aug 2010 14:18:18 -0400 +Received: from mail.idt.com (localhost [127.0.0.1]) + by mxout1.idt.com (8.13.1/8.13.1) with ESMTP id o75II315017058; + Thu, 5 Aug 2010 11:18:03 -0700 +Received: from corpml1.corp.idt.com (corpml1.corp.idt.com [157.165.140.20]) + by mail.idt.com (8.13.8/8.13.8) with ESMTP id o75II1Ek021771; + Thu, 5 Aug 2010 11:18:01 -0700 (PDT) +Received: from CORPEXCH1.na.ads.idt.com (localhost [127.0.0.1]) + by corpml1.corp.idt.com (8.11.7p1+Sun/8.11.7) with ESMTP id o75II0M19896; + Thu, 5 Aug 2010 11:18:00 -0700 (PDT) +X-MimeOLE: Produced By Microsoft Exchange V6.5 +Content-class: urn:content-classes:message +In-Reply-To: <C9528078-D64C-4944-B960-0E985B3EE0BA@kernel.crashing.org> +X-MS-Has-Attach: +X-MS-TNEF-Correlator: +Thread-Topic: [PATCH v2 5/7] powerpc/85xx: Add MChk handler for SRIO port +Thread-Index: Acs0x5rSJ4s7P9ssRjKYVWxFQe3GMgAARQEw +X-Scanned-By: MIMEDefang 2.43 +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1019404> + +> I'm looking at this now and wondering what we added the mcheck handler +for in the first place and what +> its trying to accomplish. +> +> - k + +This protects system from hanging if RIO link fails or enters error +state. In some situations following maintenance read may initiate link +recovery from error state. + +As it is now, MCheck mostly prevents system from hanging, but it also +adds sense to return status of maintenance read routine. I am using +return status in my new set of patches to check if RIO link is valid +during error recovery. + +Alex. + + + + diff --git a/test/corpora/lkml/cur/1382298793.002253:2, b/test/corpora/lkml/cur/1382298793.002253:2, new file mode 100644 index 00000000..cbd67e82 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002253:2, @@ -0,0 +1,208 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 00/44] remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:19 -0800 +Lines: 158 +Message-ID: <cover.1289789604.git.joe@perches.com> +Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, + linux-tegra@vger.kernel.org, microblaze-uclinux@itee.uq.edu.au, + user-mode-linux-devel@lists.sourceforge.net, + user-mode-linux-user@lists.sourceforge.net, + cpufreq@vger.kernel.org, linux-i2c@vger.kernel.org, + netdev@vger.kernel.org, linux-media@vger.kernel.org, + linux-mmc@vger.kernel.org, e1000-devel@lists.sourceforge.net, + linux-wireless@vger.kernel.org, ath9k-devel@lists.ath9k.org, + platform-driver-x86@vger.kernel.org, + ibm-acpi-devel@lists.sourceforge.net, linux-s390@vger.kernel.org, + linux-scsi@vger.kernel.org, + spi-devel-general@lists.sourceforge.net, + devel@driverdev.osuosl.org, linux-usb@vger.kernel.org, + xen-devel@lists.xensource.com, virtualization@lists.osdl.org, + v9fs-developer@lists.sourceforge.net, ceph-devel@vger.kernel.org, + logfs@logfs.org, linux-nfs@vger.kernel.org, + ocfs2-devel@oss.oracle.com, linu +To: Jiri Kosina <trivial@kernel.org> +X-From: cpufreq-owner@vger.kernel.org Mon Nov 15 04:05:30 2010 +Return-path: <cpufreq-owner@vger.kernel.org> +Envelope-to: glkc-cpufreq2@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <cpufreq-owner@vger.kernel.org>) + id 1PHpNp-0000PT-Vh + for glkc-cpufreq2@lo.gmane.org; Mon, 15 Nov 2010 04:05:30 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1754566Ab0KODF2 (ORCPT <rfc822;glkc-cpufreq2@m.gmane.org>); + Sun, 14 Nov 2010 22:05:28 -0500 +Received: from mail.perches.com ([173.55.12.10]:1118 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1751901Ab0KODF1 (ORCPT <rfc822;cpufreq@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:27 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 0D82A24368; + Sun, 14 Nov 2010 19:03:52 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +Sender: cpufreq-owner@vger.kernel.org +Precedence: bulk +List-ID: <cpufreq.vger.kernel.org> +X-Mailing-List: cpufreq@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062272> + +ya trivial series... + +Joe Perches (44): + arch/arm: Remove unnecessary semicolons + arch/microblaze: Remove unnecessary semicolons + arch/um: Remove unnecessary semicolons + drivers/cpufreq: Remove unnecessary semicolons + drivers/gpio: Remove unnecessary semicolons + drivers/i2c: Remove unnecessary semicolons + drivers/isdn: Remove unnecessary semicolons + drivers/leds: Remove unnecessary semicolons + drivers/media/video: Remove unnecessary semicolons + drivers/misc: Remove unnecessary semicolons + drivers/mmc: Remove unnecessary semicolons + drivers/net/bnx2x: Remove unnecessary semicolons + drivers/net/e1000e: Remove unnecessary semicolons + drivers/net/ixgbe: Remove unnecessary semicolons + drivers/net/vxge: Remove unnecessary semicolons + drivers/net/wireless/ath: Remove unnecessary semicolons + drivers/net/wireless/iwlwifi: Remove unnecessary semicolons + drivers/net/cnic.c: Remove unnecessary semicolons + drivers/platform/x86: Remove unnecessary semicolons + drivers/power: Remove unnecessary semicolons + drivers/s390/net: Remove unnecessary semicolons + drivers/scsi/be2iscsi: Remove unnecessary semicolons + drivers/scsi/bfa: Remove unnecessary semicolons + drivers/scsi/lpfc: Remove unnecessary semicolons + drivers/scsi/pm8001: Remove unnecessary semicolons + drivers/scsi/qla2xxx: Remove unnecessary semicolons + drivers/serial: Remove unnecessary semicolons + drivers/spi: Remove unnecessary semicolons + drivers/staging: Remove unnecessary semicolons + drivers/usb/gadget: Remove unnecessary semicolons + drivers/xen: Remove unnecessary semicolons + fs/9p: Remove unnecessary semicolons + fs/ceph: Remove unnecessary semicolons + fs/logfs: Remove unnecessary semicolons + fs/nfs: Remove unnecessary semicolons + fs/ocfs2: Remove unnecessary semicolons + fs/ubifs: Remove unnecessary semicolons + include/linux/if_macvlan.h: Remove unnecessary semicolons + include/net/caif/cfctrl.h: Remove unnecessary semicolons + mm/hugetlb.c: Remove unnecessary semicolons + net/ipv6/mcast.c: Remove unnecessary semicolons + net/sunrpc/addr.c: Remove unnecessary semicolons + sound/core/pcm_lib.c: Remove unnecessary semicolons + sound/soc/codecs: Remove unnecessary semicolons + + arch/arm/mach-at91/at91cap9_devices.c | 2 +- + arch/arm/mach-at91/at91sam9g45_devices.c | 2 +- + arch/arm/mach-at91/at91sam9rl_devices.c | 2 +- + arch/arm/mach-nuc93x/time.c | 2 +- + arch/arm/mach-tegra/tegra2_clocks.c | 2 +- + arch/arm/mach-w90x900/cpu.c | 2 +- + arch/arm/plat-mxc/irq.c | 2 +- + arch/microblaze/lib/memmove.c | 2 +- + arch/um/drivers/mmapper_kern.c | 2 +- + drivers/cpufreq/cpufreq_conservative.c | 2 +- + drivers/gpio/langwell_gpio.c | 2 +- + drivers/i2c/busses/i2c-designware.c | 2 +- + drivers/isdn/hardware/mISDN/mISDNinfineon.c | 4 ++-- + drivers/isdn/hardware/mISDN/mISDNisar.c | 2 +- + drivers/leds/leds-mc13783.c | 2 +- + drivers/media/video/cx88/cx88-blackbird.c | 2 +- + drivers/media/video/davinci/vpfe_capture.c | 2 +- + drivers/media/video/em28xx/em28xx-cards.c | 2 +- + drivers/misc/bmp085.c | 2 +- + drivers/misc/isl29020.c | 2 +- + drivers/mmc/host/davinci_mmc.c | 2 +- + drivers/net/bnx2x/bnx2x_link.c | 4 ++-- + drivers/net/bnx2x/bnx2x_main.c | 2 +- + drivers/net/cnic.c | 2 +- + drivers/net/e1000e/netdev.c | 2 +- + drivers/net/ixgbe/ixgbe_sriov.c | 2 +- + drivers/net/vxge/vxge-main.c | 2 +- + drivers/net/wireless/ath/ath9k/htc.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 2 +- + drivers/platform/x86/classmate-laptop.c | 2 +- + drivers/platform/x86/thinkpad_acpi.c | 2 +- + drivers/power/intel_mid_battery.c | 2 +- + drivers/s390/net/qeth_core_sys.c | 2 +- + drivers/scsi/be2iscsi/be_main.c | 4 ++-- + drivers/scsi/bfa/bfa_fcs_lport.c | 2 +- + drivers/scsi/lpfc/lpfc_bsg.c | 2 +- + drivers/scsi/pm8001/pm8001_init.c | 2 +- + drivers/scsi/qla2xxx/qla_isr.c | 4 ++-- + drivers/scsi/qla2xxx/qla_nx.c | 2 +- + drivers/serial/mrst_max3110.c | 2 +- + drivers/spi/amba-pl022.c | 2 +- + drivers/spi/spi_nuc900.c | 2 +- + .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c | 2 +- + drivers/staging/ath6kl/os/linux/ar6000_drv.c | 2 +- + drivers/staging/bcm/InterfaceInit.c | 2 +- + drivers/staging/bcm/InterfaceIsr.c | 2 +- + drivers/staging/bcm/Misc.c | 4 ++-- + .../comedi/drivers/addi-data/APCI1710_Tor.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci1500.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci1516.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci3501.c | 2 +- + drivers/staging/comedi/drivers/amplc_pci230.c | 2 +- + drivers/staging/comedi/drivers/cb_das16_cs.c | 2 +- + drivers/staging/comedi/drivers/comedi_bond.c | 2 +- + drivers/staging/crystalhd/crystalhd_hw.c | 2 +- + drivers/staging/go7007/go7007-driver.c | 2 +- + drivers/staging/iio/accel/lis3l02dq_ring.c | 2 +- + .../staging/intel_sst/intel_sst_drv_interface.c | 4 ++-- + drivers/staging/keucr/smilmain.c | 4 ++-- + drivers/staging/keucr/smilsub.c | 4 ++-- + drivers/staging/msm/lcdc_toshiba_wvga_pt.c | 2 +- + drivers/staging/rt2860/common/cmm_data_pci.c | 4 ++-- + drivers/staging/rt2860/rt_linux.c | 2 +- + drivers/staging/rt2860/rtmp.h | 2 +- + drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c | 2 +- + drivers/staging/rtl8192e/r819xE_phy.c | 2 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 2 +- + drivers/staging/rtl8192u/r8192U_core.c | 2 +- + drivers/staging/rtl8192u/r819xU_phy.c | 2 +- + drivers/staging/rtl8712/rtl8712_efuse.c | 2 +- + drivers/staging/rtl8712/rtl8712_xmit.c | 2 +- + drivers/staging/rtl8712/rtl871x_xmit.c | 2 +- + drivers/staging/tidspbridge/core/tiomap3430.c | 4 ++-- + drivers/staging/tidspbridge/rmgr/nldr.c | 2 +- + drivers/staging/vt6655/card.c | 2 +- + drivers/staging/vt6655/iwctl.c | 2 +- + drivers/staging/vt6655/wpa2.c | 4 ++-- + drivers/staging/vt6656/baseband.c | 2 +- + drivers/staging/vt6656/iwctl.c | 2 +- + drivers/staging/vt6656/power.c | 2 +- + drivers/staging/vt6656/wpa2.c | 4 ++-- + drivers/usb/gadget/f_fs.c | 2 +- + drivers/xen/swiotlb-xen.c | 2 +- + fs/9p/acl.c | 2 +- + fs/9p/xattr.c | 2 +- + fs/ceph/mds_client.c | 2 +- + fs/logfs/readwrite.c | 2 +- + fs/nfs/getroot.c | 2 +- + fs/ocfs2/refcounttree.c | 2 +- + fs/ubifs/scan.c | 2 +- + include/linux/if_macvlan.h | 2 +- + include/net/caif/cfctrl.h | 2 +- + mm/hugetlb.c | 2 +- + net/ipv6/mcast.c | 2 +- + net/sunrpc/addr.c | 2 +- + sound/core/pcm_lib.c | 2 +- + sound/soc/codecs/wm8904.c | 2 +- + sound/soc/codecs/wm8940.c | 1 - + sound/soc/codecs/wm8993.c | 2 +- + sound/soc/codecs/wm_hubs.c | 2 +- + 100 files changed, 111 insertions(+), 112 deletions(-) + +-- +1.7.3.1.g432b3.dirty + +-- +To unsubscribe from this list: send the line "unsubscribe cpufreq" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + + diff --git a/test/corpora/lkml/cur/1382298793.002254:2, b/test/corpora/lkml/cur/1382298793.002254:2, new file mode 100644 index 00000000..b4959129 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002254:2, @@ -0,0 +1,100 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 13/44] drivers/net/e1000e: Remove unnecessary + semicolons +Date: Sun, 14 Nov 2010 19:04:32 -0800 +Lines: 34 +Message-ID: <e5cf92d50de7924930d660a5865c3d60d9cd9dc5.1289789604.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Cc: e1000-devel@lists.sourceforge.net, Bruce Allan <bruce.w.allan@intel.com>, + Jesse Brandeburg <jesse.brandeburg@intel.com>, + linux-kernel@vger.kernel.org, Greg Rose <gregory.v.rose@intel.com>, + John Ronciak <john.ronciak@intel.com>, + Jeff Kirsher <jeffrey.t.kirsher@intel.com>, netdev@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: e1000-devel-bounces@lists.sourceforge.net Mon Nov 15 04:05:53 2010 +Return-path: <e1000-devel-bounces@lists.sourceforge.net> +Envelope-to: glded-e1000-devel@m.gmane.org +Received: from lists.sourceforge.net ([216.34.181.88]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <e1000-devel-bounces@lists.sourceforge.net>) + id 1PHpOD-0000a9-4r + for glded-e1000-devel@m.gmane.org; Mon, 15 Nov 2010 04:05:53 +0100 +Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com) + by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.69) + (envelope-from <e1000-devel-bounces@lists.sourceforge.net>) + id 1PHpO5-0002a8-SR; Mon, 15 Nov 2010 03:05:45 +0000 +Received: from sog-mx-2.v43.ch3.sourceforge.com ([172.29.43.192] + helo=mx.sourceforge.net) + by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.69) + (envelope-from <joe@perches.com>) id 1PHpO5-0002Zz-D2 + for e1000-devel@lists.sourceforge.net; Mon, 15 Nov 2010 03:05:45 +0000 +X-ACL-Warn: +Received: from mail.perches.com ([173.55.12.10]) + by sog-mx-2.v43.ch3.sourceforge.com with esmtp (Exim 4.69) + id 1PHpO1-0002b4-4y + for e1000-devel@lists.sourceforge.net; Mon, 15 Nov 2010 03:05:45 +0000 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 462EB24376; + Sun, 14 Nov 2010 19:04:03 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +X-Spam-Score: 0.1 (/) +X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. + See http://spamassassin.org/tag/ for more details. + -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay + domain 0.1 AWL AWL: From: address is in the auto white-list +X-Headers-End: 1PHpO1-0002b4-4y +X-BeenThere: e1000-devel@lists.sourceforge.net +X-Mailman-Version: 2.1.9 +Precedence: list +List-Id: "e100/e1000\(e\)/ixgb/igb/ixgbe development and discussion" + <e1000-devel.lists.sourceforge.net> +List-Unsubscribe: <https://lists.sourceforge.net/lists/listinfo/e1000-devel>, + <mailto:e1000-devel-request@lists.sourceforge.net?subject=unsubscribe> +List-Archive: <http://sourceforge.net/mailarchive/forum.php?forum_name=e1000-devel> +List-Post: <mailto:e1000-devel@lists.sourceforge.net> +List-Help: <mailto:e1000-devel-request@lists.sourceforge.net?subject=help> +List-Subscribe: <https://lists.sourceforge.net/lists/listinfo/e1000-devel>, + <mailto:e1000-devel-request@lists.sourceforge.net?subject=subscribe> +Errors-To: e1000-devel-bounces@lists.sourceforge.net +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062273> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + drivers/net/e1000e/netdev.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c +index c4ca162..a6d54e4 100644 +--- a/drivers/net/e1000e/netdev.c ++++ b/drivers/net/e1000e/netdev.c +@@ -4595,7 +4595,7 @@ dma_error: + i += tx_ring->count; + i--; + buffer_info = &tx_ring->buffer_info[i]; +- e1000_put_txbuf(adapter, buffer_info);; ++ e1000_put_txbuf(adapter, buffer_info); + } + + return 0; +-- +1.7.3.1.g432b3.dirty + + +------------------------------------------------------------------------------ +Centralized Desktop Delivery: Dell and VMware Reference Architecture +Simplifying enterprise desktop deployment and management using +Dell EqualLogic storage and VMware View: A highly scalable, end-to-end +client virtualization framework. Read more! +http://p.sf.net/sfu/dell-eql-dev2dev +_______________________________________________ +E1000-devel mailing list +E1000-devel@lists.sourceforge.net +https://lists.sourceforge.net/lists/listinfo/e1000-devel +To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired + + + diff --git a/test/corpora/lkml/cur/1382298793.002255:2, b/test/corpora/lkml/cur/1382298793.002255:2, new file mode 100644 index 00000000..1c158be8 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002255:2, @@ -0,0 +1,100 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 14/44] drivers/net/ixgbe: Remove unnecessary + semicolons +Date: Sun, 14 Nov 2010 19:04:33 -0800 +Lines: 34 +Message-ID: <7d2c334daa75c5221946a17d45c9de1901cf06e7.1289789604.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Cc: e1000-devel@lists.sourceforge.net, Bruce Allan <bruce.w.allan@intel.com>, + Jesse Brandeburg <jesse.brandeburg@intel.com>, + linux-kernel@vger.kernel.org, Greg Rose <gregory.v.rose@intel.com>, + John Ronciak <john.ronciak@intel.com>, + Jeff Kirsher <jeffrey.t.kirsher@intel.com>, netdev@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: e1000-devel-bounces@lists.sourceforge.net Mon Nov 15 04:05:55 2010 +Return-path: <e1000-devel-bounces@lists.sourceforge.net> +Envelope-to: glded-e1000-devel@m.gmane.org +Received: from lists.sourceforge.net ([216.34.181.88]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <e1000-devel-bounces@lists.sourceforge.net>) + id 1PHpOE-0000bY-KU + for glded-e1000-devel@m.gmane.org; Mon, 15 Nov 2010 04:05:54 +0100 +Received: from localhost ([127.0.0.1] helo=sfs-ml-2.v29.ch3.sourceforge.com) + by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.69) + (envelope-from <e1000-devel-bounces@lists.sourceforge.net>) + id 1PHpO6-0004H7-Hr; Mon, 15 Nov 2010 03:05:46 +0000 +Received: from sog-mx-4.v43.ch3.sourceforge.com ([172.29.43.194] + helo=mx.sourceforge.net) + by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.69) + (envelope-from <joe@perches.com>) id 1PHpO6-0004H2-2t + for e1000-devel@lists.sourceforge.net; Mon, 15 Nov 2010 03:05:46 +0000 +X-ACL-Warn: +Received: from mail.perches.com ([173.55.12.10]) + by sog-mx-4.v43.ch3.sourceforge.com with esmtp (Exim 4.69) + id 1PHpO1-0006jE-SS + for e1000-devel@lists.sourceforge.net; Mon, 15 Nov 2010 03:05:46 +0000 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 0D6062436F; + Sun, 14 Nov 2010 19:04:04 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +X-Spam-Score: 0.1 (/) +X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. + See http://spamassassin.org/tag/ for more details. + -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay + domain 0.1 AWL AWL: From: address is in the auto white-list +X-Headers-End: 1PHpO1-0006jE-SS +X-BeenThere: e1000-devel@lists.sourceforge.net +X-Mailman-Version: 2.1.9 +Precedence: list +List-Id: "e100/e1000\(e\)/ixgb/igb/ixgbe development and discussion" + <e1000-devel.lists.sourceforge.net> +List-Unsubscribe: <https://lists.sourceforge.net/lists/listinfo/e1000-devel>, + <mailto:e1000-devel-request@lists.sourceforge.net?subject=unsubscribe> +List-Archive: <http://sourceforge.net/mailarchive/forum.php?forum_name=e1000-devel> +List-Post: <mailto:e1000-devel@lists.sourceforge.net> +List-Help: <mailto:e1000-devel-request@lists.sourceforge.net?subject=help> +List-Subscribe: <https://lists.sourceforge.net/lists/listinfo/e1000-devel>, + <mailto:e1000-devel-request@lists.sourceforge.net?subject=subscribe> +Errors-To: e1000-devel-bounces@lists.sourceforge.net +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062274> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + drivers/net/ixgbe/ixgbe_sriov.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/net/ixgbe/ixgbe_sriov.c b/drivers/net/ixgbe/ixgbe_sriov.c +index 5428153..93f40bc 100644 +--- a/drivers/net/ixgbe/ixgbe_sriov.c ++++ b/drivers/net/ixgbe/ixgbe_sriov.c +@@ -68,7 +68,7 @@ static int ixgbe_set_vf_multicasts(struct ixgbe_adapter *adapter, + * addresses + */ + for (i = 0; i < entries; i++) { +- vfinfo->vf_mc_hashes[i] = hash_list[i];; ++ vfinfo->vf_mc_hashes[i] = hash_list[i]; + } + + for (i = 0; i < vfinfo->num_vf_mc_hashes; i++) { +-- +1.7.3.1.g432b3.dirty + + +------------------------------------------------------------------------------ +Centralized Desktop Delivery: Dell and VMware Reference Architecture +Simplifying enterprise desktop deployment and management using +Dell EqualLogic storage and VMware View: A highly scalable, end-to-end +client virtualization framework. Read more! +http://p.sf.net/sfu/dell-eql-dev2dev +_______________________________________________ +E1000-devel mailing list +E1000-devel@lists.sourceforge.net +https://lists.sourceforge.net/lists/listinfo/e1000-devel +To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired + + + diff --git a/test/corpora/lkml/cur/1382298793.002256:2, b/test/corpora/lkml/cur/1382298793.002256:2, new file mode 100644 index 00000000..8626b813 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002256:2, @@ -0,0 +1,89 @@ +From: Joe Perches <joe@perches.com> +Subject: [uml-user] [PATCH 03/44] arch/um: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:22 -0800 +Lines: 28 +Message-ID: <9ab60a1761dde357ebc028c525dae7572e072588.1289789604.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Cc: Jeff Dike <jdike@addtoit.com>, user-mode-linux-user@lists.sourceforge.net, + user-mode-linux-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: user-mode-linux-user-bounces@lists.sourceforge.net Mon Nov 15 04:06:03 2010 +Return-path: <user-mode-linux-user-bounces@lists.sourceforge.net> +Envelope-to: gluu-user-mode-linux-user-592@gmane.org +Received: from lists.sourceforge.net ([216.34.181.88]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <user-mode-linux-user-bounces@lists.sourceforge.net>) + id 1PHpOM-0000er-Jl + for gluu-user-mode-linux-user-592@gmane.org; Mon, 15 Nov 2010 04:06:02 +0100 +Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com) + by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.69) + (envelope-from <user-mode-linux-user-bounces@lists.sourceforge.net>) + id 1PHpNz-0002ZS-PM; Mon, 15 Nov 2010 03:05:39 +0000 +Received: from sog-mx-2.v43.ch3.sourceforge.com ([172.29.43.192] + helo=mx.sourceforge.net) + by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.69) + (envelope-from <joe@perches.com>) + id 1PHpNy-0002ZA-Q9; Mon, 15 Nov 2010 03:05:38 +0000 +X-ACL-Warn: +Received: from mail.perches.com ([173.55.12.10]) + by sog-mx-2.v43.ch3.sourceforge.com with esmtp (Exim 4.69) + id 1PHpNu-0002aj-Ks; Mon, 15 Nov 2010 03:05:38 +0000 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 845BB2436D; + Sun, 14 Nov 2010 19:03:56 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +X-Spam-Score: 0.1 (/) +X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. + See http://spamassassin.org/tag/ for more details. + -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay + domain 0.1 AWL AWL: From: address is in the auto white-list +X-Headers-End: 1PHpNu-0002aj-Ks +X-BeenThere: user-mode-linux-user@lists.sourceforge.net +X-Mailman-Version: 2.1.9 +Precedence: list +List-Id: The user-mode Linux user list + <user-mode-linux-user.lists.sourceforge.net> +List-Unsubscribe: <https://lists.sourceforge.net/lists/listinfo/user-mode-linux-user>, + <mailto:user-mode-linux-user-request@lists.sourceforge.net?subject=unsubscribe> +List-Archive: <http://sourceforge.net/mailarchive/forum.php?forum_name=user-mode-linux-user> +List-Post: <mailto:user-mode-linux-user@lists.sourceforge.net> +List-Help: <mailto:user-mode-linux-user-request@lists.sourceforge.net?subject=help> +List-Subscribe: <https://lists.sourceforge.net/lists/listinfo/user-mode-linux-user>, + <mailto:user-mode-linux-user-request@lists.sourceforge.net?subject=subscribe> +Errors-To: user-mode-linux-user-bounces@lists.sourceforge.net +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062275> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + arch/um/drivers/mmapper_kern.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/arch/um/drivers/mmapper_kern.c b/arch/um/drivers/mmapper_kern.c +index 8501e7d..6256fa9 100644 +--- a/arch/um/drivers/mmapper_kern.c ++++ b/arch/um/drivers/mmapper_kern.c +@@ -122,7 +122,7 @@ static int __init mmapper_init(void) + if (err) { + printk(KERN_ERR "mmapper - misc_register failed, err = %d\n", + err); +- return err;; ++ return err; + } + return 0; + } +-- +1.7.3.1.g432b3.dirty + + +------------------------------------------------------------------------------ +Centralized Desktop Delivery: Dell and VMware Reference Architecture +Simplifying enterprise desktop deployment and management using +Dell EqualLogic storage and VMware View: A highly scalable, end-to-end +client virtualization framework. Read more! +http://p.sf.net/sfu/dell-eql-dev2dev + + diff --git a/test/corpora/lkml/cur/1382298793.002257:2, b/test/corpora/lkml/cur/1382298793.002257:2, new file mode 100644 index 00000000..849da33e --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002257:2, @@ -0,0 +1,81 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 40/44] mm/hugetlb.c: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:59 -0800 +Lines: 28 +Message-ID: <59705f848d35b12ace640f92afcffea02cee0976.1289789605.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: linux-mm@kvack.org, + linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: owner-linux-mm@kvack.org Mon Nov 15 04:06:05 2010 +Return-path: <owner-linux-mm@kvack.org> +Envelope-to: glkm-linux-mm-2@m.gmane.org +Received: from kanga.kvack.org ([205.233.56.17]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <owner-linux-mm@kvack.org>) + id 1PHpOO-0000gl-5U + for glkm-linux-mm-2@m.gmane.org; Mon, 15 Nov 2010 04:06:04 +0100 +Received: by kanga.kvack.org (Postfix) + id 6220A8D003C; Sun, 14 Nov 2010 22:06:03 -0500 (EST) +Delivered-To: linux-mm-outgoing@kvack.org +Received: by kanga.kvack.org (Postfix, from userid 40) + id 5D2638D0017; Sun, 14 Nov 2010 22:06:03 -0500 (EST) +X-Original-To: int-list-linux-mm@kvack.org +Delivered-To: int-list-linux-mm@kvack.org +Received: by kanga.kvack.org (Postfix, from userid 63042) + id 427128D003C; Sun, 14 Nov 2010 22:06:03 -0500 (EST) +X-Original-To: linux-mm@kvack.org +Delivered-To: linux-mm@kvack.org +Received: from mail203.messagelabs.com (mail203.messagelabs.com [216.82.254.243]) + by kanga.kvack.org (Postfix) with SMTP id C08B98D0017 + for <linux-mm@kvack.org>; Sun, 14 Nov 2010 22:06:02 -0500 (EST) +X-VirusChecked: Checked +X-Env-Sender: joe@perches.com +X-Msg-Ref: server-4.tower-203.messagelabs.com!1289790361!41887937!1 +X-StarScan-Version: 6.2.9; banners=-,-,- +X-Originating-IP: [173.55.12.10] +X-SpamReason: No, hits=0.0 required=7.0 tests= +Received: (qmail 4485 invoked from network); 15 Nov 2010 03:06:01 -0000 +Received: from mail.perches.com (HELO mail.perches.com) (173.55.12.10) + by server-4.tower-203.messagelabs.com with SMTP; 15 Nov 2010 03:06:01 -0000 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id EB70E2436B; + Sun, 14 Nov 2010 19:04:28 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.2 +Sender: owner-linux-mm@kvack.org +Precedence: bulk +X-Loop: owner-majordomo@kvack.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062276> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + mm/hugetlb.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/mm/hugetlb.c b/mm/hugetlb.c +index c4a3558..8875242 100644 +--- a/mm/hugetlb.c ++++ b/mm/hugetlb.c +@@ -540,7 +540,7 @@ static struct page *dequeue_huge_page_vma(struct hstate *h, + + /* If reserves cannot be used, ensure enough pages are in the pool */ + if (avoid_reserve && h->free_huge_pages - h->resv_huge_pages == 0) +- goto err;; ++ goto err; + + for_each_zone_zonelist_nodemask(zone, z, zonelist, + MAX_NR_ZONES - 1, nodemask) { +-- +1.7.3.1.g432b3.dirty + +-- +To unsubscribe, send a message with 'unsubscribe linux-mm' in +the body to majordomo@kvack.org. For more info on Linux MM, +see: http://www.linux-mm.org/ . +Fight unfair telecom policy in Canada: sign http://dissolvethecrtc.ca/ +Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> + + + diff --git a/test/corpora/lkml/cur/1382298793.002258:2, b/test/corpora/lkml/cur/1382298793.002258:2, new file mode 100644 index 00000000..271136b8 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002258:2, @@ -0,0 +1,86 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 31/44] drivers/xen: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:50 -0800 +Lines: 20 +Message-ID: <b3f95cd997859d5d714de322ce17810fe73460cd.1289789605.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: virtualization@lists.osdl.org, + Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>, + xen-devel@lists.xensource.com, linux-kernel@vger.kernel.org, + Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> +To: Jiri Kosina <trivial@kernel.org> +X-From: xen-devel-bounces@lists.xensource.com Mon Nov 15 04:06:05 2010 +Return-path: <xen-devel-bounces@lists.xensource.com> +Envelope-to: gcvxd-xen-devel@m.gmane.org +Received: from lists.colo.xensource.com ([70.42.241.110] helo=lists.xensource.com) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <xen-devel-bounces@lists.xensource.com>) + id 1PHpON-0000fV-A9 + for gcvxd-xen-devel@m.gmane.org; Mon, 15 Nov 2010 04:06:03 +0100 +Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) + by lists.xensource.com with esmtp (Exim 4.43) + id 1PHpOK-0008Sa-VZ; Sun, 14 Nov 2010 19:06:01 -0800 +Received: from spam.xensource.com ([70.42.241.90]) + by lists.xensource.com with esmtp (Exim 4.43) id 1PHpOG-0008R4-01 + for xen-devel@lists.xensource.com; Sun, 14 Nov 2010 19:05:56 -0800 +X-ASG-Debug-ID: 1289790355-0739cd1c0001-8pertM +Received: from mail.perches.com (mail.perches.com [173.55.12.10]) by + spam.xensource.com with ESMTP id XhkGr3VGEwXLx5vl for + <xen-devel@lists.xensource.com>; + Sun, 14 Nov 2010 19:05:55 -0800 (PST) +X-Barracuda-Envelope-From: joe@perches.com +X-Barracuda-Apparent-Source-IP: 173.55.12.10 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 044672436E; + Sun, 14 Nov 2010 19:04:23 -0800 (PST) +X-ASG-Orig-Subj: [PATCH 31/44] drivers/xen: Remove unnecessary semicolons +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +X-Barracuda-Connect: mail.perches.com[173.55.12.10] +X-Barracuda-Start-Time: 1289790355 +X-Barracuda-URL: http://spam.xensource.com:8000/cgi-mod/mark.cgi +X-Virus-Scanned: by bsmtpd at xensource.com +X-Barracuda-Spam-Score: 0.00 +X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=3.5 + QUARANTINE_LEVEL=6.0 KILL_LEVEL=1000.0 tests= +X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.46657 + Rule breakdown below + pts rule name description + ---- ---------------------- + -------------------------------------------------- +X-BeenThere: xen-devel@lists.xensource.com +X-Mailman-Version: 2.1.5 +Precedence: list +List-Id: Xen developer discussion <xen-devel.lists.xensource.com> +List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, + <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe> +List-Post: <mailto:xen-devel@lists.xensource.com> +List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help> +List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, + <mailto:xen-devel-request@lists.xensource.com?subject=subscribe> +Sender: xen-devel-bounces@lists.xensource.com +Errors-To: xen-devel-bounces@lists.xensource.com +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062277> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + drivers/xen/swiotlb-xen.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c +index 54469c3..65ea21a 100644 +--- a/drivers/xen/swiotlb-xen.c ++++ b/drivers/xen/swiotlb-xen.c +@@ -54,7 +54,7 @@ u64 start_dma_addr; + + static dma_addr_t xen_phys_to_bus(phys_addr_t paddr) + { +- return phys_to_machine(XPADDR(paddr)).maddr;; ++ return phys_to_machine(XPADDR(paddr)).maddr; + } + + static phys_addr_t xen_bus_to_phys(dma_addr_t baddr) +-- +1.7.3.1.g432b3.dirty + + diff --git a/test/corpora/lkml/cur/1382298793.002259:2, b/test/corpora/lkml/cur/1382298793.002259:2, new file mode 100644 index 00000000..de8e4275 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002259:2, @@ -0,0 +1,58 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 11/44] drivers/mmc: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:30 -0800 +Lines: 21 +Message-ID: <6391af02ba7ec4a76c5c5f462d8013fc1f52f999.1289789604.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: Chris Ball <cjb@laptop.org>, linux-mmc@vger.kernel.org, + linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 04:06:20 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHpOe-0000ny-CV + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 04:06:20 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S932688Ab0KODFg (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 14 Nov 2010 22:05:36 -0500 +Received: from mail.perches.com ([173.55.12.10]:1153 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932652Ab0KODFe (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:34 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id DD07924374; + Sun, 14 Nov 2010 19:04:01 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062278> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + drivers/mmc/host/davinci_mmc.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c +index e15547c..b643dde 100644 +--- a/drivers/mmc/host/davinci_mmc.c ++++ b/drivers/mmc/host/davinci_mmc.c +@@ -480,7 +480,7 @@ static void mmc_davinci_send_dma_request(struct mmc_davinci_host *host, + struct scatterlist *sg; + unsigned sg_len; + unsigned bytes_left = host->bytes_left; +- const unsigned shift = ffs(rw_threshold) - 1;; ++ const unsigned shift = ffs(rw_threshold) - 1; + + if (host->data_dir == DAVINCI_MMC_DATADIR_WRITE) { + template = &host->tx_template; +-- +1.7.3.1.g432b3.dirty + + + diff --git a/test/corpora/lkml/cur/1382298793.002260:2, b/test/corpora/lkml/cur/1382298793.002260:2, new file mode 100644 index 00000000..2b5145ff --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002260:2, @@ -0,0 +1,57 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 20/44] drivers/power: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:39 -0800 +Lines: 21 +Message-ID: <2f2ed8aa6745be23063fed55243313839d7ba523.1289789605.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 04:06:22 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHpOe-0000ny-TB + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 04:06:21 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S932773Ab0KODFm (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 14 Nov 2010 22:05:42 -0500 +Received: from mail.perches.com ([173.55.12.10]:1185 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932746Ab0KODFk (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:40 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 3664A2436B; + Sun, 14 Nov 2010 19:04:08 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062279> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + drivers/power/intel_mid_battery.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/power/intel_mid_battery.c b/drivers/power/intel_mid_battery.c +index 2a10cd3..8397978 100644 +--- a/drivers/power/intel_mid_battery.c ++++ b/drivers/power/intel_mid_battery.c +@@ -522,7 +522,7 @@ static int pmic_battery_set_charger(struct pmic_power_module_info *pbi, + if (retval) { + dev_warn(pbi->dev, "%s(): ipc pmic read failed\n", + __func__); +- return retval;; ++ return retval; + } + + return 0; +-- +1.7.3.1.g432b3.dirty + + + diff --git a/test/corpora/lkml/cur/1382298793.002261:2, b/test/corpora/lkml/cur/1382298793.002261:2, new file mode 100644 index 00000000..28aac74d --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002261:2, @@ -0,0 +1,58 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 02/44] arch/microblaze: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:21 -0800 +Lines: 21 +Message-ID: <5d57b90b488b4338bcdc3f0fbf5f6996842bd44d.1289789604.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: Michal Simek <monstr@monstr.eu>, microblaze-uclinux@itee.uq.edu.au, + linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 04:06:22 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHpOd-0000ny-SE + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 04:06:20 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S932624Ab0KODFc (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 14 Nov 2010 22:05:32 -0500 +Received: from mail.perches.com ([173.55.12.10]:1127 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1757330Ab0KODF3 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:29 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id EF7FB2436C; + Sun, 14 Nov 2010 19:03:55 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062280> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + arch/microblaze/lib/memmove.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/arch/microblaze/lib/memmove.c b/arch/microblaze/lib/memmove.c +index 123e361..810fd68 100644 +--- a/arch/microblaze/lib/memmove.c ++++ b/arch/microblaze/lib/memmove.c +@@ -182,7 +182,7 @@ void *memmove(void *v_dst, const void *v_src, __kernel_size_t c) + for (; c >= 4; c -= 4) { + value = *--i_src; + *--i_dst = buf_hold | ((value & 0xFF000000)>> 24); +- buf_hold = (value & 0xFFFFFF) << 8;; ++ buf_hold = (value & 0xFFFFFF) << 8; + } + #endif + /* Realign the source */ +-- +1.7.3.1.g432b3.dirty + + + diff --git a/test/corpora/lkml/cur/1382298793.002262:2, b/test/corpora/lkml/cur/1382298793.002262:2, new file mode 100644 index 00000000..b931922c --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002262:2, @@ -0,0 +1,59 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 25/44] drivers/scsi/pm8001: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:44 -0800 +Lines: 21 +Message-ID: <20b352f91642ca45ad730d8eeec0bbd323d26626.1289789605.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: jack_wang@usish.com, lindar_liu@usish.com, + "James E.J. Bottomley" <James.Bottomley@suse.de>, + linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 04:06:22 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHpOf-0000ny-V3 + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 04:06:22 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S932817Ab0KODFp (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 14 Nov 2010 22:05:45 -0500 +Received: from mail.perches.com ([173.55.12.10]:1198 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932690Ab0KODFn (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:43 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 22C0624374; + Sun, 14 Nov 2010 19:04:11 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062281> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + drivers/scsi/pm8001/pm8001_init.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c +index f8c86b2..be210dd 100644 +--- a/drivers/scsi/pm8001/pm8001_init.c ++++ b/drivers/scsi/pm8001/pm8001_init.c +@@ -160,7 +160,7 @@ static void pm8001_free(struct pm8001_hba_info *pm8001_ha) + static void pm8001_tasklet(unsigned long opaque) + { + struct pm8001_hba_info *pm8001_ha; +- pm8001_ha = (struct pm8001_hba_info *)opaque;; ++ pm8001_ha = (struct pm8001_hba_info *)opaque; + if (unlikely(!pm8001_ha)) + BUG_ON(1); + PM8001_CHIP_DISP->isr(pm8001_ha); +-- +1.7.3.1.g432b3.dirty + + + diff --git a/test/corpora/lkml/cur/1382298793.002263:2, b/test/corpora/lkml/cur/1382298793.002263:2, new file mode 100644 index 00000000..4014b080 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002263:2, @@ -0,0 +1,58 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 43/44] sound/core/pcm_lib.c: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:05:02 -0800 +Lines: 21 +Message-ID: <9fa8e193ce125ef4fd19a952792629c5ee84953f.1289789605.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de>, + alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 04:06:24 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHpOg-0000ny-Vl + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 04:06:23 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S933024Ab0KODGF (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 14 Nov 2010 22:06:05 -0500 +Received: from mail.perches.com ([173.55.12.10]:1272 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932998Ab0KODGD (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Sun, 14 Nov 2010 22:06:03 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id E309C24378; + Sun, 14 Nov 2010 19:04:30 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062282> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + sound/core/pcm_lib.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c +index a1707cc..b75db8e 100644 +--- a/sound/core/pcm_lib.c ++++ b/sound/core/pcm_lib.c +@@ -223,7 +223,7 @@ static void xrun_log(struct snd_pcm_substream *substream, + entry->jiffies = jiffies; + entry->pos = pos; + entry->period_size = runtime->period_size; +- entry->buffer_size = runtime->buffer_size;; ++ entry->buffer_size = runtime->buffer_size; + entry->old_hw_ptr = runtime->status->hw_ptr; + entry->hw_ptr_base = runtime->hw_ptr_base; + log->idx = (log->idx + 1) % XRUN_LOG_CNT; +-- +1.7.3.1.g432b3.dirty + + + diff --git a/test/corpora/lkml/cur/1382298793.002264:2, b/test/corpora/lkml/cur/1382298793.002264:2, new file mode 100644 index 00000000..17d8127a --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002264:2, @@ -0,0 +1,103 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 44/44] sound/soc/codecs: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:05:03 -0800 +Lines: 62 +Message-ID: <97fd199b7dac50613f6843156687223928cce44a.1289789605.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>, + Ian Lartey <ian@opensource.wolfsonmicro.com>, + Dimitris Papastamos <dp@opensource.wolfsonmicro.com>, + Liam Girdwood <lrg@slimlogic.co.uk>, + Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de>, + alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 04:06:24 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHpOh-0000ny-G0 + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 04:06:23 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S933041Ab0KODGR (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 14 Nov 2010 22:06:17 -0500 +Received: from mail.perches.com ([173.55.12.10]:1275 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932999Ab0KODGE (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Sun, 14 Nov 2010 22:06:04 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 2AAD92436C; + Sun, 14 Nov 2010 19:04:32 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062283> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + sound/soc/codecs/wm8904.c | 2 +- + sound/soc/codecs/wm8940.c | 1 - + sound/soc/codecs/wm8993.c | 2 +- + sound/soc/codecs/wm_hubs.c | 2 +- + 4 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c +index 33be84e..99ae66d 100644 +--- a/sound/soc/codecs/wm8904.c ++++ b/sound/soc/codecs/wm8904.c +@@ -1590,7 +1590,7 @@ static int wm8904_hw_params(struct snd_pcm_substream *substream, + - wm8904->fs); + for (i = 1; i < ARRAY_SIZE(clk_sys_rates); i++) { + cur_val = abs((wm8904->sysclk_rate / +- clk_sys_rates[i].ratio) - wm8904->fs);; ++ clk_sys_rates[i].ratio) - wm8904->fs); + if (cur_val < best_val) { + best = i; + best_val = cur_val; +diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c +index 2cb16f8..e3f3572 100644 +--- a/sound/soc/codecs/wm8940.c ++++ b/sound/soc/codecs/wm8940.c +@@ -735,7 +735,6 @@ static int wm8940_probe(struct snd_soc_codec *codec) + return ret; + + return ret; +-; + } + + static int wm8940_remove(struct snd_soc_codec *codec) +diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c +index 589e3fa..74af9c5 100644 +--- a/sound/soc/codecs/wm8993.c ++++ b/sound/soc/codecs/wm8993.c +@@ -1225,7 +1225,7 @@ static int wm8993_hw_params(struct snd_pcm_substream *substream, + - wm8993->fs); + for (i = 1; i < ARRAY_SIZE(clk_sys_rates); i++) { + cur_val = abs((wm8993->sysclk_rate / +- clk_sys_rates[i].ratio) - wm8993->fs);; ++ clk_sys_rates[i].ratio) - wm8993->fs); + if (cur_val < best_val) { + best = i; + best_val = cur_val; +diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c +index 19ca782..2afbc7a 100644 +--- a/sound/soc/codecs/wm_hubs.c ++++ b/sound/soc/codecs/wm_hubs.c +@@ -112,7 +112,7 @@ static void calibrate_dc_servo(struct snd_soc_codec *codec) + switch (hubs->dcs_readback_mode) { + case 0: + reg_l = snd_soc_read(codec, WM8993_DC_SERVO_READBACK_1) +- & WM8993_DCS_INTEG_CHAN_0_MASK;; ++ & WM8993_DCS_INTEG_CHAN_0_MASK; + reg_r = snd_soc_read(codec, WM8993_DC_SERVO_READBACK_2) + & WM8993_DCS_INTEG_CHAN_1_MASK; + break; +-- +1.7.3.1.g432b3.dirty + + + diff --git a/test/corpora/lkml/cur/1382298793.002265:2, b/test/corpora/lkml/cur/1382298793.002265:2, new file mode 100644 index 00000000..c4c55c78 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002265:2, @@ -0,0 +1,76 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 19/44] drivers/platform/x86: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:38 -0800 +Lines: 35 +Message-ID: <eda82bcfaad265fc5cd3901bc4f41bfcfac2403b.1289789604.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>, + Daniel Oliveira Nascimento <don@syst.com.br>, + Matthew Garrett <mjg@redhat.com>, + Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>, + platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, + ibm-acpi-devel@lists.sourceforge.net +To: Jiri Kosina <trivial@kernel.org> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 04:06:22 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHpOf-0000ny-DL + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 04:06:21 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S932793Ab0KODFn (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 14 Nov 2010 22:05:43 -0500 +Received: from mail.perches.com ([173.55.12.10]:1183 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932690Ab0KODFk (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:40 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 96EF224372; + Sun, 14 Nov 2010 19:04:07 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062284> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + drivers/platform/x86/classmate-laptop.c | 2 +- + drivers/platform/x86/thinkpad_acpi.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/platform/x86/classmate-laptop.c b/drivers/platform/x86/classmate-laptop.c +index 341cbfe..d2b7720 100644 +--- a/drivers/platform/x86/classmate-laptop.c ++++ b/drivers/platform/x86/classmate-laptop.c +@@ -653,7 +653,7 @@ static void cmpc_keys_handler(struct acpi_device *dev, u32 event) + + if ((event & 0x0F) < ARRAY_SIZE(cmpc_keys_codes)) + code = cmpc_keys_codes[event & 0x0F]; +- inputdev = dev_get_drvdata(&dev->dev);; ++ inputdev = dev_get_drvdata(&dev->dev); + input_report_key(inputdev, code, !(event & 0x10)); + } + +diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c +index 2d61186..3cd7814 100644 +--- a/drivers/platform/x86/thinkpad_acpi.c ++++ b/drivers/platform/x86/thinkpad_acpi.c +@@ -6345,7 +6345,7 @@ static int __init brightness_init(struct ibm_init_struct *iibm) + "as change notification\n"); + tpacpi_hotkey_driver_mask_set(hotkey_driver_mask + | TP_ACPI_HKEY_BRGHTUP_MASK +- | TP_ACPI_HKEY_BRGHTDWN_MASK);; ++ | TP_ACPI_HKEY_BRGHTDWN_MASK); + return 0; + } + +-- +1.7.3.1.g432b3.dirty + + + diff --git a/test/corpora/lkml/cur/1382298793.002266:2, b/test/corpora/lkml/cur/1382298793.002266:2, new file mode 100644 index 00000000..cc365317 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002266:2, @@ -0,0 +1,75 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 28/44] drivers/spi: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:47 -0800 +Lines: 35 +Message-ID: <fe5e5e0efbd97eaa32530eef5ed47efdc3252dad.1289789605.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: David Brownell <dbrownell@users.sourceforge.net>, + Grant Likely <grant.likely@secretlab.ca>, + Wan ZongShun <mcuos.com@gmail.com>, + spi-devel-general@lists.sourceforge.net, + linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org +To: Jiri Kosina <trivial@kernel.org> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 04:06:22 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHpOg-0000ny-FJ + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 04:06:22 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S932836Ab0KODFr (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 14 Nov 2010 22:05:47 -0500 +Received: from mail.perches.com ([173.55.12.10]:1208 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932690Ab0KODFq (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:46 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 454B624375; + Sun, 14 Nov 2010 19:04:13 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062285> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + drivers/spi/amba-pl022.c | 2 +- + drivers/spi/spi_nuc900.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/spi/amba-pl022.c b/drivers/spi/amba-pl022.c +index fb3d1b3..2e50631 100644 +--- a/drivers/spi/amba-pl022.c ++++ b/drivers/spi/amba-pl022.c +@@ -956,7 +956,7 @@ static int configure_dma(struct pl022 *pl022) + tx_conf.dst_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES; + break; + case WRITING_U32: +- tx_conf.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;; ++ tx_conf.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; + break; + } + +diff --git a/drivers/spi/spi_nuc900.c b/drivers/spi/spi_nuc900.c +index dff63be..d5be18b 100644 +--- a/drivers/spi/spi_nuc900.c ++++ b/drivers/spi/spi_nuc900.c +@@ -449,7 +449,7 @@ err_iomap: + release_mem_region(hw->res->start, resource_size(hw->res)); + kfree(hw->ioarea); + err_pdata: +- spi_master_put(hw->master);; ++ spi_master_put(hw->master); + + err_nomem: + return err; +-- +1.7.3.1.g432b3.dirty + + + diff --git a/test/corpora/lkml/cur/1382298793.002267:2, b/test/corpora/lkml/cur/1382298793.002267:2, new file mode 100644 index 00000000..d3acae54 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002267:2, @@ -0,0 +1,773 @@ +From: Joe Perches <joe@perches.com> +Subject: =?UTF-8?q?=5BPATCH=2029/44=5D=20drivers/staging=3A=20Remove=20unnecessary=20semicolons?= +Date: Sun, 14 Nov 2010 19:04:48 -0800 +Lines: 724 +Message-ID: <3246dc176a2c553078e73332f02d802dd8ef7942.1289789605.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Mime-Version: 1.0 +Content-Type: multipart/mixed; boundary="===============1088501263==" +Cc: devel@driverdev.osuosl.org, Greg Kroah-Hartman <gregkh@suse.de>, + linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: devel-bounces@linuxdriverproject.org Mon Nov 15 04:06:51 2010 +Return-path: <devel-bounces@linuxdriverproject.org> +Envelope-to: glddd-devel@m.gmane.org +Received: from driverdev.linuxdriverproject.org ([140.211.166.17]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <devel-bounces@linuxdriverproject.org>) + id 1PHpP7-000137-TU + for glddd-devel@m.gmane.org; Mon, 15 Nov 2010 04:06:50 +0100 +Received: from driverdev.linuxdriverproject.org (localhost [127.0.0.1]) + by driverdev.linuxdriverproject.org (Postfix) with ESMTP id 01FCE460C4; + Sun, 14 Nov 2010 19:05:00 -0800 (PST) +X-Original-To: devel@driverdev.osuosl.org +Delivered-To: devel@driverdev.osuosl.org +Received: from mail.perches.com (mail.perches.com [173.55.12.10]) + by driverdev.linuxdriverproject.org (Postfix) with ESMTP id 8F70A460C6 + for <devel@driverdev.osuosl.org>; Sun, 14 Nov 2010 19:04:05 -0800 (PST) +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id C136B2436B; + Sun, 14 Nov 2010 19:04:21 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +X-BeenThere: devel@linuxdriverproject.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: Linux Driver Project Developer List <devel.linuxdriverproject.org> +List-Unsubscribe: <http://driverdev.linuxdriverproject.org/mailman/options/devel>, + <mailto:devel-request@linuxdriverproject.org?subject=unsubscribe> +List-Archive: <http://driverdev.linuxdriverproject.org/pipermail/devel> +List-Post: <mailto:devel@linuxdriverproject.org> +List-Help: <mailto:devel-request@linuxdriverproject.org?subject=help> +List-Subscribe: <http://driverdev.linuxdriverproject.org/mailman/listinfo/devel>, + <mailto:devel-request@linuxdriverproject.org?subject=subscribe> +Sender: devel-bounces@linuxdriverproject.org +Errors-To: devel-bounces@linuxdriverproject.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062286> + +--===============1088501263== +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: quoted-printable + +Signed-off-by: Joe Perches <joe@perches.com> +--- + .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c | 2 +- + drivers/staging/ath6kl/os/linux/ar6000_drv.c | 2 +- + drivers/staging/bcm/InterfaceInit.c | 2 +- + drivers/staging/bcm/InterfaceIsr.c | 2 +- + drivers/staging/bcm/Misc.c | 4 ++-- + .../comedi/drivers/addi-data/APCI1710_Tor.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci1500.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci1516.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci3501.c | 2 +- + drivers/staging/comedi/drivers/amplc_pci230.c | 2 +- + drivers/staging/comedi/drivers/cb_das16_cs.c | 2 +- + drivers/staging/comedi/drivers/comedi_bond.c | 2 +- + drivers/staging/crystalhd/crystalhd_hw.c | 2 +- + drivers/staging/go7007/go7007-driver.c | 2 +- + drivers/staging/iio/accel/lis3l02dq_ring.c | 2 +- + .../staging/intel_sst/intel_sst_drv_interface.c | 4 ++-- + drivers/staging/keucr/smilmain.c | 4 ++-- + drivers/staging/keucr/smilsub.c | 4 ++-- + drivers/staging/msm/lcdc_toshiba_wvga_pt.c | 2 +- + drivers/staging/rt2860/common/cmm_data_pci.c | 4 ++-- + drivers/staging/rt2860/rt_linux.c | 2 +- + drivers/staging/rt2860/rtmp.h | 2 +- + drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c | 2 +- + drivers/staging/rtl8192e/r819xE_phy.c | 2 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 2 +- + drivers/staging/rtl8192u/r8192U_core.c | 2 +- + drivers/staging/rtl8192u/r819xU_phy.c | 2 +- + drivers/staging/rtl8712/rtl8712_efuse.c | 2 +- + drivers/staging/rtl8712/rtl8712_xmit.c | 2 +- + drivers/staging/rtl8712/rtl871x_xmit.c | 2 +- + drivers/staging/tidspbridge/core/tiomap3430.c | 4 ++-- + drivers/staging/tidspbridge/rmgr/nldr.c | 2 +- + drivers/staging/vt6655/card.c | 2 +- + drivers/staging/vt6655/iwctl.c | 2 +- + drivers/staging/vt6655/wpa2.c | 4 ++-- + drivers/staging/vt6656/baseband.c | 2 +- + drivers/staging/vt6656/iwctl.c | 2 +- + drivers/staging/vt6656/power.c | 2 +- + drivers/staging/vt6656/wpa2.c | 4 ++-- + 39 files changed, 47 insertions(+), 47 deletions(-) + +diff --git a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c b/drive= +rs/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c +index c307a55..3963038 100644 +--- a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c ++++ b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c +@@ -876,7 +876,7 @@ HIFAckInterrupt(HIF_DEVICE *device) + void + HIFUnMaskInterrupt(HIF_DEVICE *device) + { +- int ret;; ++ int ret; +=20 + AR_DEBUG_ASSERT(device !=3D NULL); + AR_DEBUG_ASSERT(device->func !=3D NULL); +diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/stagi= +ng/ath6kl/os/linux/ar6000_drv.c +index a659f70..126a36a 100644 +--- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c ++++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c +@@ -4439,7 +4439,7 @@ skip_key: + for (i =3D assoc_req_ie_pos; i < assoc_req_ie_pos + assocReqLen = +- 4; i++) { + AR_DEBUG_PRINTF(ATH_DEBUG_WLAN_CONNECT,("%2.2x ", assocInfo[= +i])); + sprintf(pos, "%2.2x", assocInfo[i]); +- pos +=3D 2;; ++ pos +=3D 2; + } + AR_DEBUG_PRINTF(ATH_DEBUG_WLAN_CONNECT,("\n")); +=20 +diff --git a/drivers/staging/bcm/InterfaceInit.c b/drivers/staging/bcm/In= +terfaceInit.c +index 824f9a4..a368011 100644 +--- a/drivers/staging/bcm/InterfaceInit.c ++++ b/drivers/staging/bcm/InterfaceInit.c +@@ -265,7 +265,7 @@ usbbcm_device_probe(struct usb_interface *intf, const= + struct usb_device_id *id) + uint32_t uiNackZeroLengthInt=3D4; + if(wrmalt(psAdapter, DISABLE_USB_ZERO_LEN_INT, &uiNackZeroLengthInt, s= +izeof(uiNackZeroLengthInt))) + { +- return -EIO;; ++ return -EIO; + } + } +=20 +diff --git a/drivers/staging/bcm/InterfaceIsr.c b/drivers/staging/bcm/Int= +erfaceIsr.c +index f928fe4..604d07f 100644 +--- a/drivers/staging/bcm/InterfaceIsr.c ++++ b/drivers/staging/bcm/InterfaceIsr.c +@@ -87,7 +87,7 @@ static void read_int_callback(struct urb *urb/*, struct= + pt_regs *regs*/) + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Int= +errupt IN endPoint has got halted/stalled...need to clear this"); + Adapter->bEndPointHalted =3D TRUE ; + wake_up(&Adapter->tx_packet_wait_queue); +- urb->status =3D STATUS_SUCCESS ;; ++ urb->status =3D STATUS_SUCCESS ; + return; + } + /* software-driven interface shutdown */ +diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c +index 22550f7..cd14fec 100644 +--- a/drivers/staging/bcm/Misc.c ++++ b/drivers/staging/bcm/Misc.c +@@ -764,7 +764,7 @@ void SendIdleModeResponse(PMINI_ADAPTER Adapter) +=20 + /* Wake the LED Thread with IDLEMODE_ENTER State */ + Adapter->DriverState =3D LOWPOWER_MODE_ENTER; +- BCM_DEBUG_PRINT(Adapter,DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL,"LED Thread = +is Running..Hence Setting LED Event as IDLEMODE_ENTER jiffies:%ld",jiffie= +s);; ++ BCM_DEBUG_PRINT(Adapter,DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL,"LED Thread = +is Running..Hence Setting LED Event as IDLEMODE_ENTER jiffies:%ld",jiffie= +s); + wake_up(&Adapter->LEDInfo.notify_led_event); +=20 + /* Wait for 1 SEC for LED to OFF */ +@@ -1410,7 +1410,7 @@ int bcm_parse_target_params(PMINI_ADAPTER Adapter) +=20 + void beceem_parse_target_struct(PMINI_ADAPTER Adapter) + { +- UINT uiHostDrvrCfg6 =3D0, uiEEPROMFlag =3D 0;; ++ UINT uiHostDrvrCfg6 =3D0, uiEEPROMFlag =3D 0; +=20 + if(ntohl(Adapter->pstargetparams->m_u32PhyParameter2) & AUTO_SYNC_DISAB= +LE) + { +diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c b/dr= +ivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c +index 7361d50..0e6affd 100644 +--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c ++++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c +@@ -1008,7 +1008,7 @@ int i_APCI1710_InsnWriteEnableDisableTorCounter(str= +uct comedi_device *dev, + b_ExternGate =3D (unsigned char) data[3]; + b_CycleMode =3D (unsigned char) data[4]; + b_InterruptEnable =3D (unsigned char) data[5]; +- i_ReturnValue =3D insn->n;; ++ i_ReturnValue =3D insn->n; + devpriv->tsk_Current =3D current; /* Save the current process task str= +ucture */ + /**************************/ + /* Test the module number */ +diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c b/= +drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c +index 2a8a6c7..62f421a 100644 +--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c ++++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c +@@ -2850,7 +2850,7 @@ static int i_APCI1500_Reset(struct comedi_device *d= +ev) + i_Logic =3D 0; + i_CounterLogic =3D 0; + i_InterruptMask =3D 0; +- i_InputChannel =3D 0;; ++ i_InputChannel =3D 0; + i_TimerCounter1Enabled =3D 0; + i_TimerCounter2Enabled =3D 0; + i_WatchdogCounter3Enabled =3D 0; +diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c b/= +drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c +index 12fcc35..8a584a0 100644 +--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c ++++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c +@@ -335,7 +335,7 @@ int i_APCI1516_WriteDigitalOutput(struct comedi_devic= +e *dev, struct comedi_subde + return -EINVAL; + } /* if else data[3]=3D=3D1) */ + } /* if else data[3]=3D=3D0) */ +- return (insn->n);; ++ return (insn->n); + } +=20 + /* +diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c b/= +drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c +index 356a189..acaceb0 100644 +--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c ++++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c +@@ -339,7 +339,7 @@ int i_APCI3501_ConfigAnalogOutput(struct comedi_devic= +e *dev, struct comedi_subde + int i_APCI3501_WriteAnalogOutput(struct comedi_device *dev, struct comed= +i_subdevice *s, + struct comedi_insn *insn, unsigned int *data) + { +- unsigned int ul_Command1 =3D 0, ul_Channel_no, ul_Polarity, ul_DAC_Read= +y =3D 0;; ++ unsigned int ul_Command1 =3D 0, ul_Channel_no, ul_Polarity, ul_DAC_Read= +y =3D 0; +=20 + ul_Channel_no =3D CR_CHAN(insn->chanspec); +=20 +diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/stag= +ing/comedi/drivers/amplc_pci230.c +index 5d06457..7edeb11 100644 +--- a/drivers/staging/comedi/drivers/amplc_pci230.c ++++ b/drivers/staging/comedi/drivers/amplc_pci230.c +@@ -971,7 +971,7 @@ static int pci230_attach(struct comedi_device *dev, s= +truct comedi_devconfig *it) + if (thisboard->ao_chans > 0) { + s->type =3D COMEDI_SUBD_AO; + s->subdev_flags =3D SDF_WRITABLE | SDF_GROUND; +- s->n_chan =3D thisboard->ao_chans;; ++ s->n_chan =3D thisboard->ao_chans; + s->maxdata =3D (1 << thisboard->ao_bits) - 1; + s->range_table =3D &pci230_ao_range; + s->insn_write =3D &pci230_ao_winsn; +diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/stagi= +ng/comedi/drivers/cb_das16_cs.c +index 0345b4c..bb93685 100644 +--- a/drivers/staging/comedi/drivers/cb_das16_cs.c ++++ b/drivers/staging/comedi/drivers/cb_das16_cs.c +@@ -169,7 +169,7 @@ static int das16cs_attach(struct comedi_device *dev, + if (!link) + return -EIO; +=20 +- dev->iobase =3D link->resource[0]->start;; ++ dev->iobase =3D link->resource[0]->start; + printk("I/O base=3D0x%04lx ", dev->iobase); +=20 + printk("fingerprint:\n"); +diff --git a/drivers/staging/comedi/drivers/comedi_bond.c b/drivers/stagi= +ng/comedi/drivers/comedi_bond.c +index cfcbd9b..d8aefb2 100644 +--- a/drivers/staging/comedi/drivers/comedi_bond.c ++++ b/drivers/staging/comedi/drivers/comedi_bond.c +@@ -370,7 +370,7 @@ static int doDevConfig(struct comedi_device *dev, str= +uct comedi_devconfig *it) + struct comedi_device *devs_opened[COMEDI_NUM_BOARD_MINORS]; +=20 + memset(devs_opened, 0, sizeof(devs_opened)); +- devpriv->name[0] =3D 0;; ++ devpriv->name[0] =3D 0; + /* Loop through all comedi devices specified on the command-line, + building our device list */ + for (i =3D 0; i < COMEDI_NDEVCONFOPTS && (!i || it->options[i]); ++i) { +diff --git a/drivers/staging/crystalhd/crystalhd_hw.c b/drivers/staging/c= +rystalhd/crystalhd_hw.c +index f631857..153ddbf 100644 +--- a/drivers/staging/crystalhd/crystalhd_hw.c ++++ b/drivers/staging/crystalhd/crystalhd_hw.c +@@ -1711,7 +1711,7 @@ enum BC_STATUS crystalhd_download_fw(struct crystal= +hd_adp *adp, void *buffer, ui + } +=20 + BCMLOG(BCMLOG_INFO, "Firmware Downloaded Successfully\n"); +- return BC_STS_SUCCESS;; ++ return BC_STS_SUCCESS; + } +=20 + enum BC_STATUS crystalhd_do_fw_cmd(struct crystalhd_hw *hw, +diff --git a/drivers/staging/go7007/go7007-driver.c b/drivers/staging/go7= +007/go7007-driver.c +index b3f42f3..8426a02 100644 +--- a/drivers/staging/go7007/go7007-driver.c ++++ b/drivers/staging/go7007/go7007-driver.c +@@ -624,7 +624,7 @@ struct go7007 *go7007_alloc(struct go7007_board_info = +*board, struct device *dev) + go->dvd_mode =3D 0; + go->interlace_coding =3D 0; + for (i =3D 0; i < 4; ++i) +- go->modet[i].enable =3D 0;; ++ go->modet[i].enable =3D 0; + for (i =3D 0; i < 1624; ++i) + go->modet_map[i] =3D 0; + go->audio_deliver =3D NULL; +diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging= +/iio/accel/lis3l02dq_ring.c +index 330d5d6..1fd088a 100644 +--- a/drivers/staging/iio/accel/lis3l02dq_ring.c ++++ b/drivers/staging/iio/accel/lis3l02dq_ring.c +@@ -517,7 +517,7 @@ int lis3l02dq_configure_ring(struct iio_dev *indio_de= +v) +=20 + ret =3D iio_alloc_pollfunc(indio_dev, NULL, &lis3l02dq_poll_func_th); + if (ret) +- goto error_iio_sw_rb_free;; ++ goto error_iio_sw_rb_free; + indio_dev->modes |=3D INDIO_RING_TRIGGERED; + return 0; +=20 +diff --git a/drivers/staging/intel_sst/intel_sst_drv_interface.c b/driver= +s/staging/intel_sst/intel_sst_drv_interface.c +index 669e298..6443fbd 100644 +--- a/drivers/staging/intel_sst/intel_sst_drv_interface.c ++++ b/drivers/staging/intel_sst/intel_sst_drv_interface.c +@@ -171,9 +171,9 @@ static int sst_get_sfreq(struct snd_sst_params *str_p= +aram) + case SST_CODEC_TYPE_MP3: + return str_param->sparams.uc.mp3_params.sfreq; + case SST_CODEC_TYPE_AAC: +- return str_param->sparams.uc.aac_params.sfreq;; ++ return str_param->sparams.uc.aac_params.sfreq; + case SST_CODEC_TYPE_WMA9: +- return str_param->sparams.uc.wma_params.sfreq;; ++ return str_param->sparams.uc.wma_params.sfreq; + default: + return 0; + } +diff --git a/drivers/staging/keucr/smilmain.c b/drivers/staging/keucr/smi= +lmain.c +index bdfbf76..2cbe9f8 100644 +--- a/drivers/staging/keucr/smilmain.c ++++ b/drivers/staging/keucr/smilmain.c +@@ -153,9 +153,9 @@ int Media_D_ReadSector(struct us_data *us, DWORD star= +t,WORD count,BYTE *buf) + WORD len, bn; +=20 + //if (Check_D_MediaPower()) ; =A6b 6250 don't care +- // return(ErrCode); ; ++ // return(ErrCode); + //if (Check_D_MediaFmt(fdoExt)) ; +- // return(ErrCode); ; ++ // return(ErrCode); + if (Conv_D_MediaAddr(us, start)) + return(ErrCode); +=20 +diff --git a/drivers/staging/keucr/smilsub.c b/drivers/staging/keucr/smil= +sub.c +index 1b52535..ce10cf2 100644 +--- a/drivers/staging/keucr/smilsub.c ++++ b/drivers/staging/keucr/smilsub.c +@@ -763,8 +763,8 @@ int Ssfdc_D_WriteSectForCopy(struct us_data *us, BYTE= + *buf, BYTE *redundant) + bcb->CDB[7] =3D (BYTE)addr; + bcb->CDB[6] =3D (BYTE)(addr/0x0100); + bcb->CDB[5] =3D Media.Zone/2; +- bcb->CDB[8] =3D *(redundant+REDT_ADDR1H);; +- bcb->CDB[9] =3D *(redundant+REDT_ADDR1L);; ++ bcb->CDB[8] =3D *(redundant+REDT_ADDR1H); ++ bcb->CDB[9] =3D *(redundant+REDT_ADDR1L); +=20 + result =3D ENE_SendScsiCmd(us, FDIR_WRITE, buf, 0); + if (result !=3D USB_STOR_XFER_GOOD) +diff --git a/drivers/staging/msm/lcdc_toshiba_wvga_pt.c b/drivers/staging= +/msm/lcdc_toshiba_wvga_pt.c +index 864d7c1..edba78a 100644 +--- a/drivers/staging/msm/lcdc_toshiba_wvga_pt.c ++++ b/drivers/staging/msm/lcdc_toshiba_wvga_pt.c +@@ -77,7 +77,7 @@ static void toshiba_spi_write(char cmd, uint32 data, in= +t num) +=20 + /* followed by parameter bytes */ + if (num) { +- bp =3D (char *)&data;; ++ bp =3D (char *)&data; + bp +=3D (num - 1); + while (num) { + toshiba_spi_write_byte(1, *bp); +diff --git a/drivers/staging/rt2860/common/cmm_data_pci.c b/drivers/stagi= +ng/rt2860/common/cmm_data_pci.c +index 43d73a0..7af59ff 100644 +--- a/drivers/staging/rt2860/common/cmm_data_pci.c ++++ b/drivers/staging/rt2860/common/cmm_data_pci.c +@@ -137,7 +137,7 @@ u16 RtmpPCI_WriteSingleTxResource(struct rt_rtmp_adap= +ter *pAd, +=20 + pTxD->SDPtr0 =3D BufBasePaLow; + pTxD->SDLen0 =3D TXINFO_SIZE + TXWI_SIZE + hwHeaderLen; /* include padd= +ing */ +- pTxD->SDPtr1 =3D PCI_MAP_SINGLE(pAd, pTxBlk, 0, 1, PCI_DMA_TODEVICE);; ++ pTxD->SDPtr1 =3D PCI_MAP_SINGLE(pAd, pTxBlk, 0, 1, PCI_DMA_TODEVICE); + pTxD->SDLen1 =3D pTxBlk->SrcBufLen; + pTxD->LastSec0 =3D 0; + pTxD->LastSec1 =3D (bIsLast) ? 1 : 0; +@@ -215,7 +215,7 @@ u16 RtmpPCI_WriteMultiTxResource(struct rt_rtmp_adapt= +er *pAd, +=20 + pTxD->SDPtr0 =3D BufBasePaLow; + pTxD->SDLen0 =3D firstDMALen; /* include padding */ +- pTxD->SDPtr1 =3D PCI_MAP_SINGLE(pAd, pTxBlk, 0, 1, PCI_DMA_TODEVICE);; ++ pTxD->SDPtr1 =3D PCI_MAP_SINGLE(pAd, pTxBlk, 0, 1, PCI_DMA_TODEVICE); + pTxD->SDLen1 =3D pTxBlk->SrcBufLen; + pTxD->LastSec0 =3D 0; + pTxD->LastSec1 =3D (bIsLast) ? 1 : 0; +diff --git a/drivers/staging/rt2860/rt_linux.c b/drivers/staging/rt2860/r= +t_linux.c +index abfeea1..7dad6ee 100644 +--- a/drivers/staging/rt2860/rt_linux.c ++++ b/drivers/staging/rt2860/rt_linux.c +@@ -854,7 +854,7 @@ void send_monitor_packets(struct rt_rtmp_adapter *pAd= +, struct rt_rx_blk *pRxBlk) + RSSI1, + RSSI_1), + ConvertToRssi(pAd, pRxBlk->pRxWI->RSSI2, +- RSSI_2));; ++ RSSI_2)); +=20 + ph->signal.did =3D DIDmsg_lnxind_wlansniffrm_signal; + ph->signal.status =3D 0; +diff --git a/drivers/staging/rt2860/rtmp.h b/drivers/staging/rt2860/rtmp.= +h +index ca54e53..26cc823 100644 +--- a/drivers/staging/rt2860/rtmp.h ++++ b/drivers/staging/rt2860/rtmp.h +@@ -2978,7 +2978,7 @@ void LinkDown(struct rt_rtmp_adapter *pAd, IN BOOLE= +AN IsReqFromAP); +=20 + void IterateOnBssTab(struct rt_rtmp_adapter *pAd); +=20 +-void IterateOnBssTab2(struct rt_rtmp_adapter *pAd);; ++void IterateOnBssTab2(struct rt_rtmp_adapter *pAd); +=20 + void JoinParmFill(struct rt_rtmp_adapter *pAd, + struct rt_mlme_join_req *JoinReq, unsigned long BssIdx); +diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c b/drivers/= +staging/rtl8192e/ieee80211/ieee80211_tx.c +index dd8a221..b26b5a8 100644 +--- a/drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c ++++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c +@@ -822,7 +822,7 @@ int ieee80211_rtl_xmit(struct sk_buff *skb, struct ne= +t_device *dev) + { + txb->queue_index =3D UP2AC(skb->priority); + } else { +- txb->queue_index =3D WME_AC_BK;; ++ txb->queue_index =3D WME_AC_BK; + } +=20 +=20 +diff --git a/drivers/staging/rtl8192e/r819xE_phy.c b/drivers/staging/rtl8= +192e/r819xE_phy.c +index d83bcbc..50cd0e5 100644 +--- a/drivers/staging/rtl8192e/r819xE_phy.c ++++ b/drivers/staging/rtl8192e/r819xE_phy.c +@@ -2596,7 +2596,7 @@ u8 rtl8192_phy_ConfigRFWithHeaderFile(struct net_de= +vice* dev, RF90_RADIO_PATH_E + break; + } +=20 +- return ret;; ++ return ret; +=20 + } + /***********************************************************************= +******* +diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c b/drivers/= +staging/rtl8192u/ieee80211/ieee80211_tx.c +index 81aa2ed..ec7845e 100644 +--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c ++++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c +@@ -754,7 +754,7 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_de= +vice *dev) + { + txb->queue_index =3D UP2AC(skb->priority); + } else { +- txb->queue_index =3D WME_AC_BK;; ++ txb->queue_index =3D WME_AC_BK; + } +=20 +=20 +diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl= +8192u/r8192U_core.c +index 494f180..1139a27 100644 +--- a/drivers/staging/rtl8192u/r8192U_core.c ++++ b/drivers/staging/rtl8192u/r8192U_core.c +@@ -5085,7 +5085,7 @@ static void rtl8192_query_rxphystatus( + //Get Rx snr value in DB + tmp_rxsnr =3D pofdm_buf->rxsnr_X[i]; + rx_snrX =3D (char)(tmp_rxsnr); +- //rx_snrX >>=3D 1;; ++ //rx_snrX >>=3D 1; + rx_snrX /=3D 2; + priv->stats.rxSNRdB[i] =3D (long)rx_snrX; +=20 +diff --git a/drivers/staging/rtl8192u/r819xU_phy.c b/drivers/staging/rtl8= +192u/r819xU_phy.c +index a3adaed..8e10992 100644 +--- a/drivers/staging/rtl8192u/r819xU_phy.c ++++ b/drivers/staging/rtl8192u/r819xU_phy.c +@@ -1011,7 +1011,7 @@ u8 rtl8192_phy_ConfigRFWithHeaderFile(struct net_de= +vice* dev, RF90_RADIO_PATH_E + break; + } +=20 +- return ret;; ++ return ret; +=20 + } + /***********************************************************************= +******* +diff --git a/drivers/staging/rtl8712/rtl8712_efuse.c b/drivers/staging/rt= +l8712/rtl8712_efuse.c +index 9730ae1..1dc12b7 100644 +--- a/drivers/staging/rtl8712/rtl8712_efuse.c ++++ b/drivers/staging/rtl8712/rtl8712_efuse.c +@@ -428,7 +428,7 @@ u8 r8712_efuse_access(struct _adapter *padapter, u8 b= +Read, u16 start_addr, + u16 cnts, u8 *data) + { + int i; +- u8 res =3D true;; ++ u8 res =3D true; +=20 + if (start_addr > EFUSE_MAX_SIZE) + return false; +diff --git a/drivers/staging/rtl8712/rtl8712_xmit.c b/drivers/staging/rtl= +8712/rtl8712_xmit.c +index 8edc518..88a1504 100644 +--- a/drivers/staging/rtl8712/rtl8712_xmit.c ++++ b/drivers/staging/rtl8712/rtl8712_xmit.c +@@ -148,7 +148,7 @@ static u32 get_ff_hwaddr(struct xmit_frame *pxmitfram= +e) + case 0x11: + case 0x12: + case 0x13: +- addr =3D RTL8712_DMA_H2CCMD;; ++ addr =3D RTL8712_DMA_H2CCMD; + break; + default: + addr =3D RTL8712_DMA_BEQ;/*RTL8712_EP_LO;*/ +diff --git a/drivers/staging/rtl8712/rtl871x_xmit.c b/drivers/staging/rtl= +8712/rtl871x_xmit.c +index b8195e3..75f1a6b 100644 +--- a/drivers/staging/rtl8712/rtl871x_xmit.c ++++ b/drivers/staging/rtl8712/rtl871x_xmit.c +@@ -372,7 +372,7 @@ static sint xmitframe_addmic(struct _adapter *padapte= +r, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0}; + datalen =3D pattrib->pktlen - pattrib->hdrlen; +- pframe =3D pxmitframe->buf_addr + TXDESC_OFFSET;; ++ pframe =3D pxmitframe->buf_addr + TXDESC_OFFSET; + if (bmcst) { + if (!memcmp(psecuritypriv->XGrptxmickey + [psecuritypriv->XGrpKeyid].skey, +diff --git a/drivers/staging/tidspbridge/core/tiomap3430.c b/drivers/stag= +ing/tidspbridge/core/tiomap3430.c +index 1be081f..a3b0a18 100644 +--- a/drivers/staging/tidspbridge/core/tiomap3430.c ++++ b/drivers/staging/tidspbridge/core/tiomap3430.c +@@ -596,7 +596,7 @@ static int bridge_brd_start(struct bridge_dev_context= + *dev_ctxt, + dev_dbg(bridge, "DSP c_int00 Address =3D 0x%x\n", dsp_addr); + if (dsp_debug) + while (__raw_readw(dw_sync_addr)) +- ;; ++ ; +=20 + /* Wait for DSP to clear word in shared memory */ + /* Read the Location */ +@@ -1671,7 +1671,7 @@ static int pte_set(struct pg_table_attrs *pt, u32 p= +a, u32 va, + /* Find a free L2 PT. */ + for (i =3D 0; (i < pt->l2_num_pages) && + (pt->pg_info[i].num_entries !=3D 0); i++) +- ;; ++ ; + if (i < pt->l2_num_pages) { + l2_page_num =3D i; + l2_base_pa =3D pt->l2_base_pa + (l2_page_num * +diff --git a/drivers/staging/tidspbridge/rmgr/nldr.c b/drivers/staging/ti= +dspbridge/rmgr/nldr.c +index a6ae007..28354bb 100644 +--- a/drivers/staging/tidspbridge/rmgr/nldr.c ++++ b/drivers/staging/tidspbridge/rmgr/nldr.c +@@ -943,7 +943,7 @@ static int add_ovly_info(void *handle, struct dbll_se= +ct_info *sect_info, +=20 + /* Determine which phase this section belongs to */ + for (pch =3D sect_name + 1; *pch && *pch !=3D seps; pch++) +- ;; ++ ; +=20 + if (*pch) { + pch++; /* Skip over the ':' */ +diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.= +c +index 32d095c..951a3a8 100644 +--- a/drivers/staging/vt6655/card.c ++++ b/drivers/staging/vt6655/card.c +@@ -2058,7 +2058,7 @@ bool CARDbSoftwareReset (void *pDeviceHandler) + QWORD CARDqGetTSFOffset (unsigned char byRxRate, QWORD qwTSF1, QWORD qwT= +SF2) + { + QWORD qwTSFOffset; +- unsigned short wRxBcnTSFOffst=3D 0;; ++ unsigned short wRxBcnTSFOffst=3D 0; +=20 + HIDWORD(qwTSFOffset) =3D 0; + LODWORD(qwTSFOffset) =3D 0; +diff --git a/drivers/staging/vt6655/iwctl.c b/drivers/staging/vt6655/iwct= +l.c +index 92e3399..5e425d1 100644 +--- a/drivers/staging/vt6655/iwctl.c ++++ b/drivers/staging/vt6655/iwctl.c +@@ -2073,7 +2073,7 @@ int iwctl_giwencodeext(struct net_device *dev, + struct iw_point *wrq, + char *extra) + { +- return -EOPNOTSUPP;; ++ return -EOPNOTSUPP; + } +=20 + int iwctl_siwmlme(struct net_device *dev, +diff --git a/drivers/staging/vt6655/wpa2.c b/drivers/staging/vt6655/wpa2.= +c +index 805164b..744799c 100644 +--- a/drivers/staging/vt6655/wpa2.c ++++ b/drivers/staging/vt6655/wpa2.c +@@ -216,7 +216,7 @@ WPA2vParseRSN ( + m =3D *((unsigned short *) &(pRSN->abyRSN[4])); +=20 + if (pRSN->len >=3D 10+m*4) { // ver(2) + GK(4) + PK count(2) + P= +KS(4*m) + AKMSS count(2) +- pBSSNode->wAKMSSAuthCount =3D *((unsigned short *) &(pRSN->a= +byRSN[6+4*m]));; ++ pBSSNode->wAKMSSAuthCount =3D *((unsigned short *) &(pRSN->a= +byRSN[6+4*m])); + j =3D 0; + pbyOUI =3D &(pRSN->abyRSN[8+4*m]); + for (i =3D 0; (i < pBSSNode->wAKMSSAuthCount) && (j < sizeof= +(pBSSNode->abyAKMSSAuthType)/sizeof(unsigned char)); i++) { +@@ -235,7 +235,7 @@ WPA2vParseRSN ( + pBSSNode->wAKMSSAuthCount =3D (unsigned short)j; + DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wAKMSSAuthCount: %d\n", p= +BSSNode->wAKMSSAuthCount); +=20 +- n =3D *((unsigned short *) &(pRSN->abyRSN[6+4*m]));; ++ n =3D *((unsigned short *) &(pRSN->abyRSN[6+4*m])); + if (pRSN->len >=3D 12+4*m+4*n) { // ver(2)+GK(4)+PKCnt(2)+PK= +S(4*m)+AKMSSCnt(2)+AKMSS(4*n)+Cap(2) + pBSSNode->sRSNCapObj.bRSNCapExist =3D true; + pBSSNode->sRSNCapObj.wRSNCap =3D *((unsigned short *) &(= +pRSN->abyRSN[8+4*m+4*n])); +diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/b= +aseband.c +index e5add20..0d11147 100644 +--- a/drivers/staging/vt6656/baseband.c ++++ b/drivers/staging/vt6656/baseband.c +@@ -963,7 +963,7 @@ BBvSetAntennaMode (PSDevice pDevice, BYTE byAntennaMo= +de) + break; + case ANT_RXB: + pDevice->byBBRxConf &=3D 0xFE; +- pDevice->byBBRxConf |=3D 0x02;; ++ pDevice->byBBRxConf |=3D 0x02; + break; + } +=20 +diff --git a/drivers/staging/vt6656/iwctl.c b/drivers/staging/vt6656/iwct= +l.c +index 0004be8..2121205 100644 +--- a/drivers/staging/vt6656/iwctl.c ++++ b/drivers/staging/vt6656/iwctl.c +@@ -1883,7 +1883,7 @@ int iwctl_giwencodeext(struct net_device *dev, + struct iw_point *wrq, + char *extra) + { +- return -EOPNOTSUPP;; ++ return -EOPNOTSUPP; + } +=20 + int iwctl_siwmlme(struct net_device *dev, +diff --git a/drivers/staging/vt6656/power.c b/drivers/staging/vt6656/powe= +r.c +index 0c12fd3..e8c1b35 100644 +--- a/drivers/staging/vt6656/power.c ++++ b/drivers/staging/vt6656/power.c +@@ -192,7 +192,7 @@ BOOL PSbConsiderPowerDown(void *hDeviceContext, + // check if already in Doze mode + ControlvReadByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PSCTL, &by= +Data); + if ( (byData & PSCTL_PS) !=3D 0 ) +- return TRUE;; ++ return TRUE; +=20 + if (pMgmt->eCurrMode !=3D WMAC_MODE_IBSS_STA) { + // check if in TIM wake period +diff --git a/drivers/staging/vt6656/wpa2.c b/drivers/staging/vt6656/wpa2.= +c +index 6d13190..d4f3f75 100644 +--- a/drivers/staging/vt6656/wpa2.c ++++ b/drivers/staging/vt6656/wpa2.c +@@ -215,7 +215,7 @@ WPA2vParseRSN ( + m =3D *((PWORD) &(pRSN->abyRSN[4])); +=20 + if (pRSN->len >=3D 10+m*4) { // ver(2) + GK(4) + PK count(2) + P= +KS(4*m) + AKMSS count(2) +- pBSSNode->wAKMSSAuthCount =3D *((PWORD) &(pRSN->abyRSN[6+4*m= +]));; ++ pBSSNode->wAKMSSAuthCount =3D *((PWORD) &(pRSN->abyRSN[6+4*m= +])); + j =3D 0; + pbyOUI =3D &(pRSN->abyRSN[8+4*m]); + for (i =3D 0; (i < pBSSNode->wAKMSSAuthCount) && (j < sizeof= +(pBSSNode->abyAKMSSAuthType)/sizeof(BYTE)); i++) { +@@ -234,7 +234,7 @@ WPA2vParseRSN ( + pBSSNode->wAKMSSAuthCount =3D (WORD)j; + DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wAKMSSAuthCount: %d\n", p= +BSSNode->wAKMSSAuthCount); +=20 +- n =3D *((PWORD) &(pRSN->abyRSN[6+4*m]));; ++ n =3D *((PWORD) &(pRSN->abyRSN[6+4*m])); + if (pRSN->len >=3D 12+4*m+4*n) { // ver(2)+GK(4)+PKCnt(2)+PK= +S(4*m)+AKMSSCnt(2)+AKMSS(4*n)+Cap(2) + pBSSNode->sRSNCapObj.bRSNCapExist =3D TRUE; + pBSSNode->sRSNCapObj.wRSNCap =3D *((PWORD) &(pRSN->abyRS= +N[8+4*m+4*n])); +--=20 +1.7.3.1.g432b3.dirty + + +--===============1088501263== +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Disposition: inline + +_______________________________________________ +devel mailing list +devel@linuxdriverproject.org +http://driverdev.linuxdriverproject.org/mailman/listinfo/devel + +--===============1088501263==-- + + + diff --git a/test/corpora/lkml/cur/1382298793.002268:2, b/test/corpora/lkml/cur/1382298793.002268:2, new file mode 100644 index 00000000..116de343 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002268:2, @@ -0,0 +1,66 @@ +From: Joe Perches <joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org> +Subject: [PATCH 42/44] net/sunrpc/addr.c: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:05:01 -0800 +Lines: 26 +Message-ID: <aca92092a705e0d21176b5ac7d3581c4f9140dbc.1289789605.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: "J. Bruce Fields" <bfields-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>, + Neil Brown <neilb-l3A5Bk7waGM@public.gmane.org>, + Trond Myklebust <Trond.Myklebust-HgOvQuBEEgTQT0dZR+AlfA@public.gmane.org>, + "David S. Miller" <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>, linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +To: Jiri Kosina <trivial-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> +X-From: linux-nfs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Mon Nov 15 04:07:25 2010 +Return-path: <linux-nfs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glN-linux-nfs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-nfs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1PHpPh-0001H8-D9 + for glN-linux-nfs-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Mon, 15 Nov 2010 04:07:25 +0100 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S932828Ab0KODGd (ORCPT <rfc822;glN-linux-nfs@m.gmane.org>); + Sun, 14 Nov 2010 22:06:33 -0500 +Received: from mail.perches.com ([173.55.12.10]:1267 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932988Ab0KODGD (ORCPT <rfc822;linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); + Sun, 14 Nov 2010 22:06:03 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 3EB452436E; + Sun, 14 Nov 2010 19:04:30 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org> +Sender: linux-nfs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-nfs.vger.kernel.org> +X-Mailing-List: linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062287> + +Signed-off-by: Joe Perches <joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org> +--- + net/sunrpc/addr.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/net/sunrpc/addr.c b/net/sunrpc/addr.c +index 1419d0c..4195233 100644 +--- a/net/sunrpc/addr.c ++++ b/net/sunrpc/addr.c +@@ -151,7 +151,7 @@ static size_t rpc_pton4(const char *buf, const size_t buflen, + return 0; + + sin->sin_family = AF_INET; +- return sizeof(struct sockaddr_in);; ++ return sizeof(struct sockaddr_in); + } + + #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) +-- +1.7.3.1.g432b3.dirty + +-- +To unsubscribe from this list: send the line "unsubscribe linux-nfs" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + + diff --git a/test/corpora/lkml/cur/1382298793.002269:2, b/test/corpora/lkml/cur/1382298793.002269:2, new file mode 100644 index 00000000..2e2652ac --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002269:2, @@ -0,0 +1,74 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 32/44] fs/9p: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:51 -0800 +Lines: 35 +Message-ID: <f6ae29dfdd0b9ad401f5eb77ae670212689ee921.1289789605.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: Eric Van Hensbergen <ericvh@gmail.com>, + Ron Minnich <rminnich@sandia.gov>, + Latchesar Ionkov <lucho@ionkov.net>, + v9fs-developer@lists.sourceforge.net, linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 04:07:26 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHpPg-0001H8-Sy + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 04:07:25 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S932992Ab0KODGD (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 14 Nov 2010 22:06:03 -0500 +Received: from mail.perches.com ([173.55.12.10]:1227 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932846Ab0KODF4 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:56 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id C9F2E2436F; + Sun, 14 Nov 2010 19:04:23 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062288> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + fs/9p/acl.c | 2 +- + fs/9p/xattr.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/fs/9p/acl.c b/fs/9p/acl.c +index 12d6023..bc4da9a 100644 +--- a/fs/9p/acl.c ++++ b/fs/9p/acl.c +@@ -28,7 +28,7 @@ static struct posix_acl *__v9fs_get_acl(struct p9_fid *fid, char *name) + { + ssize_t size; + void *value = NULL; +- struct posix_acl *acl = NULL;; ++ struct posix_acl *acl = NULL; + + size = v9fs_fid_xattr_get(fid, name, NULL, 0); + if (size > 0) { +diff --git a/fs/9p/xattr.c b/fs/9p/xattr.c +index 43ec7df..d288773 100644 +--- a/fs/9p/xattr.c ++++ b/fs/9p/xattr.c +@@ -133,7 +133,7 @@ int v9fs_xattr_set(struct dentry *dentry, const char *name, + "p9_client_xattrcreate failed %d\n", retval); + goto error; + } +- msize = fid->clnt->msize;; ++ msize = fid->clnt->msize; + while (value_len) { + if (value_len > (msize - P9_IOHDRSZ)) + write_count = msize - P9_IOHDRSZ; +-- +1.7.3.1.g432b3.dirty + + + diff --git a/test/corpora/lkml/cur/1382298793.002270:2, b/test/corpora/lkml/cur/1382298793.002270:2, new file mode 100644 index 00000000..8e093063 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002270:2, @@ -0,0 +1,68 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 41/44] net/ipv6/mcast.c: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:05:00 -0800 +Lines: 26 +Message-ID: <1f3e1f7e454f3c62b66fc5f3e1e1ed90d62b7fb0.1289789605.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: "David S. Miller" <davem@davemloft.net>, + Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>, + "Pekka Savola (ipv6)" <pekkas@netcore.fi>, + James Morris <jmorris@namei.org>, + Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>, + Patrick McHardy <kaber@trash.net>, netdev@vger.kernel.org, + linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: netdev-owner@vger.kernel.org Mon Nov 15 04:07:30 2010 +Return-path: <netdev-owner@vger.kernel.org> +Envelope-to: linux-netdev-2@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <netdev-owner@vger.kernel.org>) + id 1PHpPi-0001H8-UT + for linux-netdev-2@lo.gmane.org; Mon, 15 Nov 2010 04:07:27 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S933051Ab0KODGq (ORCPT <rfc822;linux-netdev-2@m.gmane.org>); + Sun, 14 Nov 2010 22:06:46 -0500 +Received: from mail.perches.com ([173.55.12.10]:1258 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932980Ab0KODGC (ORCPT <rfc822;netdev@vger.kernel.org>); + Sun, 14 Nov 2010 22:06:02 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 8F37A24377; + Sun, 14 Nov 2010 19:04:29 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: netdev-owner@vger.kernel.org +Precedence: bulk +List-ID: <netdev.vger.kernel.org> +X-Mailing-List: netdev@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062289> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + net/ipv6/mcast.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c +index d1444b9..9c50745 100644 +--- a/net/ipv6/mcast.c ++++ b/net/ipv6/mcast.c +@@ -257,7 +257,7 @@ static struct inet6_dev *ip6_mc_find_dev_rcu(struct net *net, + return NULL; + idev = __in6_dev_get(dev); + if (!idev) +- return NULL;; ++ return NULL; + read_lock_bh(&idev->lock); + if (idev->dead) { + read_unlock_bh(&idev->lock); +-- +1.7.3.1.g432b3.dirty + +-- +To unsubscribe from this list: send the line "unsubscribe netdev" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + + diff --git a/test/corpora/lkml/cur/1382298793.002271:2, b/test/corpora/lkml/cur/1382298793.002271:2, new file mode 100644 index 00000000..144fc890 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002271:2, @@ -0,0 +1,58 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 38/44] include/linux/if_macvlan.h: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:57 -0800 +Lines: 21 +Message-ID: <186ca914f887b2354ea3178696edc81cacbb28c6.1289789605.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: Patrick McHardy <kaber@trash.net>, netdev@vger.kernel.org, + linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 04:08:18 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHpQX-0001fQ-U4 + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 04:08:18 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S933080Ab0KODHz (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 14 Nov 2010 22:07:55 -0500 +Received: from mail.perches.com ([173.55.12.10]:1249 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932730Ab0KODGA (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Sun, 14 Nov 2010 22:06:00 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id AAEDA24375; + Sun, 14 Nov 2010 19:04:27 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062290> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + include/linux/if_macvlan.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/include/linux/if_macvlan.h b/include/linux/if_macvlan.h +index 8a2fd66..ac96a2d 100644 +--- a/include/linux/if_macvlan.h ++++ b/include/linux/if_macvlan.h +@@ -69,7 +69,7 @@ static inline void macvlan_count_rx(const struct macvlan_dev *vlan, + rx_stats = this_cpu_ptr(vlan->rx_stats); + if (likely(success)) { + u64_stats_update_begin(&rx_stats->syncp); +- rx_stats->rx_packets++;; ++ rx_stats->rx_packets++; + rx_stats->rx_bytes += len; + if (multicast) + rx_stats->rx_multicast++; +-- +1.7.3.1.g432b3.dirty + + + diff --git a/test/corpora/lkml/cur/1382298793.002272:2, b/test/corpora/lkml/cur/1382298793.002272:2, new file mode 100644 index 00000000..f276bb4b --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002272:2, @@ -0,0 +1,59 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 37/44] fs/ubifs: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:56 -0800 +Lines: 21 +Message-ID: <902d76520da2f65e5dc44339dccb07159947f23d.1289789605.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: Artem Bityutskiy <dedekind1@gmail.com>, + Adrian Hunter <adrian.hunter@nokia.com>, + linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 04:08:19 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHpQY-0001fQ-EH + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 04:08:18 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S933129Ab0KODH5 (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 14 Nov 2010 22:07:57 -0500 +Received: from mail.perches.com ([173.55.12.10]:1247 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932907Ab0KODF7 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:59 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 0CF9424374; + Sun, 14 Nov 2010 19:04:27 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062291> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + fs/ubifs/scan.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/fs/ubifs/scan.c b/fs/ubifs/scan.c +index 3e1ee57..36216b4 100644 +--- a/fs/ubifs/scan.c ++++ b/fs/ubifs/scan.c +@@ -328,7 +328,7 @@ struct ubifs_scan_leb *ubifs_scan(const struct ubifs_info *c, int lnum, + if (!quiet) + ubifs_err("empty space starts at non-aligned offset %d", + offs); +- goto corrupted;; ++ goto corrupted; + } + + ubifs_end_scan(c, sleb, lnum, offs); +-- +1.7.3.1.g432b3.dirty + + + diff --git a/test/corpora/lkml/cur/1382298793.002273:2, b/test/corpora/lkml/cur/1382298793.002273:2, new file mode 100644 index 00000000..d5eca3bb --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002273:2, @@ -0,0 +1,64 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 39/44] include/net/caif/cfctrl.h: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:58 -0800 +Lines: 26 +Message-ID: <35914cfea1bd0ab3963e632d02b1fdd52a9d2bc8.1289789605.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: Sjur Braendeland <sjur.brandeland@stericsson.com>, + "David S. Miller" <davem@davemloft.net>, netdev@vger.kernel.org, + linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: netdev-owner@vger.kernel.org Mon Nov 15 04:08:21 2010 +Return-path: <netdev-owner@vger.kernel.org> +Envelope-to: linux-netdev-2@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <netdev-owner@vger.kernel.org>) + id 1PHpQW-0001fQ-TC + for linux-netdev-2@lo.gmane.org; Mon, 15 Nov 2010 04:08:17 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S932988Ab0KODHd (ORCPT <rfc822;linux-netdev-2@m.gmane.org>); + Sun, 14 Nov 2010 22:07:33 -0500 +Received: from mail.perches.com ([173.55.12.10]:1252 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932944Ab0KODGB (ORCPT <rfc822;netdev@vger.kernel.org>); + Sun, 14 Nov 2010 22:06:01 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 4F8E124376; + Sun, 14 Nov 2010 19:04:28 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: netdev-owner@vger.kernel.org +Precedence: bulk +List-ID: <netdev.vger.kernel.org> +X-Mailing-List: netdev@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062292> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + include/net/caif/cfctrl.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h +index 9402543..e54f639 100644 +--- a/include/net/caif/cfctrl.h ++++ b/include/net/caif/cfctrl.h +@@ -51,7 +51,7 @@ struct cfctrl_rsp { + void (*restart_rsp)(void); + void (*radioset_rsp)(void); + void (*reject_rsp)(struct cflayer *layer, u8 linkid, +- struct cflayer *client_layer);; ++ struct cflayer *client_layer); + }; + + /* Link Setup Parameters for CAIF-Links. */ +-- +1.7.3.1.g432b3.dirty + +-- +To unsubscribe from this list: send the line "unsubscribe netdev" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + + diff --git a/test/corpora/lkml/cur/1382298793.002274:2, b/test/corpora/lkml/cur/1382298793.002274:2, new file mode 100644 index 00000000..087ddf20 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002274:2, @@ -0,0 +1,59 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 30/44] drivers/usb/gadget: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:49 -0800 +Lines: 21 +Message-ID: <cdc48b6ab9446585f304c801cca45a2a9d1e37ec.1289789605.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: David Brownell <dbrownell@users.sourceforge.net>, + Greg Kroah-Hartman <gregkh@suse.de>, linux-usb@vger.kernel.org, + linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 04:08:56 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHpR9-0001sn-P6 + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 04:08:56 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S932917Ab0KODF7 (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 14 Nov 2010 22:05:59 -0500 +Received: from mail.perches.com ([173.55.12.10]:1216 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932842Ab0KODFz (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:55 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 6C4A92436C; + Sun, 14 Nov 2010 19:04:22 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062293> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + drivers/usb/gadget/f_fs.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c +index 4a830df..38bb200 100644 +--- a/drivers/usb/gadget/f_fs.c ++++ b/drivers/usb/gadget/f_fs.c +@@ -2096,7 +2096,7 @@ static int __ffs_func_bind_do_descs(enum ffs_entity_type type, u8 *valuep, + ep = usb_ep_autoconfig(func->gadget, ds); + if (unlikely(!ep)) + return -ENOTSUPP; +- ep->driver_data = func->eps + idx;; ++ ep->driver_data = func->eps + idx; + + req = usb_ep_alloc_request(ep, GFP_KERNEL); + if (unlikely(!req)) +-- +1.7.3.1.g432b3.dirty + + + diff --git a/test/corpora/lkml/cur/1382298793.002275:2, b/test/corpora/lkml/cur/1382298793.002275:2, new file mode 100644 index 00000000..32fa526f --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002275:2, @@ -0,0 +1,59 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 36/44] fs/ocfs2: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:55 -0800 +Lines: 21 +Message-ID: <e32409b17aaa1a54fec85f3654583ef08fcf851c.1289789605.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: Mark Fasheh <mfasheh@suse.com>, + Joel Becker <joel.becker@oracle.com>, + ocfs2-devel@oss.oracle.com, linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 04:08:57 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHpRA-0001sn-Pm + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 04:08:57 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S933007Ab0KODI2 (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 14 Nov 2010 22:08:28 -0500 +Received: from mail.perches.com ([173.55.12.10]:1239 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932884Ab0KODF7 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:59 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 54CEB24372; + Sun, 14 Nov 2010 19:04:26 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062294> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + fs/ocfs2/refcounttree.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c +index b5f9160..da14a42 100644 +--- a/fs/ocfs2/refcounttree.c ++++ b/fs/ocfs2/refcounttree.c +@@ -3704,7 +3704,7 @@ int ocfs2_refcount_cow_xattr(struct inode *inode, + context->cow_start = cow_start; + context->cow_len = cow_len; + context->ref_tree = ref_tree; +- context->ref_root_bh = ref_root_bh;; ++ context->ref_root_bh = ref_root_bh; + context->cow_object = xv; + + context->cow_duplicate_clusters = ocfs2_duplicate_clusters_by_jbd; +-- +1.7.3.1.g432b3.dirty + + + diff --git a/test/corpora/lkml/cur/1382298793.002276:2, b/test/corpora/lkml/cur/1382298793.002276:2, new file mode 100644 index 00000000..9e318aaf --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002276:2, @@ -0,0 +1,58 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 35/44] fs/nfs: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:54 -0800 +Lines: 21 +Message-ID: <ec29c2321578915d1d219f5ad00b876a3ff1a105.1289789605.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: Trond Myklebust <Trond.Myklebust@netapp.com>, + linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 04:09:03 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHpRB-0001sn-9x + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 04:08:57 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S933153Ab0KODIl (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 14 Nov 2010 22:08:41 -0500 +Received: from mail.perches.com ([173.55.12.10]:1236 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932876Ab0KODF6 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:58 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 8DCD324371; + Sun, 14 Nov 2010 19:04:25 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062295> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + fs/nfs/getroot.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/fs/nfs/getroot.c b/fs/nfs/getroot.c +index ac7b814..e17f628 100644 +--- a/fs/nfs/getroot.c ++++ b/fs/nfs/getroot.c +@@ -190,7 +190,7 @@ struct dentry *nfs4_get_root(struct super_block *sb, struct nfs_fh *mntfh) + + fattr = nfs_alloc_fattr(); + if (fattr == NULL) +- return ERR_PTR(-ENOMEM);; ++ return ERR_PTR(-ENOMEM); + + /* get the actual root for this mount */ + error = server->nfs_client->rpc_ops->getattr(server, mntfh, fattr); +-- +1.7.3.1.g432b3.dirty + + + diff --git a/test/corpora/lkml/cur/1382298793.002277:2, b/test/corpora/lkml/cur/1382298793.002277:2, new file mode 100644 index 00000000..7fb2d9a4 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002277:2, @@ -0,0 +1,58 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 34/44] fs/logfs: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:53 -0800 +Lines: 21 +Message-ID: <0c990bdacb2f9bf256acbb06ca59130585f600b7.1289789605.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: Joern Engel <joern@logfs.org>, logfs@logfs.org, + linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 04:09:34 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHpRl-000297-1j + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 04:09:33 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S933187Ab0KODI4 (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 14 Nov 2010 22:08:56 -0500 +Received: from mail.perches.com ([173.55.12.10]:1234 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932859Ab0KODF5 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:57 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 0339024370; + Sun, 14 Nov 2010 19:04:25 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062296> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + fs/logfs/readwrite.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/fs/logfs/readwrite.c b/fs/logfs/readwrite.c +index 6127baf..b4304f2 100644 +--- a/fs/logfs/readwrite.c ++++ b/fs/logfs/readwrite.c +@@ -481,7 +481,7 @@ static int inode_write_alias(struct super_block *sb, + val = inode_val0(inode); + break; + case INODE_USED_OFS: +- val = cpu_to_be64(li->li_used_bytes);; ++ val = cpu_to_be64(li->li_used_bytes); + break; + case INODE_SIZE_OFS: + val = cpu_to_be64(i_size_read(inode)); +-- +1.7.3.1.g432b3.dirty + + + diff --git a/test/corpora/lkml/cur/1382298793.002278:2, b/test/corpora/lkml/cur/1382298793.002278:2, new file mode 100644 index 00000000..3048c162 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002278:2, @@ -0,0 +1,63 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 33/44] fs/ceph: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:52 -0800 +Lines: 26 +Message-ID: <e01252afc842668a94fb0549e2d1833d77a6411f.1289789605.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: Sage Weil <sage@newdream.net>, ceph-devel@vger.kernel.org, + linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: ceph-devel-owner@vger.kernel.org Mon Nov 15 04:09:34 2010 +Return-path: <ceph-devel-owner@vger.kernel.org> +Envelope-to: gcfcd-ceph-devel3-2@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <ceph-devel-owner@vger.kernel.org>) + id 1PHpRl-000297-Hx + for gcfcd-ceph-devel3-2@lo.gmane.org; Mon, 15 Nov 2010 04:09:33 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S932690Ab0KODJN (ORCPT <rfc822;gcfcd-ceph-devel3-2@m.gmane.org>); + Sun, 14 Nov 2010 22:09:13 -0500 +Received: from mail.perches.com ([173.55.12.10]:1231 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932849Ab0KODF5 (ORCPT <rfc822;ceph-devel@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:57 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 69DEF2436B; + Sun, 14 Nov 2010 19:04:24 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: ceph-devel-owner@vger.kernel.org +Precedence: bulk +List-ID: <ceph-devel.vger.kernel.org> +X-Mailing-List: ceph-devel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062297> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + fs/ceph/mds_client.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c +index 3142b15..931124c 100644 +--- a/fs/ceph/mds_client.c ++++ b/fs/ceph/mds_client.c +@@ -2023,7 +2023,7 @@ static void handle_reply(struct ceph_mds_session *session, struct ceph_msg *msg) + } else { + struct ceph_inode_info *ci = ceph_inode(req->r_inode); + struct ceph_cap *cap = +- ceph_get_cap_for_mds(ci, req->r_mds);; ++ ceph_get_cap_for_mds(ci, req->r_mds); + + dout("already using auth"); + if ((!cap || cap != ci->i_auth_cap) || +-- +1.7.3.1.g432b3.dirty + +-- +To unsubscribe from this list: send the line "unsubscribe ceph-devel" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + + diff --git a/test/corpora/lkml/cur/1382298793.002279:2, b/test/corpora/lkml/cur/1382298793.002279:2, new file mode 100644 index 00000000..1dbe4c33 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002279:2, @@ -0,0 +1,88 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 26/44] drivers/scsi/qla2xxx: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:45 -0800 +Lines: 49 +Message-ID: <40854ce1b1e958e2c0bb9b79911d89b45b5e5f27.1289789605.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: Andrew Vasquez <andrew.vasquez@qlogic.com>, + linux-driver@qlogic.com, + "James E.J. Bottomley" <James.Bottomley@suse.de>, + linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: linux-scsi-owner@vger.kernel.org Mon Nov 15 04:10:09 2010 +Return-path: <linux-scsi-owner@vger.kernel.org> +Envelope-to: lnx-linux-scsi@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-scsi-owner@vger.kernel.org>) + id 1PHpSK-0002RT-EP + for lnx-linux-scsi@lo.gmane.org; Mon, 15 Nov 2010 04:10:08 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S932860Ab0KODJt (ORCPT <rfc822;lnx-linux-scsi@m.gmane.org>); + Sun, 14 Nov 2010 22:09:49 -0500 +Received: from mail.perches.com ([173.55.12.10]:1202 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932797Ab0KODFo (ORCPT <rfc822;linux-scsi@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:44 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id E65A02436B; + Sun, 14 Nov 2010 19:04:11 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: linux-scsi-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-scsi.vger.kernel.org> +X-Mailing-List: linux-scsi@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062298> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + drivers/scsi/qla2xxx/qla_isr.c | 4 ++-- + drivers/scsi/qla2xxx/qla_nx.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c +index 1f06ddd..59c4870 100644 +--- a/drivers/scsi/qla2xxx/qla_isr.c ++++ b/drivers/scsi/qla2xxx/qla_isr.c +@@ -1049,7 +1049,7 @@ qla2x00_ct_entry(scsi_qla_host_t *vha, struct req_que *req, + } + DEBUG2(qla2x00_dump_buffer((uint8_t *)pkt, sizeof(*pkt))); + } else { +- bsg_job->reply->result = DID_OK << 16;; ++ bsg_job->reply->result = DID_OK << 16; + bsg_job->reply->reply_payload_rcv_len = + bsg_job->reply_payload.payload_len; + bsg_job->reply_len = 0; +@@ -1144,7 +1144,7 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vha, struct req_que *req, + DEBUG2(qla2x00_dump_buffer((uint8_t *)pkt, sizeof(*pkt))); + } + else { +- bsg_job->reply->result = DID_OK << 16;; ++ bsg_job->reply->result = DID_OK << 16; + bsg_job->reply->reply_payload_rcv_len = bsg_job->reply_payload.payload_len; + bsg_job->reply_len = 0; + } +diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c +index 8d9edfb..de2d1eb 100644 +--- a/drivers/scsi/qla2xxx/qla_nx.c ++++ b/drivers/scsi/qla2xxx/qla_nx.c +@@ -1022,7 +1022,7 @@ ql82xx_rom_lock_d(struct qla_hw_data *ha) + qla_printk(KERN_WARNING, ha, "ROM lock failed\n"); + return -1; + } +- return 0;; ++ return 0; + } + + static int +-- +1.7.3.1.g432b3.dirty + +-- +To unsubscribe from this list: send the line "unsubscribe linux-scsi" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + + diff --git a/test/corpora/lkml/cur/1382298793.002280:2, b/test/corpora/lkml/cur/1382298793.002280:2, new file mode 100644 index 00000000..f8961e73 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002280:2, @@ -0,0 +1,57 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 27/44] drivers/serial: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:46 -0800 +Lines: 21 +Message-ID: <57c2393ee99b62bca43fa1c510cae832795069ba.1289789605.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 04:10:10 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHpSJ-0002RT-DE + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 04:10:07 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S932970Ab0KODJh (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 14 Nov 2010 22:09:37 -0500 +Received: from mail.perches.com ([173.55.12.10]:1204 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932802Ab0KODFp (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:45 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 7FB8224371; + Sun, 14 Nov 2010 19:04:12 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062299> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + drivers/serial/mrst_max3110.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/serial/mrst_max3110.c b/drivers/serial/mrst_max3110.c +index b62857b..00d284c 100644 +--- a/drivers/serial/mrst_max3110.c ++++ b/drivers/serial/mrst_max3110.c +@@ -56,7 +56,7 @@ struct uart_max3110 { + wait_queue_head_t wq; + struct task_struct *main_thread; + struct task_struct *read_thread; +- struct mutex thread_mutex;; ++ struct mutex thread_mutex; + + u32 baud; + u16 cur_conf; +-- +1.7.3.1.g432b3.dirty + + + diff --git a/test/corpora/lkml/cur/1382298793.002281:2, b/test/corpora/lkml/cur/1382298793.002281:2, new file mode 100644 index 00000000..a1349a92 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002281:2, @@ -0,0 +1,59 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 24/44] drivers/scsi/lpfc: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:43 -0800 +Lines: 21 +Message-ID: <1a0612305d3b141f85a6aeef6d91cd6829a80bae.1289789605.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: James Smart <james.smart@emulex.com>, + "James E.J. Bottomley" <James.Bottomley@suse.de>, + linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 04:10:40 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHpSn-0002jF-BC + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 04:10:37 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S933110Ab0KODKE (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 14 Nov 2010 22:10:04 -0500 +Received: from mail.perches.com ([173.55.12.10]:1195 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932782Ab0KODFn (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:43 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 86AD42436E; + Sun, 14 Nov 2010 19:04:10 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062300> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + drivers/scsi/lpfc/lpfc_bsg.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c +index 7260c3a..9e2c652 100644 +--- a/drivers/scsi/lpfc/lpfc_bsg.c ++++ b/drivers/scsi/lpfc/lpfc_bsg.c +@@ -617,7 +617,7 @@ lpfc_bsg_rport_els(struct fc_bsg_job *job) + dd_data->context_un.iocb.cmdiocbq = cmdiocbq; + dd_data->context_un.iocb.rspiocbq = rspiocbq; + dd_data->context_un.iocb.set_job = job; +- dd_data->context_un.iocb.bmp = NULL;; ++ dd_data->context_un.iocb.bmp = NULL; + dd_data->context_un.iocb.ndlp = ndlp; + + if (phba->cfg_poll & DISABLE_FCP_RING_INT) { +-- +1.7.3.1.g432b3.dirty + + + diff --git a/test/corpora/lkml/cur/1382298793.002282:2, b/test/corpora/lkml/cur/1382298793.002282:2, new file mode 100644 index 00000000..49db1225 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002282:2, @@ -0,0 +1,59 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 23/44] drivers/scsi/bfa: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:42 -0800 +Lines: 21 +Message-ID: <71d0d7db4197f7b6f6b946a295648dc18bd559e0.1289789605.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: Jing Huang <huangj@brocade.com>, + "James E.J. Bottomley" <James.Bottomley@suse.de>, + linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 04:10:53 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHpT0-0002p1-2I + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 04:10:50 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S932981Ab0KODKh (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 14 Nov 2010 22:10:37 -0500 +Received: from mail.perches.com ([173.55.12.10]:1192 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932746Ab0KODFm (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:42 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id EFB872436B; + Sun, 14 Nov 2010 19:04:09 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062301> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + drivers/scsi/bfa/bfa_fcs_lport.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c +index 377cbff..55b3f74 100644 +--- a/drivers/scsi/bfa/bfa_fcs_lport.c ++++ b/drivers/scsi/bfa/bfa_fcs_lport.c +@@ -1683,7 +1683,7 @@ bfa_fcs_lport_fdmi_build_rhba_pyld(struct bfa_fcs_lport_fdmi_s *fdmi, u8 *pyld) + memcpy(attr->value, fcs_hba_attr->driver_version, attr->len); + attr->len = fc_roundup(attr->len, sizeof(u32)); + curr_ptr += sizeof(attr->type) + sizeof(attr->len) + attr->len; +- len += attr->len;; ++ len += attr->len; + count++; + attr->len = cpu_to_be16(attr->len + sizeof(attr->type) + + sizeof(attr->len)); +-- +1.7.3.1.g432b3.dirty + + + diff --git a/test/corpora/lkml/cur/1382298793.002283:2, b/test/corpora/lkml/cur/1382298793.002283:2, new file mode 100644 index 00000000..6b6c9393 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002283:2, @@ -0,0 +1,68 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 22/44] drivers/scsi/be2iscsi: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:41 -0800 +Lines: 30 +Message-ID: <7d4fbb8d3ac34861808dac24efeebe05011f6b0c.1289789605.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: Jayamohan Kallickal <jayamohank@serverengines.com>, + "James E.J. Bottomley" <James.Bottomley@suse.de>, + linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 04:10:52 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHpSz-0002p1-Hv + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 04:10:49 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S932862Ab0KODKi (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 14 Nov 2010 22:10:38 -0500 +Received: from mail.perches.com ([173.55.12.10]:1188 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932757Ab0KODFm (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:42 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 610FF24371; + Sun, 14 Nov 2010 19:04:09 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062302> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + drivers/scsi/be2iscsi/be_main.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c +index 75a85aa..db60563 100644 +--- a/drivers/scsi/be2iscsi/be_main.c ++++ b/drivers/scsi/be2iscsi/be_main.c +@@ -618,7 +618,7 @@ static void beiscsi_get_params(struct beiscsi_hba *phba) + + BE2_NOPOUT_REQ)); + phba->params.cxns_per_ctrl = phba->fw_config.iscsi_cid_count; + phba->params.asyncpdus_per_ctrl = phba->fw_config.iscsi_cid_count * 2; +- phba->params.icds_per_ctrl = phba->fw_config.iscsi_icd_count;; ++ phba->params.icds_per_ctrl = phba->fw_config.iscsi_icd_count; + phba->params.num_sge_per_io = BE2_SGE; + phba->params.defpdu_hdr_sz = BE2_DEFPDU_HDR_SZ; + phba->params.defpdu_data_sz = BE2_DEFPDU_DATA_SZ; +@@ -781,7 +781,7 @@ static irqreturn_t be_isr(int irq, void *dev_id) + int isr; + + phba = dev_id; +- ctrl = &phba->ctrl;; ++ ctrl = &phba->ctrl; + isr = ioread32(ctrl->csr + CEV_ISR0_OFFSET + + (PCI_FUNC(ctrl->pdev->devfn) * CEV_ISR_SIZE)); + if (!isr) +-- +1.7.3.1.g432b3.dirty + + + diff --git a/test/corpora/lkml/cur/1382298793.002284:2, b/test/corpora/lkml/cur/1382298793.002284:2, new file mode 100644 index 00000000..315c1be8 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002284:2, @@ -0,0 +1,61 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 15/44] drivers/net/vxge: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:34 -0800 +Lines: 21 +Message-ID: <e86e79a18106cc38715136bfb2e880b38f5ac764.1289789604.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: Ramkrishna Vepa <ramkrishna.vepa@exar.com>, + Sivakumar Subramani <sivakumar.subramani@exar.com>, + Sreenivasa Honnur <sreenivasa.honnur@exar.com>, + Jon Mason <jon.mason@exar.com>, netdev@vger.kernel.org, + linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 04:11:16 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHpTP-00032R-QK + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 04:11:16 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S932740Ab0KODFk (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 14 Nov 2010 22:05:40 -0500 +Received: from mail.perches.com ([173.55.12.10]:1166 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932690Ab0KODFh (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:37 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id BAAD824377; + Sun, 14 Nov 2010 19:04:04 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062303> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + drivers/net/vxge/vxge-main.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c +index 813829f..93e80c5 100644 +--- a/drivers/net/vxge/vxge-main.c ++++ b/drivers/net/vxge/vxge-main.c +@@ -2062,7 +2062,7 @@ static irqreturn_t vxge_isr_napi(int irq, void *dev_id) + struct __vxge_hw_device *hldev; + u64 reason; + enum vxge_hw_status status; +- struct vxgedev *vdev = (struct vxgedev *) dev_id;; ++ struct vxgedev *vdev = (struct vxgedev *)dev_id; + + vxge_debug_intr(VXGE_TRACE, "%s:%d", __func__, __LINE__); + +-- +1.7.3.1.g432b3.dirty + + + diff --git a/test/corpora/lkml/cur/1382298793.002285:2, b/test/corpora/lkml/cur/1382298793.002285:2, new file mode 100644 index 00000000..80ec0f90 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002285:2, @@ -0,0 +1,61 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 21/44] drivers/s390/net: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:40 -0800 +Lines: 21 +Message-ID: <ea09773876fb36a52a9a750110b381d20767ac12.1289789605.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: Ursula Braun <ursula.braun@de.ibm.com>, + Frank Blaschka <blaschka@linux.vnet.ibm.com>, + linux390@de.ibm.com, Martin Schwidefsky <schwidefsky@de.ibm.com>, + Heiko Carstens <heiko.carstens@de.ibm.com>, + linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 04:11:19 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHpTR-00032R-T3 + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 04:11:18 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S932825Ab0KODLK (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 14 Nov 2010 22:11:10 -0500 +Received: from mail.perches.com ([173.55.12.10]:1186 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932749Ab0KODFl (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:41 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id C07A924370; + Sun, 14 Nov 2010 19:04:08 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062304> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + drivers/s390/net/qeth_core_sys.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/s390/net/qeth_core_sys.c b/drivers/s390/net/qeth_core_sys.c +index 42fa783..b5e967c 100644 +--- a/drivers/s390/net/qeth_core_sys.c ++++ b/drivers/s390/net/qeth_core_sys.c +@@ -372,7 +372,7 @@ static ssize_t qeth_dev_performance_stats_store(struct device *dev, + i = simple_strtoul(buf, &tmp, 16); + if ((i == 0) || (i == 1)) { + if (i == card->options.performance_stats) +- goto out;; ++ goto out; + card->options.performance_stats = i; + if (i == 0) + memset(&card->perf_stats, 0, +-- +1.7.3.1.g432b3.dirty + + + diff --git a/test/corpora/lkml/cur/1382298793.002286:2, b/test/corpora/lkml/cur/1382298793.002286:2, new file mode 100644 index 00000000..9045476b --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002286:2, @@ -0,0 +1,62 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 17/44] drivers/net/wireless/iwlwifi: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:36 -0800 +Lines: 21 +Message-ID: <6beaab935c2c511a5833e855db527976ef05e2dc.1289789604.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: Reinette Chatre <reinette.chatre@intel.com>, + Wey-Yi Guy <wey-yi.w.guy@intel.com>, + Intel Linux Wireless <ilw@linux.intel.com>, + "John W. Linville" <linville@tuxdriver.com>, + linux-wireless@vger.kernel.org, netdev@vger.kernel.org, + linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 04:11:41 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHpTn-0003Ei-3m + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 04:11:39 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S933222Ab0KODLe (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 14 Nov 2010 22:11:34 -0500 +Received: from mail.perches.com ([173.55.12.10]:1174 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932718Ab0KODFj (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:39 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 3C0E524379; + Sun, 14 Nov 2010 19:04:06 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062305> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + drivers/net/wireless/iwlwifi/iwl-agn.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c +index c2636a7..f293fb6 100644 +--- a/drivers/net/wireless/iwlwifi/iwl-agn.c ++++ b/drivers/net/wireless/iwlwifi/iwl-agn.c +@@ -2420,7 +2420,7 @@ static const char *desc_lookup(u32 num) + max = ARRAY_SIZE(advanced_lookup) - 1; + for (i = 0; i < max; i++) { + if (advanced_lookup[i].num == num) +- break;; ++ break; + } + return advanced_lookup[i].name; + } +-- +1.7.3.1.g432b3.dirty + + + diff --git a/test/corpora/lkml/cur/1382298793.002287:2, b/test/corpora/lkml/cur/1382298793.002287:2, new file mode 100644 index 00000000..4fa3cef9 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002287:2, @@ -0,0 +1,57 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 18/44] drivers/net/cnic.c: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:37 -0800 +Lines: 21 +Message-ID: <950331e47b16c2ad28d73502f30f5a0f017b5493.1289789604.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 04:12:07 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHpUF-0003Pl-09 + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 04:12:07 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S933052Ab0KODLd (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 14 Nov 2010 22:11:33 -0500 +Received: from mail.perches.com ([173.55.12.10]:1176 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932652Ab0KODFj (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:39 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id D093A24378; + Sun, 14 Nov 2010 19:04:06 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062306> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + drivers/net/cnic.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c +index 92bac19..594ca9c 100644 +--- a/drivers/net/cnic.c ++++ b/drivers/net/cnic.c +@@ -1695,7 +1695,7 @@ static int cnic_bnx2x_iscsi_ofld1(struct cnic_dev *dev, struct kwqe *wqes[], + *work = num; + return -EINVAL; + } +- *work = 2 + req2->num_additional_wqes;; ++ *work = 2 + req2->num_additional_wqes; + + l5_cid = req1->iscsi_conn_id; + if (l5_cid >= MAX_ISCSI_TBL_SZ) +-- +1.7.3.1.g432b3.dirty + + + diff --git a/test/corpora/lkml/cur/1382298793.002288:2, b/test/corpora/lkml/cur/1382298793.002288:2, new file mode 100644 index 00000000..5b1515ac --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002288:2, @@ -0,0 +1,63 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 16/44] drivers/net/wireless/ath: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:35 -0800 +Lines: 21 +Message-ID: <c375cdc1175018f00066e2220f1d659ca70cde16.1289789604.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: "Luis R. Rodriguez" <lrodriguez@atheros.com>, + Jouni Malinen <jmalinen@atheros.com>, + Vasanthakumar Thiagarajan <vasanth@atheros.com>, + Senthil Balasubramanian <senthilkumar@atheros.com>, + "John W. Linville" <linville@tuxdriver.com>, + linux-wireless@vger.kernel.org, ath9k-devel@lists.ath9k.org, + netdev@vger.kernel.org, linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 04:12:48 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHpUt-0003ie-NF + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 04:12:48 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S932786Ab0KODMQ (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 14 Nov 2010 22:12:16 -0500 +Received: from mail.perches.com ([173.55.12.10]:1169 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932695Ab0KODFi (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:38 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 6AD192437A; + Sun, 14 Nov 2010 19:04:05 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062307> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + drivers/net/wireless/ath/ath9k/htc.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h +index 75ecf6a..4c98b93 100644 +--- a/drivers/net/wireless/ath/ath9k/htc.h ++++ b/drivers/net/wireless/ath/ath9k/htc.h +@@ -434,7 +434,7 @@ void ath9k_htc_beaconep(void *drv_priv, struct sk_buff *skb, + + void ath9k_htc_station_work(struct work_struct *work); + void ath9k_htc_aggr_work(struct work_struct *work); +-void ath9k_ani_work(struct work_struct *work);; ++void ath9k_ani_work(struct work_struct *work); + + int ath9k_tx_init(struct ath9k_htc_priv *priv); + void ath9k_tx_tasklet(unsigned long data); +-- +1.7.3.1.g432b3.dirty + + + diff --git a/test/corpora/lkml/cur/1382298793.002289:2, b/test/corpora/lkml/cur/1382298793.002289:2, new file mode 100644 index 00000000..a6111d47 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002289:2, @@ -0,0 +1,86 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 09/44] drivers/media/video: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:28 -0800 +Lines: 49 +Message-ID: <d7cec5e05200050ee2c7f624eef8c571193b4d92.1289789604.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: Mauro Carvalho Chehab <mchehab@infradead.org>, + linux-media@vger.kernel.org, linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: linux-media-owner@vger.kernel.org Mon Nov 15 04:13:25 2010 +Return-path: <linux-media-owner@vger.kernel.org> +Envelope-to: gldv-linux-media@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-media-owner@vger.kernel.org>) + id 1PHpVT-00042L-DI + for gldv-linux-media@lo.gmane.org; Mon, 15 Nov 2010 04:13:23 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S932630Ab0KODFd (ORCPT <rfc822;gldv-linux-media@m.gmane.org>); + Sun, 14 Nov 2010 22:05:33 -0500 +Received: from mail.perches.com ([173.55.12.10]:1148 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932627Ab0KODFd (ORCPT <rfc822;linux-media@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:33 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 873E324371; + Sun, 14 Nov 2010 19:04:00 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: linux-media-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-media.vger.kernel.org> +X-Mailing-List: linux-media@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062308> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + drivers/media/video/cx88/cx88-blackbird.c | 2 +- + drivers/media/video/davinci/vpfe_capture.c | 2 +- + drivers/media/video/em28xx/em28xx-cards.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c +index 417d1d5..14b2546 100644 +--- a/drivers/media/video/cx88/cx88-blackbird.c ++++ b/drivers/media/video/cx88/cx88-blackbird.c +@@ -1065,7 +1065,7 @@ static int mpeg_open(struct file *file) + err = drv->request_acquire(drv); + if(err != 0) { + dprintk(1,"%s: Unable to acquire hardware, %d\n", __func__, err); +- mutex_unlock(&dev->core->lock);; ++ mutex_unlock(&dev->core->lock); + return err; + } + } +diff --git a/drivers/media/video/davinci/vpfe_capture.c b/drivers/media/video/davinci/vpfe_capture.c +index d8e38cc..14f3d54 100644 +--- a/drivers/media/video/davinci/vpfe_capture.c ++++ b/drivers/media/video/davinci/vpfe_capture.c +@@ -1276,7 +1276,7 @@ static int vpfe_videobuf_prepare(struct videobuf_queue *vq, + vb->size = vpfe_dev->fmt.fmt.pix.sizeimage; + vb->field = field; + +- ret = videobuf_iolock(vq, vb, NULL);; ++ ret = videobuf_iolock(vq, vb, NULL); + if (ret < 0) + return ret; + +diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c +index 5485923..7aee7f0 100644 +--- a/drivers/media/video/em28xx/em28xx-cards.c ++++ b/drivers/media/video/em28xx/em28xx-cards.c +@@ -2408,7 +2408,7 @@ void em28xx_register_i2c_ir(struct em28xx *dev) + dev->init_data.get_key = em28xx_get_key_em_haup; + dev->init_data.name = "i2c IR (EM2840 Hauppauge)"; + case EM2820_BOARD_LEADTEK_WINFAST_USBII_DELUXE: +- dev->init_data.ir_codes = RC_MAP_WINFAST_USBII_DELUXE;; ++ dev->init_data.ir_codes = RC_MAP_WINFAST_USBII_DELUXE; + dev->init_data.get_key = em28xx_get_key_winfast_usbii_deluxe; + dev->init_data.name = "i2c IR (EM2820 Winfast TV USBII Deluxe)"; + break; +-- +1.7.3.1.g432b3.dirty + + + diff --git a/test/corpora/lkml/cur/1382298793.002290:2, b/test/corpora/lkml/cur/1382298793.002290:2, new file mode 100644 index 00000000..bf05cb1e --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002290:2, @@ -0,0 +1,81 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 12/44] drivers/net/bnx2x: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:31 -0800 +Lines: 44 +Message-ID: <2bfaf1f1fe5d503a8a386a433b5187997819d771.1289789604.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: Eilon Greenstein <eilong@broadcom.com>, netdev@vger.kernel.org, + linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 04:13:27 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHpVW-00042L-1L + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 04:13:26 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S932754Ab0KODMy (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 14 Nov 2010 22:12:54 -0500 +Received: from mail.perches.com ([173.55.12.10]:1156 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932660Ab0KODFf (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:35 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id AB58824375; + Sun, 14 Nov 2010 19:04:02 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062309> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + drivers/net/bnx2x/bnx2x_link.c | 4 ++-- + drivers/net/bnx2x/bnx2x_main.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/net/bnx2x/bnx2x_link.c b/drivers/net/bnx2x/bnx2x_link.c +index 5809196..38aeffe 100644 +--- a/drivers/net/bnx2x/bnx2x_link.c ++++ b/drivers/net/bnx2x/bnx2x_link.c +@@ -3904,7 +3904,7 @@ static u8 bnx2x_8726_read_sfp_module_eeprom(struct bnx2x_phy *phy, + MDIO_PMA_REG_SFP_TWO_WIRE_CTRL, &val); + if ((val & MDIO_PMA_REG_SFP_TWO_WIRE_CTRL_STATUS_MASK) == + MDIO_PMA_REG_SFP_TWO_WIRE_STATUS_IDLE) +- return 0;; ++ return 0; + msleep(1); + } + return -EINVAL; +@@ -3988,7 +3988,7 @@ static u8 bnx2x_8727_read_sfp_module_eeprom(struct bnx2x_phy *phy, + MDIO_PMA_REG_SFP_TWO_WIRE_CTRL, &val); + if ((val & MDIO_PMA_REG_SFP_TWO_WIRE_CTRL_STATUS_MASK) == + MDIO_PMA_REG_SFP_TWO_WIRE_STATUS_IDLE) +- return 0;; ++ return 0; + msleep(1); + } + +diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c +index e9ad16f..7ffcb08 100644 +--- a/drivers/net/bnx2x/bnx2x_main.c ++++ b/drivers/net/bnx2x/bnx2x_main.c +@@ -8078,7 +8078,7 @@ static void __devinit bnx2x_get_port_hwinfo(struct bnx2x *bp) + int port = BP_PORT(bp); + u32 val, val2; + u32 config; +- u32 ext_phy_type, ext_phy_config;; ++ u32 ext_phy_type, ext_phy_config; + + bp->link_params.bp = bp; + bp->link_params.port = port; +-- +1.7.3.1.g432b3.dirty + + + diff --git a/test/corpora/lkml/cur/1382298793.002292:2, b/test/corpora/lkml/cur/1382298793.002292:2, new file mode 100644 index 00000000..3aceed70 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002292:2, @@ -0,0 +1,71 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 10/44] drivers/misc: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:29 -0800 +Lines: 35 +Message-ID: <f1f1ff72045c075062d3fbe8d2bfcf67bdb1571d.1289789604.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 04:14:21 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHpWA-0004SF-ER + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 04:14:06 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S932800Ab0KODNW (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 14 Nov 2010 22:13:22 -0500 +Received: from mail.perches.com ([173.55.12.10]:1151 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932629Ab0KODFd (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:33 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 4E7E024372; + Sun, 14 Nov 2010 19:04:01 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062311> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + drivers/misc/bmp085.c | 2 +- + drivers/misc/isl29020.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/misc/bmp085.c b/drivers/misc/bmp085.c +index 63ee4c1..6b8a394 100644 +--- a/drivers/misc/bmp085.c ++++ b/drivers/misc/bmp085.c +@@ -216,7 +216,7 @@ static s32 bmp085_get_temperature(struct bmp085_data *data, int *temperature) + *temperature = (x1+x2+8) >> 4; + + exit: +- return status;; ++ return status; + } + + /* +diff --git a/drivers/misc/isl29020.c b/drivers/misc/isl29020.c +index ca47e62..e6bbf13 100644 +--- a/drivers/misc/isl29020.c ++++ b/drivers/misc/isl29020.c +@@ -158,7 +158,7 @@ static int als_set_default_config(struct i2c_client *client) + dev_err(&client->dev, "default write failed."); + return retval; + } +- return 0;; ++ return 0; + } + + static int isl29020_probe(struct i2c_client *client, +-- +1.7.3.1.g432b3.dirty + + + diff --git a/test/corpora/lkml/cur/1382298793.002293:2, b/test/corpora/lkml/cur/1382298793.002293:2, new file mode 100644 index 00000000..a547a9bc --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002293:2, @@ -0,0 +1,57 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 08/44] drivers/leds: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:27 -0800 +Lines: 21 +Message-ID: <054f6857b7472d9f4c540c298cef0aa77bce6962.1289789604.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: Richard Purdie <rpurdie@rpsys.net>, linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 04:14:24 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHpWB-0004SF-F9 + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 04:14:07 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S932958Ab0KODNw (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 14 Nov 2010 22:13:52 -0500 +Received: from mail.perches.com ([173.55.12.10]:1145 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932602Ab0KODFc (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:32 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 92C3F24370; + Sun, 14 Nov 2010 19:03:59 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062312> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + drivers/leds/leds-mc13783.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/leds/leds-mc13783.c b/drivers/leds/leds-mc13783.c +index f05bb08..f369e56 100644 +--- a/drivers/leds/leds-mc13783.c ++++ b/drivers/leds/leds-mc13783.c +@@ -234,7 +234,7 @@ static int __devinit mc13783_leds_prepare(struct platform_device *pdev) + MC13783_LED_Cx_PERIOD; + + if (pdata->flags & MC13783_LED_TRIODE_TC3) +- reg |= MC13783_LED_Cx_TRIODE_TC_BIT;; ++ reg |= MC13783_LED_Cx_TRIODE_TC_BIT; + + ret = mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_5, reg); + if (ret) +-- +1.7.3.1.g432b3.dirty + + + diff --git a/test/corpora/lkml/cur/1382298793.002294:2, b/test/corpora/lkml/cur/1382298793.002294:2, new file mode 100644 index 00000000..aa5821bc --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002294:2, @@ -0,0 +1,63 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 04/44] drivers/cpufreq: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:23 -0800 +Lines: 26 +Message-ID: <a4bef9c18ce34e80870a07c728ee25e8efac6d9d.1289789604.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: Dave Jones <davej@redhat.com>, cpufreq@vger.kernel.org, + linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: cpufreq-owner@vger.kernel.org Mon Nov 15 04:16:07 2010 +Return-path: <cpufreq-owner@vger.kernel.org> +Envelope-to: glkc-cpufreq2@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <cpufreq-owner@vger.kernel.org>) + id 1PHpY5-0005lg-O4 + for glkc-cpufreq2@lo.gmane.org; Mon, 15 Nov 2010 04:16:06 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S932680Ab0KODO4 (ORCPT <rfc822;glkc-cpufreq2@m.gmane.org>); + Sun, 14 Nov 2010 22:14:56 -0500 +Received: from mail.perches.com ([173.55.12.10]:1127 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1757376Ab0KODF3 (ORCPT <rfc822;cpufreq@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:29 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 1F49D2436E; + Sun, 14 Nov 2010 19:03:57 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: cpufreq-owner@vger.kernel.org +Precedence: bulk +List-ID: <cpufreq.vger.kernel.org> +X-Mailing-List: cpufreq@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062313> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + drivers/cpufreq/cpufreq_conservative.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c +index 526bfbf..b0d8f3d 100644 +--- a/drivers/cpufreq/cpufreq_conservative.c ++++ b/drivers/cpufreq/cpufreq_conservative.c +@@ -118,7 +118,7 @@ static inline cputime64_t get_cpu_idle_time_jiffy(unsigned int cpu, + if (wall) + *wall = (cputime64_t)jiffies_to_usecs(cur_wall_time); + +- return (cputime64_t)jiffies_to_usecs(idle_time);; ++ return (cputime64_t)jiffies_to_usecs(idle_time); + } + + static inline cputime64_t get_cpu_idle_time(unsigned int cpu, cputime64_t *wall) +-- +1.7.3.1.g432b3.dirty + +-- +To unsubscribe from this list: send the line "unsubscribe cpufreq" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + + diff --git a/test/corpora/lkml/cur/1382298793.002296:2, b/test/corpora/lkml/cur/1382298793.002296:2, new file mode 100644 index 00000000..4d337c73 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002296:2, @@ -0,0 +1,148 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 01/44] arch/arm: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:20 -0800 +Lines: 105 +Message-ID: <b6d517c8da3ca0d50c836736e76059c89d692b6e.1289789604.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: Russell King <linux@arm.linux.org.uk>, + Wan ZongShun <mcuos.com@gmail.com>, + Colin Cross <ccross@android.com>, + Erik Gilling <konkers@android.com>, + Olof Johansson <olof@lixom.net>, + Sascha Hauer <kernel@pengutronix.de>, + linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, + linux-tegra@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 04:16:10 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHpY9-0005lg-2R + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 04:16:09 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S933240Ab0KODPt (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 14 Nov 2010 22:15:49 -0500 +Received: from mail.perches.com ([173.55.12.10]:1125 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1757314Ab0KODF2 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:28 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 4C0C32436B; + Sun, 14 Nov 2010 19:03:55 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062315> + +Signed-off-by: Joe Perches <joe@perches.com> +--- + arch/arm/mach-at91/at91cap9_devices.c | 2 +- + arch/arm/mach-at91/at91sam9g45_devices.c | 2 +- + arch/arm/mach-at91/at91sam9rl_devices.c | 2 +- + arch/arm/mach-nuc93x/time.c | 2 +- + arch/arm/mach-tegra/tegra2_clocks.c | 2 +- + arch/arm/mach-w90x900/cpu.c | 2 +- + arch/arm/plat-mxc/irq.c | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/arch/arm/mach-at91/at91cap9_devices.c b/arch/arm/mach-at91/at91cap9_devices.c +index d1f775e..308ce7a 100644 +--- a/arch/arm/mach-at91/at91cap9_devices.c ++++ b/arch/arm/mach-at91/at91cap9_devices.c +@@ -171,7 +171,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data) + */ + usba_udc_data.pdata.vbus_pin = -EINVAL; + usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep); +- memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));; ++ memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep)); + + if (data && data->vbus_pin > 0) { + at91_set_gpio_input(data->vbus_pin, 0); +diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c +index 1e8f275..5e9f8a4 100644 +--- a/arch/arm/mach-at91/at91sam9g45_devices.c ++++ b/arch/arm/mach-at91/at91sam9g45_devices.c +@@ -256,7 +256,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data) + { + usba_udc_data.pdata.vbus_pin = -EINVAL; + usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep); +- memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));; ++ memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep)); + + if (data && data->vbus_pin > 0) { + at91_set_gpio_input(data->vbus_pin, 0); +diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c +index 53aaa94..c49262b 100644 +--- a/arch/arm/mach-at91/at91sam9rl_devices.c ++++ b/arch/arm/mach-at91/at91sam9rl_devices.c +@@ -145,7 +145,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data) + */ + usba_udc_data.pdata.vbus_pin = -EINVAL; + usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep); +- memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));; ++ memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep)); + + if (data && data->vbus_pin > 0) { + at91_set_gpio_input(data->vbus_pin, 0); +diff --git a/arch/arm/mach-nuc93x/time.c b/arch/arm/mach-nuc93x/time.c +index 2f90f9d..f9807c0 100644 +--- a/arch/arm/mach-nuc93x/time.c ++++ b/arch/arm/mach-nuc93x/time.c +@@ -82,7 +82,7 @@ static void nuc93x_timer_setup(void) + timer0_load = (rate / TICKS_PER_SEC); + __raw_writel(timer0_load, REG_TICR0); + +- val |= (PERIOD | COUNTEN | INTEN | PRESCALE);; ++ val |= (PERIOD | COUNTEN | INTEN | PRESCALE); + __raw_writel(val, REG_TCSR0); + + } +diff --git a/arch/arm/mach-tegra/tegra2_clocks.c b/arch/arm/mach-tegra/tegra2_clocks.c +index ae3b308..7f9d2252 100644 +--- a/arch/arm/mach-tegra/tegra2_clocks.c ++++ b/arch/arm/mach-tegra/tegra2_clocks.c +@@ -293,7 +293,7 @@ static int tegra2_super_clk_set_parent(struct clk *c, struct clk *p) + const struct clk_mux_sel *sel; + int shift; + +- val = clk_readl(c->reg + SUPER_CLK_MUX);; ++ val = clk_readl(c->reg + SUPER_CLK_MUX); + BUG_ON(((val & SUPER_STATE_MASK) != SUPER_STATE_RUN) && + ((val & SUPER_STATE_MASK) != SUPER_STATE_IDLE)); + shift = ((val & SUPER_STATE_MASK) == SUPER_STATE_IDLE) ? +diff --git a/arch/arm/mach-w90x900/cpu.c b/arch/arm/mach-w90x900/cpu.c +index 83c5632..0a235e5 100644 +--- a/arch/arm/mach-w90x900/cpu.c ++++ b/arch/arm/mach-w90x900/cpu.c +@@ -60,7 +60,7 @@ static DEFINE_CLK(emc, 7); + static DEFINE_SUBCLK(rmii, 2); + static DEFINE_CLK(usbd, 8); + static DEFINE_CLK(usbh, 9); +-static DEFINE_CLK(g2d, 10);; ++static DEFINE_CLK(g2d, 10); + static DEFINE_CLK(pwm, 18); + static DEFINE_CLK(ps2, 24); + static DEFINE_CLK(kpi, 25); +diff --git a/arch/arm/plat-mxc/irq.c b/arch/arm/plat-mxc/irq.c +index 7331f2a..d7809d0 100644 +--- a/arch/arm/plat-mxc/irq.c ++++ b/arch/arm/plat-mxc/irq.c +@@ -53,7 +53,7 @@ int imx_irq_set_priority(unsigned char irq, unsigned char prio) + unsigned int mask = 0x0F << irq % 8 * 4; + + if (irq >= MXC_INTERNAL_IRQS) +- return -EINVAL;; ++ return -EINVAL; + + temp = __raw_readl(avic_base + AVIC_NIPRIORITY(irq / 8)); + temp &= ~mask; +-- +1.7.3.1.g432b3.dirty + + + diff --git a/test/corpora/lkml/cur/1382298793.002297:2, b/test/corpora/lkml/cur/1382298793.002297:2, new file mode 100644 index 00000000..48a49c4c --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002297:2, @@ -0,0 +1,58 @@ +From: Joe Perches <joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org> +Subject: [PATCH 06/44] drivers/i2c: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:25 -0800 +Lines: 21 +Message-ID: <04cfa2beee1ed9656e550bb13076b9c57899542e.1289789604.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: "Jean Delvare (PC drivers, core)" <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>, + "Ben Dooks (embedded platforms)" <ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org>, + linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +To: Jiri Kosina <trivial-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> +X-From: linux-i2c-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Mon Nov 15 04:15:07 2010 +Return-path: <linux-i2c-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: gldi-i2c-1-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-i2c-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1PHpX8-0005AO-Oy + for gldi-i2c-1-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Mon, 15 Nov 2010 04:15:07 +0100 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S932641Ab0KODOb (ORCPT <rfc822;gldi-i2c-1@m.gmane.org>); + Sun, 14 Nov 2010 22:14:31 -0500 +Received: from mail.perches.com ([173.55.12.10]:1138 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932562Ab0KODFa (ORCPT <rfc822;linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); + Sun, 14 Nov 2010 22:05:30 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 39B6A2436C; + Sun, 14 Nov 2010 19:03:58 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org> +Sender: linux-i2c-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-i2c.vger.kernel.org> +X-Mailing-List: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + +Signed-off-by: Joe Perches <joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org> +--- + drivers/i2c/busses/i2c-designware.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/i2c/busses/i2c-designware.c b/drivers/i2c/busses/i2c-designware.c +index b664ed8..a93922d 100644 +--- a/drivers/i2c/busses/i2c-designware.c ++++ b/drivers/i2c/busses/i2c-designware.c +@@ -390,7 +390,7 @@ i2c_dw_xfer_msg(struct dw_i2c_dev *dev) + int tx_limit, rx_limit; + u32 addr = msgs[dev->msg_write_idx].addr; + u32 buf_len = dev->tx_buf_len; +- u8 *buf = dev->tx_buf;; ++ u8 *buf = dev->tx_buf; + + intr_mask = DW_IC_INTR_DEFAULT_MASK; + +-- +1.7.3.1.g432b3.dirty + + + diff --git a/test/corpora/lkml/cur/1382298793.002298:2, b/test/corpora/lkml/cur/1382298793.002298:2, new file mode 100644 index 00000000..4aa3f389 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002298:2, @@ -0,0 +1,85 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 07/44] drivers/isdn: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:26 -0800 +Lines: 49 +Message-ID: <c7a38f65340aafb208d50fc3a781602c07aebb0c.1289789604.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: Karsten Keil <isdn@linux-pingi.de>, netdev@vger.kernel.org, + linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: netdev-owner@vger.kernel.org Mon Nov 15 04:15:06 2010 +Return-path: <netdev-owner@vger.kernel.org> +Envelope-to: linux-netdev-2@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <netdev-owner@vger.kernel.org>) + id 1PHpX7-0005AO-Lc + for linux-netdev-2@lo.gmane.org; Mon, 15 Nov 2010 04:15:06 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S932642Ab0KODOJ (ORCPT <rfc822;linux-netdev-2@m.gmane.org>); + Sun, 14 Nov 2010 22:14:09 -0500 +Received: from mail.perches.com ([173.55.12.10]:1142 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932587Ab0KODFb (ORCPT <rfc822;netdev@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:31 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 036B82436F; + Sun, 14 Nov 2010 19:03:59 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: netdev-owner@vger.kernel.org +Precedence: bulk +List-ID: <netdev.vger.kernel.org> +X-Mailing-List: netdev@vger.kernel.org + +Signed-off-by: Joe Perches <joe@perches.com> +--- + drivers/isdn/hardware/mISDN/mISDNinfineon.c | 4 ++-- + drivers/isdn/hardware/mISDN/mISDNisar.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/isdn/hardware/mISDN/mISDNinfineon.c b/drivers/isdn/hardware/mISDN/mISDNinfineon.c +index e90db88..bc0529a 100644 +--- a/drivers/isdn/hardware/mISDN/mISDNinfineon.c ++++ b/drivers/isdn/hardware/mISDN/mISDNinfineon.c +@@ -420,7 +420,7 @@ enable_hwirq(struct inf_hw *hw) + break; + case INF_NICCY: + val = inl((u32)hw->cfg.start + NICCY_IRQ_CTRL_REG); +- val |= NICCY_IRQ_ENABLE;; ++ val |= NICCY_IRQ_ENABLE; + outl(val, (u32)hw->cfg.start + NICCY_IRQ_CTRL_REG); + break; + case INF_SCT_1: +@@ -924,7 +924,7 @@ setup_instance(struct inf_hw *card) + mISDNipac_init(&card->ipac, card); + + if (card->ipac.isac.dch.dev.Bprotocols == 0) +- goto error_setup;; ++ goto error_setup; + + err = mISDN_register_device(&card->ipac.isac.dch.dev, + &card->pdev->dev, card->name); +diff --git a/drivers/isdn/hardware/mISDN/mISDNisar.c b/drivers/isdn/hardware/mISDN/mISDNisar.c +index 38eb314..d13fa5b 100644 +--- a/drivers/isdn/hardware/mISDN/mISDNisar.c ++++ b/drivers/isdn/hardware/mISDN/mISDNisar.c +@@ -264,7 +264,7 @@ load_firmware(struct isar_hw *isar, const u8 *buf, int size) + while (noc) { + val = le16_to_cpu(*sp++); + *mp++ = val >> 8; +- *mp++ = val & 0xFF;; ++ *mp++ = val & 0xFF; + noc--; + } + spin_lock_irqsave(isar->hwlock, flags); +-- +1.7.3.1.g432b3.dirty + +-- +To unsubscribe from this list: send the line "unsubscribe netdev" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + + diff --git a/test/corpora/lkml/cur/1382298793.002299:2, b/test/corpora/lkml/cur/1382298793.002299:2, new file mode 100644 index 00000000..dc35b93d --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002299:2, @@ -0,0 +1,56 @@ +From: Joe Perches <joe@perches.com> +Subject: [PATCH 05/44] drivers/gpio: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 19:04:24 -0800 +Lines: 21 +Message-ID: <a04f2c16a94e214f0a1828c4cea95f815a816853.1289789604.git.joe@perches.com> +References: <cover.1289789604.git.joe@perches.com> +Cc: linux-kernel@vger.kernel.org +To: Jiri Kosina <trivial@kernel.org> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 04:15:13 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHpX9-0005AO-Pv + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 04:15:08 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S933055Ab0KODOp (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 14 Nov 2010 22:14:45 -0500 +Received: from mail.perches.com ([173.55.12.10]:1136 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932550Ab0KODFa (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Sun, 14 Nov 2010 22:05:30 -0500 +Received: from Joe-Laptop.home (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id A81642436F; + Sun, 14 Nov 2010 19:03:57 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1.g432b3.dirty +In-Reply-To: <cover.1289789604.git.joe@perches.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org + +Signed-off-by: Joe Perches <joe@perches.com> +--- + drivers/gpio/langwell_gpio.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/gpio/langwell_gpio.c b/drivers/gpio/langwell_gpio.c +index 64db9dc..ed05ecb 100644 +--- a/drivers/gpio/langwell_gpio.c ++++ b/drivers/gpio/langwell_gpio.c +@@ -122,7 +122,7 @@ static int lnw_gpio_direction_output(struct gpio_chip *chip, + lnw_gpio_set(chip, offset, value); + spin_lock_irqsave(&lnw->lock, flags); + value = readl(gpdr); +- value |= BIT(offset % 32);; ++ value |= BIT(offset % 32); + writel(value, gpdr); + spin_unlock_irqrestore(&lnw->lock, flags); + return 0; +-- +1.7.3.1.g432b3.dirty + + + diff --git a/test/corpora/lkml/cur/1382298793.002302:2, b/test/corpora/lkml/cur/1382298793.002302:2, new file mode 100644 index 00000000..7ee679f0 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002302:2, @@ -0,0 +1,85 @@ +From: "Jack Wang" <jack_wang@usish.com> +Subject: RE: [PATCH 25/44] drivers/scsi/pm8001: Remove unnecessary semicolons +Date: Mon, 15 Nov 2010 11:27:32 +0800 +Lines: 33 +Message-ID: <1671200DA80140558ED0D17FB55585AD@usish.com.cn> +References: <cover.1289789604.git.joe@perches.com> <20b352f91642ca45ad730d8eeec0bbd323d26626.1289789605.git.joe@perches.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=gb2312 +Content-Transfer-Encoding: QUOTED-PRINTABLE +Cc: <lindar_liu@usish.com>, + "'James E.J. Bottomley'" <James.Bottomley@suse.de>, + <linux-scsi@vger.kernel.org>, <linux-kernel@vger.kernel.org> +To: "'Joe Perches'" <joe@perches.com>, + "'Jiri Kosina'" <trivial@kernel.org> +X-From: linux-scsi-owner@vger.kernel.org Mon Nov 15 04:28:10 2010 +Return-path: <linux-scsi-owner@vger.kernel.org> +Envelope-to: lnx-linux-scsi@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-scsi-owner@vger.kernel.org>) + id 1PHpjl-0002I8-68 + for lnx-linux-scsi@lo.gmane.org; Mon, 15 Nov 2010 04:28:09 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S932669Ab0KOD15 convert rfc822-to-quoted-printable (ORCPT + <rfc822;lnx-linux-scsi@m.gmane.org>); Sun, 14 Nov 2010 22:27:57 -0500 +Received: from sr-smtp.usish.com ([210.5.144.203]:58240 "EHLO + sr-smtp.usish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S932514Ab0KOD14 convert rfc822-to-8bit (ORCPT + <rfc822;linux-scsi@vger.kernel.org>); Sun, 14 Nov 2010 22:27:56 -0500 +Received: from outbound.usish.com (unknown [192.168.40.103]) + by sr-smtp.usish.com (Postfix) with ESMTP id 782BE778067; + Mon, 15 Nov 2010 11:20:06 +0800 (CST) +Received: from outbound.usish.com (outbound.usish.com [127.0.0.1]) + by postfix.imss70 (Postfix) with ESMTP id 8E538428070; + Mon, 15 Nov 2010 11:27:48 +0800 (CST) +Received: from usishe7a1977d2 (unknown [192.168.58.33]) + (using TLSv1 with cipher RC4-MD5 (128/128 bits)) + (No client certificate requested) + by outbound.usish.com (Postfix) with ESMTP id 5437142807A; + Mon, 15 Nov 2010 11:27:48 +0800 (CST) +X-Mailer: Microsoft Office Outlook 11 +X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.5994 +Thread-Index: AcuEcgXhz8cjF31qQU6VXNE8zpGc0wAAnu4g +In-Reply-To: <20b352f91642ca45ad730d8eeec0bbd323d26626.1289789605.git.joe@perches.com> +Sender: linux-scsi-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-scsi.vger.kernel.org> +X-Mailing-List: linux-scsi@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062321> + +>=20 +> Signed-off-by: Joe Perches <joe@perches.com> +> --- +> drivers/scsi/pm8001/pm8001_init.c | 2 +- +> 1 files changed, 1 insertions(+), 1 deletions(-) +>=20 +> diff --git a/drivers/scsi/pm8001/pm8001_init.c +> b/drivers/scsi/pm8001/pm8001_init.c +> index f8c86b2..be210dd 100644 +> --- a/drivers/scsi/pm8001/pm8001_init.c +> +++ b/drivers/scsi/pm8001/pm8001_init.c +> @@ -160,7 +160,7 @@ static void pm8001_free(struct pm8001_hba_info +*pm8001_ha) +> static void pm8001_tasklet(unsigned long opaque) +> { +> struct pm8001_hba_info *pm8001_ha; +> - pm8001_ha =3D (struct pm8001_hba_info *)opaque;; +> + pm8001_ha =3D (struct pm8001_hba_info *)opaque; +> if (unlikely(!pm8001_ha)) +> BUG_ON(1); +> PM8001_CHIP_DISP->isr(pm8001_ha); +> -- +> 1.7.3.1.g432b3.dirty +[Jack Wang] Acked-by: Jack Wang <jack_wang@usish.com> +Thanks=A3=A1 + + +-- +To unsubscribe from this list: send the line "unsubscribe linux-scsi" i= +n +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + + diff --git a/test/corpora/lkml/cur/1382298793.002309:2, b/test/corpora/lkml/cur/1382298793.002309:2, new file mode 100644 index 00000000..64153b58 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002309:2, @@ -0,0 +1,93 @@ +From: Grant Likely <grant.likely@secretlab.ca> +Subject: Re: [PATCH 28/44] drivers/spi: Remove unnecessary semicolons +Date: Sun, 14 Nov 2010 20:57:42 -0700 +Lines: 41 +Message-ID: <20101115035742.GA19965@angua.secretlab.ca> +References: <cover.1289789604.git.joe@perches.com> + <fe5e5e0efbd97eaa32530eef5ed47efdc3252dad.1289789605.git.joe@perches.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Cc: Jiri Kosina <trivial@kernel.org>, + David Brownell <dbrownell@users.sourceforge.net>, + Wan ZongShun <mcuos.com@gmail.com>, + spi-devel-general@lists.sourceforge.net, + linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org +To: Joe Perches <joe@perches.com> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 04:58:26 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHqD3-0006P9-7p + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 04:58:25 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1757510Ab0KOD5r (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 14 Nov 2010 22:57:47 -0500 +Received: from mail-yx0-f174.google.com ([209.85.213.174]:43928 "EHLO + mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1754294Ab0KOD5q (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Sun, 14 Nov 2010 22:57:46 -0500 +Received: by yxn35 with SMTP id 35so916234yxn.19 + for <linux-kernel@vger.kernel.org>; Sun, 14 Nov 2010 19:57:46 -0800 (PST) +Received: by 10.91.10.20 with SMTP id n20mr7068735agi.56.1289793465914; + Sun, 14 Nov 2010 19:57:45 -0800 (PST) +Received: from angua (S01060002b3d79728.cg.shawcable.net [70.72.87.49]) + by mx.google.com with ESMTPS id d15sm3276149ana.20.2010.11.14.19.57.43 + (version=TLSv1/SSLv3 cipher=RC4-MD5); + Sun, 14 Nov 2010 19:57:45 -0800 (PST) +Received: by angua (Postfix, from userid 1000) + id 238853C00E5; Sun, 14 Nov 2010 20:57:42 -0700 (MST) +Content-Disposition: inline +In-Reply-To: <fe5e5e0efbd97eaa32530eef5ed47efdc3252dad.1289789605.git.joe@perches.com> +User-Agent: Mutt/1.5.20 (2009-06-14) +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062328> + +On Sun, Nov 14, 2010 at 07:04:47PM -0800, Joe Perches wrote: +> Signed-off-by: Joe Perches <joe@perches.com> + +applied, thanks. + +g. + +> --- +> drivers/spi/amba-pl022.c | 2 +- +> drivers/spi/spi_nuc900.c | 2 +- +> 2 files changed, 2 insertions(+), 2 deletions(-) +> +> diff --git a/drivers/spi/amba-pl022.c b/drivers/spi/amba-pl022.c +> index fb3d1b3..2e50631 100644 +> --- a/drivers/spi/amba-pl022.c +> +++ b/drivers/spi/amba-pl022.c +> @@ -956,7 +956,7 @@ static int configure_dma(struct pl022 *pl022) +> tx_conf.dst_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES; +> break; +> case WRITING_U32: +> - tx_conf.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;; +> + tx_conf.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; +> break; +> } +> +> diff --git a/drivers/spi/spi_nuc900.c b/drivers/spi/spi_nuc900.c +> index dff63be..d5be18b 100644 +> --- a/drivers/spi/spi_nuc900.c +> +++ b/drivers/spi/spi_nuc900.c +> @@ -449,7 +449,7 @@ err_iomap: +> release_mem_region(hw->res->start, resource_size(hw->res)); +> kfree(hw->ioarea); +> err_pdata: +> - spi_master_put(hw->master);; +> + spi_master_put(hw->master); +> +> err_nomem: +> return err; +> -- +> 1.7.3.1.g432b3.dirty +> + + diff --git a/test/corpora/lkml/cur/1382298793.002329:2, b/test/corpora/lkml/cur/1382298793.002329:2, new file mode 100644 index 00000000..d91006a5 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002329:2, @@ -0,0 +1,79 @@ +From: Michal Simek <monstr@monstr.eu> +Subject: Re: [PATCH 02/44] arch/microblaze: Remove unnecessary semicolons +Date: Mon, 15 Nov 2010 07:37:39 +0100 +Lines: 32 +Message-ID: <4CE0D533.1010407@monstr.eu> +References: <cover.1289789604.git.joe@perches.com> <5d57b90b488b4338bcdc3f0fbf5f6996842bd44d.1289789604.git.joe@perches.com> +Reply-To: monstr@monstr.eu +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1; format=flowed +Content-Transfer-Encoding: 7bit +Cc: Jiri Kosina <trivial@kernel.org>, + microblaze-uclinux@itee.uq.edu.au, linux-kernel@vger.kernel.org +To: Joe Perches <joe@perches.com> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 07:38:12 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHshf-0005Kt-RF + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 07:38:12 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1755918Ab0KOGhs (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Mon, 15 Nov 2010 01:37:48 -0500 +Received: from mail-fx0-f46.google.com ([209.85.161.46]:39130 "EHLO + mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1755187Ab0KOGhp (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Mon, 15 Nov 2010 01:37:45 -0500 +Received: by fxm6 with SMTP id 6so1494962fxm.19 + for <linux-kernel@vger.kernel.org>; Sun, 14 Nov 2010 22:37:43 -0800 (PST) +Received: by 10.223.70.131 with SMTP id d3mr4100646faj.73.1289803062970; + Sun, 14 Nov 2010 22:37:42 -0800 (PST) +Received: from monstr.eu ([178.23.216.97]) + by mx.google.com with ESMTPS id l14sm735429fan.33.2010.11.14.22.37.40 + (version=SSLv3 cipher=RC4-MD5); + Sun, 14 Nov 2010 22:37:41 -0800 (PST) +User-Agent: Thunderbird 2.0.0.22 (X11/20090625) +In-Reply-To: <5d57b90b488b4338bcdc3f0fbf5f6996842bd44d.1289789604.git.joe@perches.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062348> + +Joe Perches wrote: +> Signed-off-by: Joe Perches <joe@perches.com> +> --- +> arch/microblaze/lib/memmove.c | 2 +- +> 1 files changed, 1 insertions(+), 1 deletions(-) + +Applied. + +Thanks, +Michal + +> +> diff --git a/arch/microblaze/lib/memmove.c b/arch/microblaze/lib/memmove.c +> index 123e361..810fd68 100644 +> --- a/arch/microblaze/lib/memmove.c +> +++ b/arch/microblaze/lib/memmove.c +> @@ -182,7 +182,7 @@ void *memmove(void *v_dst, const void *v_src, __kernel_size_t c) +> for (; c >= 4; c -= 4) { +> value = *--i_src; +> *--i_dst = buf_hold | ((value & 0xFF000000)>> 24); +> - buf_hold = (value & 0xFFFFFF) << 8;; +> + buf_hold = (value & 0xFFFFFF) << 8; +> } +> #endif +> /* Realign the source */ + + +-- +Michal Simek, Ing. (M.Eng) +w: www.monstr.eu p: +42-0-721842854 +Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/ +Microblaze U-BOOT custodian + + diff --git a/test/corpora/lkml/cur/1382298793.002340:2, b/test/corpora/lkml/cur/1382298793.002340:2, new file mode 100644 index 00000000..cee8581c --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002340:2, @@ -0,0 +1,71 @@ +From: Sjur BRENDELAND <sjur.brandeland@stericsson.com> +Subject: RE: [PATCH 39/44] include/net/caif/cfctrl.h: Remove unnecessary + semicolons +Date: Mon, 15 Nov 2010 08:12:02 +0100 +Lines: 7 +Message-ID: <81C3A93C17462B4BBD7E272753C105791945C0C9AA@EXDCVYMBSTM005.EQ1STM.local> +References: <cover.1289789604.git.joe@perches.com> + <35914cfea1bd0ab3963e632d02b1fdd52a9d2bc8.1289789605.git.joe@perches.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 8BIT +Cc: "David S. Miller" <davem@davemloft.net>, + "netdev@vger.kernel.org" <netdev@vger.kernel.org>, + "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org> +To: Joe Perches <joe@perches.com>, Jiri Kosina <trivial@kernel.org> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 08:12:47 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PHtF8-0003Ia-E9 + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 08:12:46 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1757561Ab0KOHMn (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Mon, 15 Nov 2010 02:12:43 -0500 +Received: from eu1sys200aog110.obsmtp.com ([207.126.144.129]:34651 "EHLO + eu1sys200aog110.obsmtp.com" rhost-flags-OK-OK-OK-OK) + by vger.kernel.org with ESMTP id S1755276Ab0KOHMk convert rfc822-to-8bit + (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Mon, 15 Nov 2010 02:12:40 -0500 +Received: from source ([138.198.100.35]) (using TLSv1) by eu1sys200aob110.postini.com ([207.126.147.11]) with SMTP + ID DSNKTODdXnF0LEMxKFzys6wWldAszZ/h5aGS@postini.com; Mon, 15 Nov 2010 07:12:40 UTC +Received: from zeta.dmz-ap.st.com (ns6.st.com [138.198.234.13]) + by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id B201FFC; + Mon, 15 Nov 2010 07:12:06 +0000 (GMT) +Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) + by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id C1093569; + Mon, 15 Nov 2010 07:12:05 +0000 (GMT) +Received: from exdcvycastm022.EQ1STM.local (alteon-source-exch [10.230.100.61]) + (using TLSv1 with cipher RC4-MD5 (128/128 bits)) + (Client CN "exdcvycastm022", Issuer "exdcvycastm022" (not verified)) + by relay1.stm.gmessaging.net (Postfix) with ESMTPS id 2017C24C080; + Mon, 15 Nov 2010 08:12:01 +0100 (CET) +Received: from EXDCVYMBSTM005.EQ1STM.local ([10.230.100.3]) by + exdcvycastm022.EQ1STM.local ([10.230.100.30]) with mapi; Mon, 15 Nov 2010 + 08:12:04 +0100 +Thread-Topic: [PATCH 39/44] include/net/caif/cfctrl.h: Remove unnecessary + semicolons +Thread-Index: AcuEcgmvXg9N7FIzS1KHGoGQuVf68gAIhhTQ +In-Reply-To: <35914cfea1bd0ab3963e632d02b1fdd52a9d2bc8.1289789605.git.joe@perches.com> +Accept-Language: en-US +Content-Language: en-US +X-MS-Has-Attach: +X-MS-TNEF-Correlator: +acceptlanguage: en-US +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062359> + +> +> Signed-off-by: Joe Perches <joe@perches.com> + + +Looks good to me. +Acked-by: Sjur Braendeland <sjur.brandeland@stericsson.com> + + + diff --git a/test/corpora/lkml/cur/1382298793.002400:2, b/test/corpora/lkml/cur/1382298793.002400:2, new file mode 100644 index 00000000..a2eab512 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002400:2, @@ -0,0 +1,102 @@ +From: Mel Gorman <mel@csn.ul.ie> +Subject: Re: [PATCH 40/44] mm/hugetlb.c: Remove unnecessary semicolons +Date: Mon, 15 Nov 2010 09:52:44 +0000 +Lines: 44 +Message-ID: <20101115095244.GI27362@csn.ul.ie> +References: <cover.1289789604.git.joe@perches.com> <59705f848d35b12ace640f92afcffea02cee0976.1289789605.git.joe@perches.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=iso-8859-15 +Cc: Jiri Kosina <trivial@kernel.org>, linux-mm@kvack.org, + linux-kernel@vger.kernel.org +To: Joe Perches <joe@perches.com> +X-From: owner-linux-mm@kvack.org Mon Nov 15 10:53:02 2010 +Return-path: <owner-linux-mm@kvack.org> +Envelope-to: glkm-linux-mm-2@m.gmane.org +Received: from kanga.kvack.org ([205.233.56.17]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <owner-linux-mm@kvack.org>) + id 1PHvkD-0001DG-RE + for glkm-linux-mm-2@m.gmane.org; Mon, 15 Nov 2010 10:53:02 +0100 +Received: by kanga.kvack.org (Postfix) + id BA7DD8D0050; Mon, 15 Nov 2010 04:53:00 -0500 (EST) +Delivered-To: linux-mm-outgoing@kvack.org +Received: by kanga.kvack.org (Postfix, from userid 40) + id B3E4F8D0017; Mon, 15 Nov 2010 04:53:00 -0500 (EST) +X-Original-To: int-list-linux-mm@kvack.org +Delivered-To: int-list-linux-mm@kvack.org +Received: by kanga.kvack.org (Postfix, from userid 63042) + id 985338D0050; Mon, 15 Nov 2010 04:53:00 -0500 (EST) +X-Original-To: linux-mm@kvack.org +Delivered-To: linux-mm@kvack.org +Received: from mail144.messagelabs.com (mail144.messagelabs.com [216.82.254.51]) + by kanga.kvack.org (Postfix) with ESMTP id 3FA8F8D0017 + for <linux-mm@kvack.org>; Mon, 15 Nov 2010 04:53:00 -0500 (EST) +X-VirusChecked: Checked +X-Env-Sender: mel@csn.ul.ie +X-Msg-Ref: server-6.tower-144.messagelabs.com!1289814777!96428158!1 +X-StarScan-Version: 6.2.9; banners=-,-,- +X-Originating-IP: [193.1.99.77] +X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG +Received: (qmail 13284 invoked from network); 15 Nov 2010 09:52:59 -0000 +Received: from gir.skynet.ie (HELO gir.skynet.ie) (193.1.99.77) + by server-6.tower-144.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 15 Nov 2010 09:52:59 -0000 +Received: from skynet.skynet.ie (skynet.skynet.ie [193.1.99.74]) + by gir.skynet.ie (Postfix) with ESMTP id E3A5E1244B; + Mon, 15 Nov 2010 09:52:44 +0000 (GMT) +Received: by skynet.skynet.ie (Postfix, from userid 2391) + id D7AF750911; Mon, 15 Nov 2010 09:52:44 +0000 (GMT) +Content-Disposition: inline +In-Reply-To: <59705f848d35b12ace640f92afcffea02cee0976.1289789605.git.joe@perches.com> +User-Agent: Mutt/1.5.17+20080114 (2008-01-14) +X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.2 +Sender: owner-linux-mm@kvack.org +Precedence: bulk +X-Loop: owner-majordomo@kvack.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062420> + +On Sun, Nov 14, 2010 at 07:04:59PM -0800, Joe Perches wrote: +> Signed-off-by: Joe Perches <joe@perches.com> +> --- +> mm/hugetlb.c | 2 +- +> 1 files changed, 1 insertions(+), 1 deletions(-) +> + +Acked-by: Mel Gorman <mel@csn.ul.ie> + +> diff --git a/mm/hugetlb.c b/mm/hugetlb.c +> index c4a3558..8875242 100644 +> --- a/mm/hugetlb.c +> +++ b/mm/hugetlb.c +> @@ -540,7 +540,7 @@ static struct page *dequeue_huge_page_vma(struct hstate *h, +> +> /* If reserves cannot be used, ensure enough pages are in the pool */ +> if (avoid_reserve && h->free_huge_pages - h->resv_huge_pages == 0) +> - goto err;; +> + goto err; +> +> for_each_zone_zonelist_nodemask(zone, z, zonelist, +> MAX_NR_ZONES - 1, nodemask) { +> -- +> 1.7.3.1.g432b3.dirty +> +> -- +> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in +> the body of a message to majordomo@vger.kernel.org +> More majordomo info at http://vger.kernel.org/majordomo-info.html +> Please read the FAQ at http://www.tux.org/lkml/ +> + +-- +Mel Gorman +Part-time Phd Student Linux Technology Center +University of Limerick IBM Dublin Software Lab + +-- +To unsubscribe, send a message with 'unsubscribe linux-mm' in +the body to majordomo@kvack.org. For more info on Linux MM, +see: http://www.linux-mm.org/ . +Fight unfair telecom policy in Canada: sign http://dissolvethecrtc.ca/ +Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> + + + diff --git a/test/corpora/lkml/cur/1382298793.002432:2, b/test/corpora/lkml/cur/1382298793.002432:2, new file mode 100644 index 00000000..f8b72b65 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002432:2, @@ -0,0 +1,85 @@ +From: Liam Girdwood <lrg@slimlogic.co.uk> +Subject: Re: [PATCH 44/44] sound/soc/codecs: Remove unnecessary + semicolons +Date: Mon, 15 Nov 2010 11:09:20 +0000 +Lines: 14 +Message-ID: <1289819360.3377.15.camel@odin> +References: <cover.1289789604.git.joe@perches.com> + <97fd199b7dac50613f6843156687223928cce44a.1289789605.git.joe@perches.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Cc: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>, + alsa-devel@alsa-project.org, Jiri Kosina <trivial@kernel.org>, + Iwai <tiwai@suse.de>, linux-kernel@vger.kernel.org, + Takashi@alsa-project.org, + Mark Brown <broonie@opensource.wolfsonmicro.com>, + Ian Lartey <ian@opensource.wolfsonmicro.com> +To: Joe Perches <joe@perches.com> +X-From: alsa-devel-bounces@alsa-project.org Mon Nov 15 12:09:44 2010 +Return-path: <alsa-devel-bounces@alsa-project.org> +Envelope-to: glad-alsa-devel-2@m.gmane.org +Received: from alsa0.perex.cz ([212.20.107.51]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <alsa-devel-bounces@alsa-project.org>) + id 1PHwwS-0002x6-6X + for glad-alsa-devel-2@m.gmane.org; Mon, 15 Nov 2010 12:09:44 +0100 +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id D0E09103835; Mon, 15 Nov 2010 12:09:43 +0100 (CET) +X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on mail1.perex.cz +X-Spam-Level: * +X-Spam-Status: No, score=1.0 required=5.0 tests=PRX_BODY_40 autolearn=disabled + version=3.2.4 +Received: from alsa0.perex.cz (localhost [127.0.0.1]) + by alsa0.perex.cz (Postfix) with ESMTP id 0AE19103845; + Mon, 15 Nov 2010 12:09:35 +0100 (CET) +X-Original-To: alsa-devel@alsa-project.org +Delivered-To: alsa-devel@alsa-project.org +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id EA398103845; Mon, 15 Nov 2010 12:09:33 +0100 (CET) +Received: from mail-wy0-f179.google.com (mail-wy0-f179.google.com + [74.125.82.179]) + by alsa0.perex.cz (Postfix) with ESMTP id 8FD12103849 + for <alsa-devel@alsa-project.org>; Mon, 15 Nov 2010 12:09:26 +0100 (CET) +Received: by mail-wy0-f179.google.com with SMTP id 36so3482678wyg.38 + for <alsa-devel@alsa-project.org>; Mon, 15 Nov 2010 03:09:26 -0800 (PST) +Received: by 10.216.64.139 with SMTP id c11mr5392190wed.81.1289819366153; + Mon, 15 Nov 2010 03:09:26 -0800 (PST) +Received: from [192.168.1.6] (host81-136-218-57.in-addr.btopenworld.com + [81.136.218.57]) + by mx.google.com with ESMTPS id 7sm3626925wet.24.2010.11.15.03.09.21 + (version=SSLv3 cipher=RC4-MD5); Mon, 15 Nov 2010 03:09:24 -0800 (PST) +In-Reply-To: <97fd199b7dac50613f6843156687223928cce44a.1289789605.git.joe@perches.com> +X-Mailer: Evolution 2.30.3 +X-BeenThere: alsa-devel@alsa-project.org +X-Mailman-Version: 2.1.9 +Precedence: list +List-Id: "Alsa-devel mailing list for ALSA developers - + http://www.alsa-project.org" <alsa-devel.alsa-project.org> +List-Unsubscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe> +List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel> +List-Post: <mailto:alsa-devel@alsa-project.org> +List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help> +List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> +Sender: alsa-devel-bounces@alsa-project.org +Errors-To: alsa-devel-bounces@alsa-project.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062453> + +On Sun, 2010-11-14 at 19:05 -0800, Joe Perches wrote: +> Signed-off-by: Joe Perches <joe@perches.com> +> --- +> sound/soc/codecs/wm8904.c | 2 +- +> sound/soc/codecs/wm8940.c | 1 - +> sound/soc/codecs/wm8993.c | 2 +- +> sound/soc/codecs/wm_hubs.c | 2 +- +> 4 files changed, 3 insertions(+), 4 deletions(-) + +Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> +-- +Freelance Developer, SlimLogic Ltd +ASoC and Voltage Regulator Maintainer. +http://www.slimlogic.co.uk + + diff --git a/test/corpora/lkml/cur/1382298793.002468:2, b/test/corpora/lkml/cur/1382298793.002468:2, new file mode 100644 index 00000000..e06d3891 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002468:2, @@ -0,0 +1,75 @@ +From: Mark Brown <broonie@opensource.wolfsonmicro.com> +Subject: Re: [PATCH 44/44] sound/soc/codecs: Remove unnecessary + semicolons +Date: Mon, 15 Nov 2010 13:49:39 +0000 +Lines: 5 +Message-ID: <20101115134939.GC12986@rakim.wolfsonmicro.main> +References: <cover.1289789604.git.joe@perches.com> + <97fd199b7dac50613f6843156687223928cce44a.1289789605.git.joe@perches.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Cc: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>, + alsa-devel@alsa-project.org, Jiri Kosina <trivial@kernel.org>, + Takashi Iwai <tiwai@suse.de>, linux-kernel@vger.kernel.org, + Ian Lartey <ian@opensource.wolfsonmicro.com>, + Liam Girdwood <lrg@slimlogic.co.uk> +To: Joe Perches <joe@perches.com> +X-From: alsa-devel-bounces@alsa-project.org Mon Nov 15 14:49:49 2010 +Return-path: <alsa-devel-bounces@alsa-project.org> +Envelope-to: glad-alsa-devel-2@m.gmane.org +Received: from alsa0.perex.cz ([212.20.107.51]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <alsa-devel-bounces@alsa-project.org>) + id 1PHzRN-0003qZ-C2 + for glad-alsa-devel-2@m.gmane.org; Mon, 15 Nov 2010 14:49:49 +0100 +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id D24A2103851; Mon, 15 Nov 2010 14:49:48 +0100 (CET) +X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on mail1.perex.cz +X-Spam-Level: +X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=disabled + version=3.2.4 +Received: from alsa0.perex.cz (localhost [127.0.0.1]) + by alsa0.perex.cz (Postfix) with ESMTP id 53C91103853; + Mon, 15 Nov 2010 14:49:44 +0100 (CET) +X-Original-To: alsa-devel@alsa-project.org +Delivered-To: alsa-devel@alsa-project.org +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id 15C62103853; Mon, 15 Nov 2010 14:49:42 +0100 (CET) +Received: from opensource2.wolfsonmicro.com (opensource.wolfsonmicro.com + [80.75.67.52]) by alsa0.perex.cz (Postfix) with ESMTP id 8DE08103851 + for <alsa-devel@alsa-project.org>; Mon, 15 Nov 2010 14:49:41 +0100 (CET) +Received: from rakim.wolfsonmicro.main (lumison.wolfsonmicro.com + [87.246.78.27]) + by opensource2.wolfsonmicro.com (Postfix) with ESMTPSA id E613E788028; + Mon, 15 Nov 2010 13:49:40 +0000 (GMT) +Received: from broonie by rakim.wolfsonmicro.main with local (Exim 4.72) + (envelope-from <broonie@rakim.wolfsonmicro.main>) + id 1PHzRD-0004Lh-OM; Mon, 15 Nov 2010 13:49:39 +0000 +Content-Disposition: inline +In-Reply-To: <97fd199b7dac50613f6843156687223928cce44a.1289789605.git.joe@perches.com> +X-Cookie: I like your SNOOPY POSTER!! +User-Agent: Mutt/1.5.20 (2009-06-14) +X-BeenThere: alsa-devel@alsa-project.org +X-Mailman-Version: 2.1.9 +Precedence: list +List-Id: "Alsa-devel mailing list for ALSA developers - + http://www.alsa-project.org" <alsa-devel.alsa-project.org> +List-Unsubscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe> +List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel> +List-Post: <mailto:alsa-devel@alsa-project.org> +List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help> +List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> +Sender: alsa-devel-bounces@alsa-project.org +Errors-To: alsa-devel-bounces@alsa-project.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062489> + +On Sun, Nov 14, 2010 at 07:05:03PM -0800, Joe Perches wrote: +> Signed-off-by: Joe Perches <joe@perches.com> + +This doesn't apply against current -next, could you please regenerate +against that? + + diff --git a/test/corpora/lkml/cur/1382298793.002543:2, b/test/corpora/lkml/cur/1382298793.002543:2, new file mode 100644 index 00000000..aebfe251 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002543:2, @@ -0,0 +1,132 @@ +From: "Rose, Gregory V" <gregory.v.rose@intel.com> +Subject: Re: [PATCH 14/44] drivers/net/ixgbe: Remove + unnecessary semicolons +Date: Mon, 15 Nov 2010 08:24:22 -0800 +Lines: 48 +Message-ID: <43F901BD926A4E43B106BF17856F0755013080DEFF@orsmsx508.amr.corp.intel.com> +References: <cover.1289789604.git.joe@perches.com> + <7d2c334daa75c5221946a17d45c9de1901cf06e7.1289789604.git.joe@perches.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Cc: "e1000-devel@lists.sourceforge.net" <e1000-devel@lists.sourceforge.net>, + "Allan, Bruce W" <bruce.w.allan@intel.com>, "Brandeburg, + Jesse" <jesse.brandeburg@intel.com>, + "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, + "Ronciak, John" <john.ronciak@intel.com>, "Kirsher, + Jeffrey T" <jeffrey.t.kirsher@intel.com>, + "netdev@vger.kernel.org" <netdev@vger.kernel.org> +To: Joe Perches <joe@perches.com>, Jiri Kosina <trivial@kernel.org> +X-From: e1000-devel-bounces@lists.sourceforge.net Mon Nov 15 17:25:50 2010 +Return-path: <e1000-devel-bounces@lists.sourceforge.net> +Envelope-to: glded-e1000-devel@m.gmane.org +Received: from lists.sourceforge.net ([216.34.181.88]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <e1000-devel-bounces@lists.sourceforge.net>) + id 1PI1sL-0003p5-2h + for glded-e1000-devel@m.gmane.org; Mon, 15 Nov 2010 17:25:49 +0100 +Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com) + by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.69) + (envelope-from <e1000-devel-bounces@lists.sourceforge.net>) + id 1PI1sG-0006Jq-KT; Mon, 15 Nov 2010 16:25:44 +0000 +Received: from sog-mx-4.v43.ch3.sourceforge.com ([172.29.43.194] + helo=mx.sourceforge.net) + by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.69) + (envelope-from <gregory.v.rose@intel.com>) id 1PI1sF-0006Jk-IV + for e1000-devel@lists.sourceforge.net; Mon, 15 Nov 2010 16:25:43 +0000 +X-ACL-Warn: +Received: from mga09.intel.com ([134.134.136.24]) + by sog-mx-4.v43.ch3.sourceforge.com with esmtp (Exim 4.69) + id 1PI1sA-0001hP-Vk + for e1000-devel@lists.sourceforge.net; Mon, 15 Nov 2010 16:25:43 +0000 +Received: from orsmga001.jf.intel.com ([10.7.209.18]) + by orsmga102.jf.intel.com with ESMTP; 15 Nov 2010 08:25:33 -0800 +X-ExtLoop1: 1 +X-IronPort-AV: E=Sophos;i="4.59,200,1288594800"; d="scan'208";a="677619042" +Received: from orsmsx604.amr.corp.intel.com ([10.22.226.87]) + by orsmga001.jf.intel.com with ESMTP; 15 Nov 2010 08:25:33 -0800 +Received: from orsmsx606.amr.corp.intel.com (10.22.226.128) by + orsmsx604.amr.corp.intel.com (10.22.226.87) with Microsoft SMTP Server + (TLS) id 8.2.254.0; Mon, 15 Nov 2010 08:24:25 -0800 +Received: from orsmsx508.amr.corp.intel.com ([10.22.226.46]) by + orsmsx606.amr.corp.intel.com ([10.22.226.128]) with mapi; + Mon, 15 Nov 2010 08:24:24 -0800 +Thread-Topic: [PATCH 14/44] drivers/net/ixgbe: Remove unnecessary semicolons +Thread-Index: AcuEcftvdxmC6VgnRT2RlEslHutcHgAb4Qcg +In-Reply-To: <7d2c334daa75c5221946a17d45c9de1901cf06e7.1289789604.git.joe@perches.com> +Accept-Language: en-US +Content-Language: en-US +X-MS-Has-Attach: +X-MS-TNEF-Correlator: +acceptlanguage: en-US +X-Spam-Score: -0.0 (/) +X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. + See http://spamassassin.org/tag/ for more details. + -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay + domain +X-Headers-End: 1PI1sA-0001hP-Vk +X-BeenThere: e1000-devel@lists.sourceforge.net +X-Mailman-Version: 2.1.9 +Precedence: list +List-Id: "e100/e1000\(e\)/ixgb/igb/ixgbe development and discussion" + <e1000-devel.lists.sourceforge.net> +List-Unsubscribe: <https://lists.sourceforge.net/lists/listinfo/e1000-devel>, + <mailto:e1000-devel-request@lists.sourceforge.net?subject=unsubscribe> +List-Archive: <http://sourceforge.net/mailarchive/forum.php?forum_name=e1000-devel> +List-Post: <mailto:e1000-devel@lists.sourceforge.net> +List-Help: <mailto:e1000-devel-request@lists.sourceforge.net?subject=help> +List-Subscribe: <https://lists.sourceforge.net/lists/listinfo/e1000-devel>, + <mailto:e1000-devel-request@lists.sourceforge.net?subject=subscribe> +Errors-To: e1000-devel-bounces@lists.sourceforge.net +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062564> + +> -----Original Message----- +> From: Joe Perches [mailto:joe@perches.com] +> Sent: Sunday, November 14, 2010 7:05 PM +> To: Jiri Kosina +> Cc: Kirsher, Jeffrey T; Brandeburg, Jesse; Allan, Bruce W; Wyborny, +> Carolyn; Skidmore, Donald C; Rose, Gregory V; Waskiewicz Jr, Peter P; +> Duyck, Alexander H; Ronciak, John; e1000-devel@lists.sourceforge.net; +> netdev@vger.kernel.org; linux-kernel@vger.kernel.org +> Subject: [PATCH 14/44] drivers/net/ixgbe: Remove unnecessary semicolons +> +> Signed-off-by: Joe Perches <joe@perches.com> +> --- +> drivers/net/ixgbe/ixgbe_sriov.c | 2 +- +> 1 files changed, 1 insertions(+), 1 deletions(-) +> +> diff --git a/drivers/net/ixgbe/ixgbe_sriov.c +> b/drivers/net/ixgbe/ixgbe_sriov.c +> index 5428153..93f40bc 100644 +> --- a/drivers/net/ixgbe/ixgbe_sriov.c +> +++ b/drivers/net/ixgbe/ixgbe_sriov.c +> @@ -68,7 +68,7 @@ static int ixgbe_set_vf_multicasts(struct ixgbe_adapter +> *adapter, +> * addresses +> */ +> for (i = 0; i < entries; i++) { +> - vfinfo->vf_mc_hashes[i] = hash_list[i];; +> + vfinfo->vf_mc_hashes[i] = hash_list[i]; +> } +> +> for (i = 0; i < vfinfo->num_vf_mc_hashes; i++) { +> -- +> 1.7.3.1.g432b3.dirty + +Acked By: Greg Rose <Gregory.v.rose@intel.com> + + +------------------------------------------------------------------------------ +Centralized Desktop Delivery: Dell and VMware Reference Architecture +Simplifying enterprise desktop deployment and management using +Dell EqualLogic storage and VMware View: A highly scalable, end-to-end +client virtualization framework. Read more! +http://p.sf.net/sfu/dell-eql-dev2dev +_______________________________________________ +E1000-devel mailing list +E1000-devel@lists.sourceforge.net +https://lists.sourceforge.net/lists/listinfo/e1000-devel +To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired + + + diff --git a/test/corpora/lkml/cur/1382298793.002557:2, b/test/corpora/lkml/cur/1382298793.002557:2, new file mode 100644 index 00000000..723f9d6d --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002557:2, @@ -0,0 +1,109 @@ +From: Joe Perches <joe@perches.com> +Subject: Re: [PATCH 44/44] sound/soc/codecs: Remove unnecessary semicolons +Date: Mon, 15 Nov 2010 09:09:17 -0800 +Lines: 63 +Message-ID: <1289840957.16461.138.camel@Joe-Laptop> +References: <cover.1289789604.git.joe@perches.com> + <97fd199b7dac50613f6843156687223928cce44a.1289789605.git.joe@perches.com> + <20101115134939.GC12986@rakim.wolfsonmicro.main> +Mime-Version: 1.0 +Content-Type: text/plain; charset="UTF-8" +Content-Transfer-Encoding: 7bit +Cc: Jiri Kosina <trivial@kernel.org>, + Ian Lartey <ian@opensource.wolfsonmicro.com>, + Dimitris Papastamos <dp@opensource.wolfsonmicro.com>, + Liam Girdwood <lrg@slimlogic.co.uk>, + Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de>, + alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org +To: Mark Brown <broonie@opensource.wolfsonmicro.com> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 18:09:51 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PI2Yr-0005ly-Pc + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 18:09:46 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S932795Ab0KORJV (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Mon, 15 Nov 2010 12:09:21 -0500 +Received: from mail.perches.com ([173.55.12.10]:1293 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932132Ab0KORJU (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Mon, 15 Nov 2010 12:09:20 -0500 +Received: from [192.168.1.162] (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 93B872436B; + Mon, 15 Nov 2010 09:07:32 -0800 (PST) +In-Reply-To: <20101115134939.GC12986@rakim.wolfsonmicro.main> +X-Mailer: Evolution 2.30.3 +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062578> + +Signed-off-by: Joe Perches <joe@perches.com> +--- +V2: against -next + + sound/soc/codecs/wm8904.c | 2 +- + sound/soc/codecs/wm8940.c | 1 - + sound/soc/codecs/wm8993.c | 2 +- + sound/soc/codecs/wm_hubs.c | 2 +- + 4 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c +index be90399..5e57bd2 100644 +--- a/sound/soc/codecs/wm8904.c ++++ b/sound/soc/codecs/wm8904.c +@@ -1591,7 +1591,7 @@ static int wm8904_hw_params(struct snd_pcm_substream *substream, + - wm8904->fs); + for (i = 1; i < ARRAY_SIZE(clk_sys_rates); i++) { + cur_val = abs((wm8904->sysclk_rate / +- clk_sys_rates[i].ratio) - wm8904->fs);; ++ clk_sys_rates[i].ratio) - wm8904->fs); + if (cur_val < best_val) { + best = i; + best_val = cur_val; +diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c +index c2def1b..caed084 100644 +--- a/sound/soc/codecs/wm8940.c ++++ b/sound/soc/codecs/wm8940.c +@@ -736,7 +736,6 @@ static int wm8940_probe(struct snd_soc_codec *codec) + return ret; + + return ret; +-; + } + + static int wm8940_remove(struct snd_soc_codec *codec) +diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c +index bcc54be..991d90c 100644 +--- a/sound/soc/codecs/wm8993.c ++++ b/sound/soc/codecs/wm8993.c +@@ -1227,7 +1227,7 @@ static int wm8993_hw_params(struct snd_pcm_substream *substream, + - wm8993->fs); + for (i = 1; i < ARRAY_SIZE(clk_sys_rates); i++) { + cur_val = abs((wm8993->sysclk_rate / +- clk_sys_rates[i].ratio) - wm8993->fs);; ++ clk_sys_rates[i].ratio) - wm8993->fs); + if (cur_val < best_val) { + best = i; + best_val = cur_val; +diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c +index 8aff0ef..422c7fb 100644 +--- a/sound/soc/codecs/wm_hubs.c ++++ b/sound/soc/codecs/wm_hubs.c +@@ -119,7 +119,7 @@ static void calibrate_dc_servo(struct snd_soc_codec *codec) + switch (hubs->dcs_readback_mode) { + case 0: + reg_l = snd_soc_read(codec, WM8993_DC_SERVO_READBACK_1) +- & WM8993_DCS_INTEG_CHAN_0_MASK;; ++ & WM8993_DCS_INTEG_CHAN_0_MASK; + reg_r = snd_soc_read(codec, WM8993_DC_SERVO_READBACK_2) + & WM8993_DCS_INTEG_CHAN_1_MASK; + break; + + + + diff --git a/test/corpora/lkml/cur/1382298793.002575:2, b/test/corpora/lkml/cur/1382298793.002575:2, new file mode 100644 index 00000000..981c1c9a --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002575:2, @@ -0,0 +1,79 @@ +From: Mark Brown <broonie@opensource.wolfsonmicro.com> +Subject: Re: [PATCH 44/44] sound/soc/codecs: Remove unnecessary + semicolons +Date: Mon, 15 Nov 2010 17:30:31 +0000 +Lines: 7 +Message-ID: <20101115173031.GI12986@rakim.wolfsonmicro.main> +References: <cover.1289789604.git.joe@perches.com> + <97fd199b7dac50613f6843156687223928cce44a.1289789605.git.joe@perches.com> + <20101115134939.GC12986@rakim.wolfsonmicro.main> + <1289840957.16461.138.camel@Joe-Laptop> +Mime-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Cc: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>, + alsa-devel@alsa-project.org, Jiri Kosina <trivial@kernel.org>, + Takashi Iwai <tiwai@suse.de>, linux-kernel@vger.kernel.org, + Ian Lartey <ian@opensource.wolfsonmicro.com>, + Liam Girdwood <lrg@slimlogic.co.uk> +To: Joe Perches <joe@perches.com> +X-From: alsa-devel-bounces@alsa-project.org Mon Nov 15 18:30:46 2010 +Return-path: <alsa-devel-bounces@alsa-project.org> +Envelope-to: glad-alsa-devel-2@m.gmane.org +Received: from alsa0.perex.cz ([212.20.107.51]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <alsa-devel-bounces@alsa-project.org>) + id 1PI2t9-0000lr-Er + for glad-alsa-devel-2@m.gmane.org; Mon, 15 Nov 2010 18:30:43 +0100 +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id 5B6F8244F9; Mon, 15 Nov 2010 18:30:41 +0100 (CET) +X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on mail1.perex.cz +X-Spam-Level: +X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=disabled + version=3.2.4 +Received: from alsa0.perex.cz (localhost [127.0.0.1]) + by alsa0.perex.cz (Postfix) with ESMTP id AE3D8244FB; + Mon, 15 Nov 2010 18:30:36 +0100 (CET) +X-Original-To: alsa-devel@alsa-project.org +Delivered-To: alsa-devel@alsa-project.org +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id EF7B7244FC; Mon, 15 Nov 2010 18:30:34 +0100 (CET) +Received: from opensource2.wolfsonmicro.com (opensource.wolfsonmicro.com + [80.75.67.52]) by alsa0.perex.cz (Postfix) with ESMTP id 8B247244F9 + for <alsa-devel@alsa-project.org>; Mon, 15 Nov 2010 18:30:34 +0100 (CET) +Received: from rakim.wolfsonmicro.main (lumison.wolfsonmicro.com + [87.246.78.27]) + by opensource2.wolfsonmicro.com (Postfix) with ESMTPSA id C748C788028; + Mon, 15 Nov 2010 17:30:32 +0000 (GMT) +Received: from broonie by rakim.wolfsonmicro.main with local (Exim 4.72) + (envelope-from <broonie@rakim.wolfsonmicro.main>) + id 1PI2sx-0000C1-Jf; Mon, 15 Nov 2010 17:30:31 +0000 +Content-Disposition: inline +In-Reply-To: <1289840957.16461.138.camel@Joe-Laptop> +X-Cookie: I like your SNOOPY POSTER!! +User-Agent: Mutt/1.5.20 (2009-06-14) +X-BeenThere: alsa-devel@alsa-project.org +X-Mailman-Version: 2.1.9 +Precedence: list +List-Id: "Alsa-devel mailing list for ALSA developers - + http://www.alsa-project.org" <alsa-devel.alsa-project.org> +List-Unsubscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe> +List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel> +List-Post: <mailto:alsa-devel@alsa-project.org> +List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help> +List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> +Sender: alsa-devel-bounces@alsa-project.org +Errors-To: alsa-devel-bounces@alsa-project.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062597> + +On Mon, Nov 15, 2010 at 09:09:17AM -0800, Joe Perches wrote: +> Signed-off-by: Joe Perches <joe@perches.com> + +Applied, thanks. + +Please try to use changelog formats consistent with the code you're +modifying. + + diff --git a/test/corpora/lkml/cur/1382298793.002576:2, b/test/corpora/lkml/cur/1382298793.002576:2, new file mode 100644 index 00000000..6963356d --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002576:2, @@ -0,0 +1,63 @@ +From: Joe Perches <joe@perches.com> +Subject: Re: [PATCH 44/44] sound/soc/codecs: Remove unnecessary semicolons +Date: Mon, 15 Nov 2010 09:34:04 -0800 +Lines: 15 +Message-ID: <1289842444.16461.140.camel@Joe-Laptop> +References: <cover.1289789604.git.joe@perches.com> + <97fd199b7dac50613f6843156687223928cce44a.1289789605.git.joe@perches.com> + <20101115134939.GC12986@rakim.wolfsonmicro.main> + <1289840957.16461.138.camel@Joe-Laptop> + <20101115173031.GI12986@rakim.wolfsonmicro.main> +Mime-Version: 1.0 +Content-Type: text/plain; charset="UTF-8" +Content-Transfer-Encoding: 7bit +Cc: Jiri Kosina <trivial@kernel.org>, + Ian Lartey <ian@opensource.wolfsonmicro.com>, + Dimitris Papastamos <dp@opensource.wolfsonmicro.com>, + Liam Girdwood <lrg@slimlogic.co.uk>, + Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de>, + alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org +To: Mark Brown <broonie@opensource.wolfsonmicro.com> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 18:34:20 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PI2wd-0002wj-Br + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 18:34:19 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S933091Ab0KOReI (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Mon, 15 Nov 2010 12:34:08 -0500 +Received: from mail.perches.com ([173.55.12.10]:1304 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S933013Ab0KOReH (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Mon, 15 Nov 2010 12:34:07 -0500 +Received: from [192.168.1.162] (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 9F71A24368; + Mon, 15 Nov 2010 09:32:18 -0800 (PST) +In-Reply-To: <20101115173031.GI12986@rakim.wolfsonmicro.main> +X-Mailer: Evolution 2.30.3 +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062599> + +On Mon, 2010-11-15 at 17:30 +0000, Mark Brown wrote: +> On Mon, Nov 15, 2010 at 09:09:17AM -0800, Joe Perches wrote: +> > Signed-off-by: Joe Perches <joe@perches.com> +> Applied, thanks. +> Please try to use changelog formats consistent with the code you're +> modifying. + +I think it's more important to use consistent changelogs +for a patch series. + +If you want your own subsystem changelog consistency, I +think you should change the format to what you desire. + +cheers, Joe + + + diff --git a/test/corpora/lkml/cur/1382298793.002639:2, b/test/corpora/lkml/cur/1382298793.002639:2, new file mode 100644 index 00000000..450509df --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002639:2, @@ -0,0 +1,90 @@ +From: Mark Brown <broonie@opensource.wolfsonmicro.com> +Subject: Re: [PATCH 44/44] sound/soc/codecs: Remove unnecessary + semicolons +Date: Mon, 15 Nov 2010 18:27:08 +0000 +Lines: 16 +Message-ID: <20101115182708.GJ12986@rakim.wolfsonmicro.main> +References: <cover.1289789604.git.joe@perches.com> + <97fd199b7dac50613f6843156687223928cce44a.1289789605.git.joe@perches.com> + <20101115134939.GC12986@rakim.wolfsonmicro.main> + <1289840957.16461.138.camel@Joe-Laptop> + <20101115173031.GI12986@rakim.wolfsonmicro.main> + <1289842444.16461.140.camel@Joe-Laptop> +Mime-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Cc: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>, + alsa-devel@alsa-project.org, Jiri Kosina <trivial@kernel.org>, + Takashi Iwai <tiwai@suse.de>, linux-kernel@vger.kernel.org, + Ian Lartey <ian@opensource.wolfsonmicro.com>, + Liam Girdwood <lrg@slimlogic.co.uk> +To: Joe Perches <joe@perches.com> +X-From: alsa-devel-bounces@alsa-project.org Mon Nov 15 19:27:21 2010 +Return-path: <alsa-devel-bounces@alsa-project.org> +Envelope-to: glad-alsa-devel-2@m.gmane.org +Received: from alsa0.perex.cz ([212.20.107.51]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <alsa-devel-bounces@alsa-project.org>) + id 1PI3lw-0007AT-Pq + for glad-alsa-devel-2@m.gmane.org; Mon, 15 Nov 2010 19:27:20 +0100 +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id 35136103873; Mon, 15 Nov 2010 19:27:17 +0100 (CET) +X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on mail1.perex.cz +X-Spam-Level: +X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=disabled + version=3.2.4 +Received: from alsa0.perex.cz (localhost [127.0.0.1]) + by alsa0.perex.cz (Postfix) with ESMTP id B554724525; + Mon, 15 Nov 2010 19:27:11 +0100 (CET) +X-Original-To: alsa-devel@alsa-project.org +Delivered-To: alsa-devel@alsa-project.org +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id D599A24527; Mon, 15 Nov 2010 19:27:10 +0100 (CET) +Received: from opensource2.wolfsonmicro.com (opensource.wolfsonmicro.com + [80.75.67.52]) by alsa0.perex.cz (Postfix) with ESMTP id 5719224414 + for <alsa-devel@alsa-project.org>; Mon, 15 Nov 2010 19:27:10 +0100 (CET) +Received: from rakim.wolfsonmicro.main (lumison.wolfsonmicro.com + [87.246.78.27]) + by opensource2.wolfsonmicro.com (Postfix) with ESMTPSA id C97D2788028; + Mon, 15 Nov 2010 18:27:09 +0000 (GMT) +Received: from broonie by rakim.wolfsonmicro.main with local (Exim 4.72) + (envelope-from <broonie@rakim.wolfsonmicro.main>) + id 1PI3lk-00053D-RZ; Mon, 15 Nov 2010 18:27:08 +0000 +Content-Disposition: inline +In-Reply-To: <1289842444.16461.140.camel@Joe-Laptop> +X-Cookie: I like your SNOOPY POSTER!! +User-Agent: Mutt/1.5.20 (2009-06-14) +X-BeenThere: alsa-devel@alsa-project.org +X-Mailman-Version: 2.1.9 +Precedence: list +List-Id: "Alsa-devel mailing list for ALSA developers - + http://www.alsa-project.org" <alsa-devel.alsa-project.org> +List-Unsubscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe> +List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel> +List-Post: <mailto:alsa-devel@alsa-project.org> +List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help> +List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> +Sender: alsa-devel-bounces@alsa-project.org +Errors-To: alsa-devel-bounces@alsa-project.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062664> + +On Mon, Nov 15, 2010 at 09:34:04AM -0800, Joe Perches wrote: +> On Mon, 2010-11-15 at 17:30 +0000, Mark Brown wrote: + +> > Please try to use changelog formats consistent with the code you're +> > modifying. + +> I think it's more important to use consistent changelogs +> for a patch series. + +...since...? + +> If you want your own subsystem changelog consistency, I +> think you should change the format to what you desire. + +Which is what I'm doing but it's annoying to have to constantly hand +edit changelogs. + + diff --git a/test/corpora/lkml/cur/1382298793.002642:2, b/test/corpora/lkml/cur/1382298793.002642:2, new file mode 100644 index 00000000..1bd4e32c --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002642:2, @@ -0,0 +1,66 @@ +From: Joe Perches <joe@perches.com> +Subject: Re: [PATCH 44/44] sound/soc/codecs: Remove unnecessary semicolons +Date: Mon, 15 Nov 2010 10:30:29 -0800 +Lines: 16 +Message-ID: <1289845830.16461.149.camel@Joe-Laptop> +References: <cover.1289789604.git.joe@perches.com> + <97fd199b7dac50613f6843156687223928cce44a.1289789605.git.joe@perches.com> + <20101115134939.GC12986@rakim.wolfsonmicro.main> + <1289840957.16461.138.camel@Joe-Laptop> + <20101115173031.GI12986@rakim.wolfsonmicro.main> + <1289842444.16461.140.camel@Joe-Laptop> + <20101115182708.GJ12986@rakim.wolfsonmicro.main> +Mime-Version: 1.0 +Content-Type: text/plain; charset="UTF-8" +Content-Transfer-Encoding: 7bit +Cc: Jiri Kosina <trivial@kernel.org>, + Ian Lartey <ian@opensource.wolfsonmicro.com>, + Dimitris Papastamos <dp@opensource.wolfsonmicro.com>, + Liam Girdwood <lrg@slimlogic.co.uk>, + Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de>, + alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org +To: Mark Brown <broonie@opensource.wolfsonmicro.com> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 19:31:55 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PI3qN-0000mO-6u + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 19:31:55 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1758106Ab0KOSad (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Mon, 15 Nov 2010 13:30:33 -0500 +Received: from mail.perches.com ([173.55.12.10]:1314 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1756843Ab0KOSac (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Mon, 15 Nov 2010 13:30:32 -0500 +Received: from [192.168.1.162] (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 2BC7724368; + Mon, 15 Nov 2010 10:28:43 -0800 (PST) +In-Reply-To: <20101115182708.GJ12986@rakim.wolfsonmicro.main> +X-Mailer: Evolution 2.30.3 +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062667> + +On Mon, 2010-11-15 at 18:27 +0000, Mark Brown wrote: +> On Mon, Nov 15, 2010 at 09:34:04AM -0800, Joe Perches wrote: +> > On Mon, 2010-11-15 at 17:30 +0000, Mark Brown wrote: +> > > Please try to use changelog formats consistent with the code you're +> > > modifying. +> > I think it's more important to use consistent changelogs +> > for a patch series. +> ...since...? + +1995... + +Since there isn't a consistent standard for subsystems +changelogs and automating scripts for the desires of +individual subsystem maintainers is not feasible. + + + + diff --git a/test/corpora/lkml/cur/1382298793.002661:2, b/test/corpora/lkml/cur/1382298793.002661:2, new file mode 100644 index 00000000..36f87520 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002661:2, @@ -0,0 +1,49 @@ +From: David Miller <davem@davemloft.net> +Subject: Re: [PATCH 39/44] include/net/caif/cfctrl.h: Remove unnecessary + semicolons +Date: Mon, 15 Nov 2010 11:07:32 -0800 (PST) +Lines: 6 +Message-ID: <20101115.110732.27814339.davem@davemloft.net> +References: <cover.1289789604.git.joe@perches.com> + <35914cfea1bd0ab3963e632d02b1fdd52a9d2bc8.1289789605.git.joe@perches.com> +Mime-Version: 1.0 +Content-Type: Text/Plain; charset=us-ascii +Content-Transfer-Encoding: 7bit +Cc: trivial@kernel.org, sjur.brandeland@stericsson.com, + netdev@vger.kernel.org, linux-kernel@vger.kernel.org +To: joe@perches.com +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 20:07:42 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PI4Oy-0002G6-Lp + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 20:07:41 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S933101Ab0KOTHJ (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Mon, 15 Nov 2010 14:07:09 -0500 +Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:51782 + "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) + by vger.kernel.org with ESMTP id S932513Ab0KOTHI (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Mon, 15 Nov 2010 14:07:08 -0500 +Received: from localhost (localhost [127.0.0.1]) + by sunset.davemloft.net (Postfix) with ESMTP id 71B5924C088; + Mon, 15 Nov 2010 11:07:33 -0800 (PST) +In-Reply-To: <35914cfea1bd0ab3963e632d02b1fdd52a9d2bc8.1289789605.git.joe@perches.com> +X-Mailer: Mew version 6.3 on Emacs 23.1 / Mule 6.0 (HANACHIRUSATO) +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062686> + +From: Joe Perches <joe@perches.com> +Date: Sun, 14 Nov 2010 19:04:58 -0800 + +> Signed-off-by: Joe Perches <joe@perches.com> + +Applied. + + diff --git a/test/corpora/lkml/cur/1382298793.002662:2, b/test/corpora/lkml/cur/1382298793.002662:2, new file mode 100644 index 00000000..2fbb7e7a --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002662:2, @@ -0,0 +1,49 @@ +From: David Miller <davem@davemloft.net> +Subject: Re: [PATCH 41/44] net/ipv6/mcast.c: Remove unnecessary semicolons +Date: Mon, 15 Nov 2010 11:07:39 -0800 (PST) +Lines: 6 +Message-ID: <20101115.110739.191407854.davem@davemloft.net> +References: <cover.1289789604.git.joe@perches.com> + <1f3e1f7e454f3c62b66fc5f3e1e1ed90d62b7fb0.1289789605.git.joe@perches.com> +Mime-Version: 1.0 +Content-Type: Text/Plain; charset=us-ascii +Content-Transfer-Encoding: 7bit +Cc: trivial@kernel.org, kuznet@ms2.inr.ac.ru, pekkas@netcore.fi, + jmorris@namei.org, yoshfuji@linux-ipv6.org, kaber@trash.net, + netdev@vger.kernel.org, linux-kernel@vger.kernel.org +To: joe@perches.com +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 20:07:42 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PI4Oz-0002G6-63 + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 20:07:41 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S933351Ab0KOTHS (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Mon, 15 Nov 2010 14:07:18 -0500 +Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:51792 + "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) + by vger.kernel.org with ESMTP id S933109Ab0KOTHP (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Mon, 15 Nov 2010 14:07:15 -0500 +Received: from localhost (localhost [127.0.0.1]) + by sunset.davemloft.net (Postfix) with ESMTP id 53FFA24C088; + Mon, 15 Nov 2010 11:07:40 -0800 (PST) +In-Reply-To: <1f3e1f7e454f3c62b66fc5f3e1e1ed90d62b7fb0.1289789605.git.joe@perches.com> +X-Mailer: Mew version 6.3 on Emacs 23.1 / Mule 6.0 (HANACHIRUSATO) +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062687> + +From: Joe Perches <joe@perches.com> +Date: Sun, 14 Nov 2010 19:05:00 -0800 + +> Signed-off-by: Joe Perches <joe@perches.com> + +Applied. + + diff --git a/test/corpora/lkml/cur/1382298793.002663:2, b/test/corpora/lkml/cur/1382298793.002663:2, new file mode 100644 index 00000000..c888922c --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002663:2, @@ -0,0 +1,50 @@ +From: David Miller <davem@davemloft.net> +Subject: Re: [PATCH 15/44] drivers/net/vxge: Remove unnecessary semicolons +Date: Mon, 15 Nov 2010 11:07:55 -0800 (PST) +Lines: 6 +Message-ID: <20101115.110755.98889745.davem@davemloft.net> +References: <cover.1289789604.git.joe@perches.com> + <e86e79a18106cc38715136bfb2e880b38f5ac764.1289789604.git.joe@perches.com> +Mime-Version: 1.0 +Content-Type: Text/Plain; charset=us-ascii +Content-Transfer-Encoding: 7bit +Cc: trivial@kernel.org, ramkrishna.vepa@exar.com, + sivakumar.subramani@exar.com, sreenivasa.honnur@exar.com, + jon.mason@exar.com, netdev@vger.kernel.org, + linux-kernel@vger.kernel.org +To: joe@perches.com +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 20:07:42 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PI4P0-0002G6-7S + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 20:07:42 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S933487Ab0KOTHe (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Mon, 15 Nov 2010 14:07:34 -0500 +Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:51805 + "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) + by vger.kernel.org with ESMTP id S933109Ab0KOTHb (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Mon, 15 Nov 2010 14:07:31 -0500 +Received: from localhost (localhost [127.0.0.1]) + by sunset.davemloft.net (Postfix) with ESMTP id 185A124C08A; + Mon, 15 Nov 2010 11:07:56 -0800 (PST) +In-Reply-To: <e86e79a18106cc38715136bfb2e880b38f5ac764.1289789604.git.joe@perches.com> +X-Mailer: Mew version 6.3 on Emacs 23.1 / Mule 6.0 (HANACHIRUSATO) +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062688> + +From: Joe Perches <joe@perches.com> +Date: Sun, 14 Nov 2010 19:04:34 -0800 + +> Signed-off-by: Joe Perches <joe@perches.com> + +Not applicable to net-next-2.6 + + diff --git a/test/corpora/lkml/cur/1382298793.002664:2, b/test/corpora/lkml/cur/1382298793.002664:2, new file mode 100644 index 00000000..ec584cb9 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002664:2, @@ -0,0 +1,49 @@ +From: David Miller <davem@davemloft.net> +Subject: Re: [PATCH 38/44] include/linux/if_macvlan.h: Remove unnecessary + semicolons +Date: Mon, 15 Nov 2010 11:07:46 -0800 (PST) +Lines: 6 +Message-ID: <20101115.110746.241931394.davem@davemloft.net> +References: <cover.1289789604.git.joe@perches.com> + <186ca914f887b2354ea3178696edc81cacbb28c6.1289789605.git.joe@perches.com> +Mime-Version: 1.0 +Content-Type: Text/Plain; charset=us-ascii +Content-Transfer-Encoding: 7bit +Cc: trivial@kernel.org, kaber@trash.net, netdev@vger.kernel.org, + linux-kernel@vger.kernel.org +To: joe@perches.com +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 20:07:42 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PI4Oz-0002G6-MR + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 20:07:42 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S933465Ab0KOTHZ (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Mon, 15 Nov 2010 14:07:25 -0500 +Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:51798 + "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) + by vger.kernel.org with ESMTP id S933109Ab0KOTHV (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Mon, 15 Nov 2010 14:07:21 -0500 +Received: from localhost (localhost [127.0.0.1]) + by sunset.davemloft.net (Postfix) with ESMTP id 665FB24C08A; + Mon, 15 Nov 2010 11:07:46 -0800 (PST) +In-Reply-To: <186ca914f887b2354ea3178696edc81cacbb28c6.1289789605.git.joe@perches.com> +X-Mailer: Mew version 6.3 on Emacs 23.1 / Mule 6.0 (HANACHIRUSATO) +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062689> + +From: Joe Perches <joe@perches.com> +Date: Sun, 14 Nov 2010 19:04:57 -0800 + +> Signed-off-by: Joe Perches <joe@perches.com> + +Applied. + + diff --git a/test/corpora/lkml/cur/1382298793.002665:2, b/test/corpora/lkml/cur/1382298793.002665:2, new file mode 100644 index 00000000..7af81e81 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002665:2, @@ -0,0 +1,98 @@ +From: Mark Brown <broonie@opensource.wolfsonmicro.com> +Subject: Re: [PATCH 44/44] sound/soc/codecs: Remove unnecessary + semicolons +Date: Mon, 15 Nov 2010 19:07:38 +0000 +Lines: 22 +Message-ID: <20101115190738.GF3338@sirena.org.uk> +References: <cover.1289789604.git.joe@perches.com> + <97fd199b7dac50613f6843156687223928cce44a.1289789605.git.joe@perches.com> + <20101115134939.GC12986@rakim.wolfsonmicro.main> + <1289840957.16461.138.camel@Joe-Laptop> + <20101115173031.GI12986@rakim.wolfsonmicro.main> + <1289842444.16461.140.camel@Joe-Laptop> + <20101115182708.GJ12986@rakim.wolfsonmicro.main> + <1289845830.16461.149.camel@Joe-Laptop> +Mime-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Cc: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>, + alsa-devel@alsa-project.org, Jiri Kosina <trivial@kernel.org>, + Takashi Iwai <tiwai@suse.de>, linux-kernel@vger.kernel.org, + Ian Lartey <ian@opensource.wolfsonmicro.com>, + Liam Girdwood <lrg@slimlogic.co.uk> +To: Joe Perches <joe@perches.com> +X-From: alsa-devel-bounces@alsa-project.org Mon Nov 15 20:07:53 2010 +Return-path: <alsa-devel-bounces@alsa-project.org> +Envelope-to: glad-alsa-devel-2@m.gmane.org +Received: from alsa0.perex.cz ([212.20.107.51]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <alsa-devel-bounces@alsa-project.org>) + id 1PI4PA-0002MQ-AO + for glad-alsa-devel-2@m.gmane.org; Mon, 15 Nov 2010 20:07:52 +0100 +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id 78DB02453D; Mon, 15 Nov 2010 20:07:51 +0100 (CET) +X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on mail1.perex.cz +X-Spam-Level: +X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=disabled + version=3.2.4 +Received: from alsa0.perex.cz (localhost [127.0.0.1]) + by alsa0.perex.cz (Postfix) with ESMTP id 07D122453A; + Mon, 15 Nov 2010 20:07:47 +0100 (CET) +X-Original-To: alsa-devel@alsa-project.org +Delivered-To: alsa-devel@alsa-project.org +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id 4AB082453B; Mon, 15 Nov 2010 20:07:45 +0100 (CET) +Received: from cassiel.sirena.org.uk (cassiel.sirena.org.uk [80.68.93.111]) + by alsa0.perex.cz (Postfix) with ESMTP id D864524538 + for <alsa-devel@alsa-project.org>; Mon, 15 Nov 2010 20:07:44 +0100 (CET) +Received: from broonie by cassiel.sirena.org.uk with local (Exim 4.69) + (envelope-from <broonie@sirena.org.uk>) + id 1PI4Ow-0007qS-V5; Mon, 15 Nov 2010 19:07:38 +0000 +Content-Disposition: inline +In-Reply-To: <1289845830.16461.149.camel@Joe-Laptop> +X-Cookie: Who messed with my anti-paranoia shot? +User-Agent: Mutt/1.5.18 (2008-05-17) +X-SA-Exim-Connect-IP: <locally generated> +X-SA-Exim-Mail-From: broonie@sirena.org.uk +X-SA-Exim-Scanned: No (on cassiel.sirena.org.uk); + SAEximRunCond expanded to false +X-BeenThere: alsa-devel@alsa-project.org +X-Mailman-Version: 2.1.9 +Precedence: list +List-Id: "Alsa-devel mailing list for ALSA developers - + http://www.alsa-project.org" <alsa-devel.alsa-project.org> +List-Unsubscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe> +List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel> +List-Post: <mailto:alsa-devel@alsa-project.org> +List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help> +List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> +Sender: alsa-devel-bounces@alsa-project.org +Errors-To: alsa-devel-bounces@alsa-project.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062690> + +On Mon, Nov 15, 2010 at 10:30:29AM -0800, Joe Perches wrote: +> On Mon, 2010-11-15 at 18:27 +0000, Mark Brown wrote: +> > On Mon, Nov 15, 2010 at 09:34:04AM -0800, Joe Perches wrote: + +> > > I think it's more important to use consistent changelogs +> > > for a patch series. + +> > ...since...? + +> 1995... + +That's not really a reason. It seems that... + +> Since there isn't a consistent standard for subsystems +> changelogs and automating scripts for the desires of +> individual subsystem maintainers is not feasible. + +...you mean that you wish to do this since it makes your life as a +script author easier. I'd suggest using pattern matching to look up the +rules for generating the prefixes (it's pretty much entirely prefixes) +in the same way you're handling figuring out who to mail - that'd +probably cover it in an automatable fashion. + + diff --git a/test/corpora/lkml/cur/1382298793.002666:2, b/test/corpora/lkml/cur/1382298793.002666:2, new file mode 100644 index 00000000..8907c252 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002666:2, @@ -0,0 +1,87 @@ +From: David Miller <davem@davemloft.net> +Subject: Re: [PATCH 13/44] drivers/net/e1000e: Remove + unnecessary semicolons +Date: Mon, 15 Nov 2010 11:08:27 -0800 (PST) +Lines: 19 +Message-ID: <20101115.110827.58428696.davem@davemloft.net> +References: <cover.1289789604.git.joe@perches.com> + <e5cf92d50de7924930d660a5865c3d60d9cd9dc5.1289789604.git.joe@perches.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Cc: trivial@kernel.org, e1000-devel@lists.sourceforge.net, + bruce.w.allan@intel.com, jesse.brandeburg@intel.com, + linux-kernel@vger.kernel.org, gregory.v.rose@intel.com, + john.ronciak@intel.com, jeffrey.t.kirsher@intel.com, netdev@vger.kernel.org +To: joe@perches.com +X-From: e1000-devel-bounces@lists.sourceforge.net Mon Nov 15 20:08:15 2010 +Return-path: <e1000-devel-bounces@lists.sourceforge.net> +Envelope-to: glded-e1000-devel@m.gmane.org +Received: from lists.sourceforge.net ([216.34.181.88]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <e1000-devel-bounces@lists.sourceforge.net>) + id 1PI4PW-0002W0-GR + for glded-e1000-devel@m.gmane.org; Mon, 15 Nov 2010 20:08:14 +0100 +Received: from localhost ([127.0.0.1] helo=sfs-ml-2.v29.ch3.sourceforge.com) + by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.69) + (envelope-from <e1000-devel-bounces@lists.sourceforge.net>) + id 1PI4PV-0002fQ-W8; Mon, 15 Nov 2010 19:08:13 +0000 +Received: from sog-mx-3.v43.ch3.sourceforge.com ([172.29.43.193] + helo=mx.sourceforge.net) + by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.69) + (envelope-from <davem@davemloft.net>) id 1PI4PU-0002fJ-Ct + for e1000-devel@lists.sourceforge.net; Mon, 15 Nov 2010 19:08:12 +0000 +X-ACL-Warn: +Received: from 74-93-104-97-washington.hfc.comcastbusiness.net ([74.93.104.97] + helo=sunset.davemloft.net) + by sog-mx-3.v43.ch3.sourceforge.com with esmtp (Exim 4.69) + id 1PI4PQ-0006vK-9a + for e1000-devel@lists.sourceforge.net; Mon, 15 Nov 2010 19:08:12 +0000 +Received: from localhost (localhost [127.0.0.1]) + by sunset.davemloft.net (Postfix) with ESMTP id 0BCD224C088; + Mon, 15 Nov 2010 11:08:28 -0800 (PST) +In-Reply-To: <e5cf92d50de7924930d660a5865c3d60d9cd9dc5.1289789604.git.joe@perches.com> +X-Mailer: Mew version 6.3 on Emacs 23.1 / Mule 6.0 (HANACHIRUSATO) +X-Spam-Score: 0.8 (/) +X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. + See http://spamassassin.org/tag/ for more details. + 1.0 RDNS_DYNAMIC Delivered to internal network by host with + dynamic-looking rDNS + -0.2 AWL AWL: From: address is in the auto white-list +X-Headers-End: 1PI4PQ-0006vK-9a +X-BeenThere: e1000-devel@lists.sourceforge.net +X-Mailman-Version: 2.1.9 +Precedence: list +List-Id: "e100/e1000\(e\)/ixgb/igb/ixgbe development and discussion" + <e1000-devel.lists.sourceforge.net> +List-Unsubscribe: <https://lists.sourceforge.net/lists/listinfo/e1000-devel>, + <mailto:e1000-devel-request@lists.sourceforge.net?subject=unsubscribe> +List-Archive: <http://sourceforge.net/mailarchive/forum.php?forum_name=e1000-devel> +List-Post: <mailto:e1000-devel@lists.sourceforge.net> +List-Help: <mailto:e1000-devel-request@lists.sourceforge.net?subject=help> +List-Subscribe: <https://lists.sourceforge.net/lists/listinfo/e1000-devel>, + <mailto:e1000-devel-request@lists.sourceforge.net?subject=subscribe> +Errors-To: e1000-devel-bounces@lists.sourceforge.net +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062691> + +From: Joe Perches <joe@perches.com> +Date: Sun, 14 Nov 2010 19:04:32 -0800 + +> Signed-off-by: Joe Perches <joe@perches.com> + +Applied. + +------------------------------------------------------------------------------ +Centralized Desktop Delivery: Dell and VMware Reference Architecture +Simplifying enterprise desktop deployment and management using +Dell EqualLogic storage and VMware View: A highly scalable, end-to-end +client virtualization framework. Read more! +http://p.sf.net/sfu/dell-eql-dev2dev +_______________________________________________ +E1000-devel mailing list +E1000-devel@lists.sourceforge.net +https://lists.sourceforge.net/lists/listinfo/e1000-devel +To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired + + + diff --git a/test/corpora/lkml/cur/1382298793.002667:2, b/test/corpora/lkml/cur/1382298793.002667:2, new file mode 100644 index 00000000..c85cbd51 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002667:2, @@ -0,0 +1,87 @@ +From: David Miller <davem@davemloft.net> +Subject: Re: [PATCH 14/44] drivers/net/ixgbe: Remove + unnecessary semicolons +Date: Mon, 15 Nov 2010 11:08:21 -0800 (PST) +Lines: 19 +Message-ID: <20101115.110821.13743893.davem@davemloft.net> +References: <cover.1289789604.git.joe@perches.com> + <7d2c334daa75c5221946a17d45c9de1901cf06e7.1289789604.git.joe@perches.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Cc: trivial@kernel.org, e1000-devel@lists.sourceforge.net, + bruce.w.allan@intel.com, jesse.brandeburg@intel.com, + linux-kernel@vger.kernel.org, gregory.v.rose@intel.com, + john.ronciak@intel.com, jeffrey.t.kirsher@intel.com, netdev@vger.kernel.org +To: joe@perches.com +X-From: e1000-devel-bounces@lists.sourceforge.net Mon Nov 15 20:08:15 2010 +Return-path: <e1000-devel-bounces@lists.sourceforge.net> +Envelope-to: glded-e1000-devel@m.gmane.org +Received: from lists.sourceforge.net ([216.34.181.88]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <e1000-devel-bounces@lists.sourceforge.net>) + id 1PI4PW-0002Vz-9H + for glded-e1000-devel@m.gmane.org; Mon, 15 Nov 2010 20:08:14 +0100 +Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com) + by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.69) + (envelope-from <e1000-devel-bounces@lists.sourceforge.net>) + id 1PI4PQ-0008VG-9t; Mon, 15 Nov 2010 19:08:08 +0000 +Received: from sog-mx-1.v43.ch3.sourceforge.com ([172.29.43.191] + helo=mx.sourceforge.net) + by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.69) + (envelope-from <davem@davemloft.net>) id 1PI4PO-0008V9-I9 + for e1000-devel@lists.sourceforge.net; Mon, 15 Nov 2010 19:08:06 +0000 +X-ACL-Warn: +Received: from 74-93-104-97-washington.hfc.comcastbusiness.net ([74.93.104.97] + helo=sunset.davemloft.net) + by sog-mx-1.v43.ch3.sourceforge.com with esmtp (Exim 4.69) + id 1PI4PK-0004Ab-D0 + for e1000-devel@lists.sourceforge.net; Mon, 15 Nov 2010 19:08:06 +0000 +Received: from localhost (localhost [127.0.0.1]) + by sunset.davemloft.net (Postfix) with ESMTP id E0AE124C08A; + Mon, 15 Nov 2010 11:08:21 -0800 (PST) +In-Reply-To: <7d2c334daa75c5221946a17d45c9de1901cf06e7.1289789604.git.joe@perches.com> +X-Mailer: Mew version 6.3 on Emacs 23.1 / Mule 6.0 (HANACHIRUSATO) +X-Spam-Score: 0.7 (/) +X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. + See http://spamassassin.org/tag/ for more details. + 1.0 RDNS_DYNAMIC Delivered to internal network by host with + dynamic-looking rDNS + -0.3 AWL AWL: From: address is in the auto white-list +X-Headers-End: 1PI4PK-0004Ab-D0 +X-BeenThere: e1000-devel@lists.sourceforge.net +X-Mailman-Version: 2.1.9 +Precedence: list +List-Id: "e100/e1000\(e\)/ixgb/igb/ixgbe development and discussion" + <e1000-devel.lists.sourceforge.net> +List-Unsubscribe: <https://lists.sourceforge.net/lists/listinfo/e1000-devel>, + <mailto:e1000-devel-request@lists.sourceforge.net?subject=unsubscribe> +List-Archive: <http://sourceforge.net/mailarchive/forum.php?forum_name=e1000-devel> +List-Post: <mailto:e1000-devel@lists.sourceforge.net> +List-Help: <mailto:e1000-devel-request@lists.sourceforge.net?subject=help> +List-Subscribe: <https://lists.sourceforge.net/lists/listinfo/e1000-devel>, + <mailto:e1000-devel-request@lists.sourceforge.net?subject=subscribe> +Errors-To: e1000-devel-bounces@lists.sourceforge.net +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062692> + +From: Joe Perches <joe@perches.com> +Date: Sun, 14 Nov 2010 19:04:33 -0800 + +> Signed-off-by: Joe Perches <joe@perches.com> + +Applied. + +------------------------------------------------------------------------------ +Centralized Desktop Delivery: Dell and VMware Reference Architecture +Simplifying enterprise desktop deployment and management using +Dell EqualLogic storage and VMware View: A highly scalable, end-to-end +client virtualization framework. Read more! +http://p.sf.net/sfu/dell-eql-dev2dev +_______________________________________________ +E1000-devel mailing list +E1000-devel@lists.sourceforge.net +https://lists.sourceforge.net/lists/listinfo/e1000-devel +To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired + + + diff --git a/test/corpora/lkml/cur/1382298793.002668:2, b/test/corpora/lkml/cur/1382298793.002668:2, new file mode 100644 index 00000000..a4537440 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002668:2, @@ -0,0 +1,50 @@ +From: David Miller <davem@davemloft.net> +Subject: Re: [PATCH 21/44] drivers/s390/net: Remove unnecessary semicolons +Date: Mon, 15 Nov 2010 11:08:10 -0800 (PST) +Lines: 6 +Message-ID: <20101115.110810.241442235.davem@davemloft.net> +References: <cover.1289789604.git.joe@perches.com> + <ea09773876fb36a52a9a750110b381d20767ac12.1289789605.git.joe@perches.com> +Mime-Version: 1.0 +Content-Type: Text/Plain; charset=us-ascii +Content-Transfer-Encoding: 7bit +Cc: trivial@kernel.org, ursula.braun@de.ibm.com, + blaschka@linux.vnet.ibm.com, linux390@de.ibm.com, + schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com, + linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org +To: joe@perches.com +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 20:09:11 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PI4QQ-00030Y-IU + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 20:09:10 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S933525Ab0KOTHt (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Mon, 15 Nov 2010 14:07:49 -0500 +Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:51810 + "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) + by vger.kernel.org with ESMTP id S933071Ab0KOTHp (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Mon, 15 Nov 2010 14:07:45 -0500 +Received: from localhost (localhost [127.0.0.1]) + by sunset.davemloft.net (Postfix) with ESMTP id 79DC124C088; + Mon, 15 Nov 2010 11:08:10 -0800 (PST) +In-Reply-To: <ea09773876fb36a52a9a750110b381d20767ac12.1289789605.git.joe@perches.com> +X-Mailer: Mew version 6.3 on Emacs 23.1 / Mule 6.0 (HANACHIRUSATO) +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062693> + +From: Joe Perches <joe@perches.com> +Date: Sun, 14 Nov 2010 19:04:40 -0800 + +> Signed-off-by: Joe Perches <joe@perches.com> + +I'll let the s390 folks take this one. + + diff --git a/test/corpora/lkml/cur/1382298793.002669:2, b/test/corpora/lkml/cur/1382298793.002669:2, new file mode 100644 index 00000000..f595d0a8 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002669:2, @@ -0,0 +1,48 @@ +From: David Miller <davem@davemloft.net> +Subject: Re: [PATCH 18/44] drivers/net/cnic.c: Remove unnecessary semicolons +Date: Mon, 15 Nov 2010 11:08:15 -0800 (PST) +Lines: 6 +Message-ID: <20101115.110815.52192986.davem@davemloft.net> +References: <cover.1289789604.git.joe@perches.com> + <950331e47b16c2ad28d73502f30f5a0f017b5493.1289789604.git.joe@perches.com> +Mime-Version: 1.0 +Content-Type: Text/Plain; charset=us-ascii +Content-Transfer-Encoding: 7bit +Cc: trivial@kernel.org, netdev@vger.kernel.org, + linux-kernel@vger.kernel.org +To: joe@perches.com +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 20:09:11 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PI4QR-00030Y-3C + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 20:09:11 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S933539Ab0KOTHy (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Mon, 15 Nov 2010 14:07:54 -0500 +Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:51817 + "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) + by vger.kernel.org with ESMTP id S933054Ab0KOTHv (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Mon, 15 Nov 2010 14:07:51 -0500 +Received: from localhost (localhost [127.0.0.1]) + by sunset.davemloft.net (Postfix) with ESMTP id 0297924C08A; + Mon, 15 Nov 2010 11:08:16 -0800 (PST) +In-Reply-To: <950331e47b16c2ad28d73502f30f5a0f017b5493.1289789604.git.joe@perches.com> +X-Mailer: Mew version 6.3 on Emacs 23.1 / Mule 6.0 (HANACHIRUSATO) +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062694> + +From: Joe Perches <joe@perches.com> +Date: Sun, 14 Nov 2010 19:04:37 -0800 + +> Signed-off-by: Joe Perches <joe@perches.com> + +Applied. + + diff --git a/test/corpora/lkml/cur/1382298793.002670:2, b/test/corpora/lkml/cur/1382298793.002670:2, new file mode 100644 index 00000000..964ba859 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002670:2, @@ -0,0 +1,52 @@ +From: David Miller <davem@davemloft.net> +Subject: Re: [PATCH 07/44] drivers/isdn: Remove unnecessary semicolons +Date: Mon, 15 Nov 2010 11:08:40 -0800 (PST) +Lines: 11 +Message-ID: <20101115.110840.45901337.davem@davemloft.net> +References: <cover.1289789604.git.joe@perches.com> + <c7a38f65340aafb208d50fc3a781602c07aebb0c.1289789604.git.joe@perches.com> +Mime-Version: 1.0 +Content-Type: Text/Plain; charset=us-ascii +Content-Transfer-Encoding: 7bit +Cc: trivial@kernel.org, isdn@linux-pingi.de, netdev@vger.kernel.org, + linux-kernel@vger.kernel.org +To: joe@perches.com +X-From: netdev-owner@vger.kernel.org Mon Nov 15 20:09:14 2010 +Return-path: <netdev-owner@vger.kernel.org> +Envelope-to: linux-netdev-2@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <netdev-owner@vger.kernel.org>) + id 1PI4QU-00030Y-5P + for linux-netdev-2@lo.gmane.org; Mon, 15 Nov 2010 20:09:14 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S933584Ab0KOTIR (ORCPT <rfc822;linux-netdev-2@m.gmane.org>); + Mon, 15 Nov 2010 14:08:17 -0500 +Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:51842 + "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) + by vger.kernel.org with ESMTP id S933494Ab0KOTIP (ORCPT + <rfc822;netdev@vger.kernel.org>); Mon, 15 Nov 2010 14:08:15 -0500 +Received: from localhost (localhost [127.0.0.1]) + by sunset.davemloft.net (Postfix) with ESMTP id 88D8924C088; + Mon, 15 Nov 2010 11:08:40 -0800 (PST) +In-Reply-To: <c7a38f65340aafb208d50fc3a781602c07aebb0c.1289789604.git.joe@perches.com> +X-Mailer: Mew version 6.3 on Emacs 23.1 / Mule 6.0 (HANACHIRUSATO) +Sender: netdev-owner@vger.kernel.org +Precedence: bulk +List-ID: <netdev.vger.kernel.org> +X-Mailing-List: netdev@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062695> + +From: Joe Perches <joe@perches.com> +Date: Sun, 14 Nov 2010 19:04:26 -0800 + +> Signed-off-by: Joe Perches <joe@perches.com> + +Applied. +-- +To unsubscribe from this list: send the line "unsubscribe netdev" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + + diff --git a/test/corpora/lkml/cur/1382298793.002671:2, b/test/corpora/lkml/cur/1382298793.002671:2, new file mode 100644 index 00000000..1fe0cc55 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002671:2, @@ -0,0 +1,48 @@ +From: David Miller <davem@davemloft.net> +Subject: Re: [PATCH 12/44] drivers/net/bnx2x: Remove unnecessary semicolons +Date: Mon, 15 Nov 2010 11:08:34 -0800 (PST) +Lines: 6 +Message-ID: <20101115.110834.91340564.davem@davemloft.net> +References: <cover.1289789604.git.joe@perches.com> + <2bfaf1f1fe5d503a8a386a433b5187997819d771.1289789604.git.joe@perches.com> +Mime-Version: 1.0 +Content-Type: Text/Plain; charset=us-ascii +Content-Transfer-Encoding: 7bit +Cc: trivial@kernel.org, eilong@broadcom.com, netdev@vger.kernel.org, + linux-kernel@vger.kernel.org +To: joe@perches.com +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 20:09:14 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PI4QT-00030Y-LK + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 20:09:13 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S933575Ab0KOTIN (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Mon, 15 Nov 2010 14:08:13 -0500 +Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:51836 + "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) + by vger.kernel.org with ESMTP id S933449Ab0KOTIJ (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Mon, 15 Nov 2010 14:08:09 -0500 +Received: from localhost (localhost [127.0.0.1]) + by sunset.davemloft.net (Postfix) with ESMTP id 8FAC824C08A; + Mon, 15 Nov 2010 11:08:34 -0800 (PST) +In-Reply-To: <2bfaf1f1fe5d503a8a386a433b5187997819d771.1289789604.git.joe@perches.com> +X-Mailer: Mew version 6.3 on Emacs 23.1 / Mule 6.0 (HANACHIRUSATO) +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062696> + +From: Joe Perches <joe@perches.com> +Date: Sun, 14 Nov 2010 19:04:31 -0800 + +> Signed-off-by: Joe Perches <joe@perches.com> + +Applied. + + diff --git a/test/corpora/lkml/cur/1382298793.002679:2, b/test/corpora/lkml/cur/1382298793.002679:2, new file mode 100644 index 00000000..8e1234b6 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002679:2, @@ -0,0 +1,61 @@ +From: Joe Perches <joe@perches.com> +Subject: Re: [PATCH 44/44] sound/soc/codecs: Remove unnecessary semicolons +Date: Mon, 15 Nov 2010 11:14:18 -0800 +Lines: 9 +Message-ID: <1289848458.16461.150.camel@Joe-Laptop> +References: <cover.1289789604.git.joe@perches.com> + <97fd199b7dac50613f6843156687223928cce44a.1289789605.git.joe@perches.com> + <20101115134939.GC12986@rakim.wolfsonmicro.main> + <1289840957.16461.138.camel@Joe-Laptop> + <20101115173031.GI12986@rakim.wolfsonmicro.main> + <1289842444.16461.140.camel@Joe-Laptop> + <20101115182708.GJ12986@rakim.wolfsonmicro.main> + <1289845830.16461.149.camel@Joe-Laptop> + <20101115190738.GF3338@sirena.org.uk> +Mime-Version: 1.0 +Content-Type: text/plain; charset="UTF-8" +Content-Transfer-Encoding: 7bit +Cc: Jiri Kosina <trivial@kernel.org>, + Ian Lartey <ian@opensource.wolfsonmicro.com>, + Dimitris Papastamos <dp@opensource.wolfsonmicro.com>, + Liam Girdwood <lrg@slimlogic.co.uk>, + Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de>, + alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org +To: Mark Brown <broonie@opensource.wolfsonmicro.com> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 20:14:49 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PI4Vp-0006HI-NH + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 20:14:46 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S933566Ab0KOTOW (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Mon, 15 Nov 2010 14:14:22 -0500 +Received: from mail.perches.com ([173.55.12.10]:1319 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S933505Ab0KOTOV (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Mon, 15 Nov 2010 14:14:21 -0500 +Received: from [192.168.1.162] (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 4087C24368; + Mon, 15 Nov 2010 11:12:31 -0800 (PST) +In-Reply-To: <20101115190738.GF3338@sirena.org.uk> +X-Mailer: Evolution 2.30.3 +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062704> + +On Mon, 2010-11-15 at 19:07 +0000, Mark Brown wrote: +> I'd suggest using pattern matching to look up the +> rules for generating the prefixes (it's pretty much entirely prefixes) +> in the same way you're handling figuring out who to mail - that'd +> probably cover it in an automatable fashion. + +Publish a tool that works and I'll use it. + + + + diff --git a/test/corpora/lkml/cur/1382298793.002688:2, b/test/corpora/lkml/cur/1382298793.002688:2, new file mode 100644 index 00000000..7d573a09 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002688:2, @@ -0,0 +1,94 @@ +From: Mark Brown <broonie@opensource.wolfsonmicro.com> +Subject: Re: [PATCH 44/44] sound/soc/codecs: Remove unnecessary + semicolons +Date: Mon, 15 Nov 2010 19:34:07 +0000 +Lines: 16 +Message-ID: <20101115193407.GK12986@rakim.wolfsonmicro.main> +References: <cover.1289789604.git.joe@perches.com> + <97fd199b7dac50613f6843156687223928cce44a.1289789605.git.joe@perches.com> + <20101115134939.GC12986@rakim.wolfsonmicro.main> + <1289840957.16461.138.camel@Joe-Laptop> + <20101115173031.GI12986@rakim.wolfsonmicro.main> + <1289842444.16461.140.camel@Joe-Laptop> + <20101115182708.GJ12986@rakim.wolfsonmicro.main> + <1289845830.16461.149.camel@Joe-Laptop> + <20101115190738.GF3338@sirena.org.uk> + <1289848458.16461.150.camel@Joe-Laptop> +Mime-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Cc: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>, + alsa-devel@alsa-project.org, Jiri Kosina <trivial@kernel.org>, + Takashi Iwai <tiwai@suse.de>, linux-kernel@vger.kernel.org, + Ian Lartey <ian@opensource.wolfsonmicro.com>, + Liam Girdwood <lrg@slimlogic.co.uk> +To: Joe Perches <joe@perches.com> +X-From: alsa-devel-bounces@alsa-project.org Mon Nov 15 20:34:23 2010 +Return-path: <alsa-devel-bounces@alsa-project.org> +Envelope-to: glad-alsa-devel-2@m.gmane.org +Received: from alsa0.perex.cz ([212.20.107.51]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <alsa-devel-bounces@alsa-project.org>) + id 1PI4oo-0008LE-En + for glad-alsa-devel-2@m.gmane.org; Mon, 15 Nov 2010 20:34:22 +0100 +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id 9B9BF24551; Mon, 15 Nov 2010 20:34:21 +0100 (CET) +X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on mail1.perex.cz +X-Spam-Level: +X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=disabled + version=3.2.4 +Received: from alsa0.perex.cz (localhost [127.0.0.1]) + by alsa0.perex.cz (Postfix) with ESMTP id 7F6F424547; + Mon, 15 Nov 2010 20:34:16 +0100 (CET) +X-Original-To: alsa-devel@alsa-project.org +Delivered-To: alsa-devel@alsa-project.org +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id 4D4F724548; Mon, 15 Nov 2010 20:34:14 +0100 (CET) +Received: from opensource2.wolfsonmicro.com (opensource.wolfsonmicro.com + [80.75.67.52]) by alsa0.perex.cz (Postfix) with ESMTP id 9C6502453F + for <alsa-devel@alsa-project.org>; Mon, 15 Nov 2010 20:34:09 +0100 (CET) +Received: from rakim.wolfsonmicro.main (lumison.wolfsonmicro.com + [87.246.78.27]) + by opensource2.wolfsonmicro.com (Postfix) with ESMTPSA id 992AA788028; + Mon, 15 Nov 2010 19:34:08 +0000 (GMT) +Received: from broonie by rakim.wolfsonmicro.main with local (Exim 4.72) + (envelope-from <broonie@rakim.wolfsonmicro.main>) + id 1PI4oZ-0005Qk-Q4; Mon, 15 Nov 2010 19:34:07 +0000 +Content-Disposition: inline +In-Reply-To: <1289848458.16461.150.camel@Joe-Laptop> +X-Cookie: I like your SNOOPY POSTER!! +User-Agent: Mutt/1.5.20 (2009-06-14) +X-BeenThere: alsa-devel@alsa-project.org +X-Mailman-Version: 2.1.9 +Precedence: list +List-Id: "Alsa-devel mailing list for ALSA developers - + http://www.alsa-project.org" <alsa-devel.alsa-project.org> +List-Unsubscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe> +List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel> +List-Post: <mailto:alsa-devel@alsa-project.org> +List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help> +List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> +Sender: alsa-devel-bounces@alsa-project.org +Errors-To: alsa-devel-bounces@alsa-project.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062713> + +On Mon, Nov 15, 2010 at 11:14:18AM -0800, Joe Perches wrote: +> On Mon, 2010-11-15 at 19:07 +0000, Mark Brown wrote: + +> > I'd suggest using pattern matching to look up the +> > rules for generating the prefixes (it's pretty much entirely prefixes) +> > in the same way you're handling figuring out who to mail - that'd +> > probably cover it in an automatable fashion. + +> Publish a tool that works and I'll use it. + +It appears your scripts are already hooked into get_maintainers.pl which +would seem the obvious place to do this? Sadly I don't do perl, though +it looks like you're doing pretty much all the work on that anyway. + +The main thing here is to avoid your patches sticking out - as well as +the hassle applying them stuff like this is also a red flag on review. + + diff --git a/test/corpora/lkml/cur/1382298793.002699:2, b/test/corpora/lkml/cur/1382298793.002699:2, new file mode 100644 index 00000000..3fdfaf11 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.002699:2, @@ -0,0 +1,106 @@ +From: Joe Perches <joe@perches.com> +Subject: Re: [PATCH 44/44] sound/soc/codecs: Remove unnecessary semicolons +Date: Mon, 15 Nov 2010 11:52:53 -0800 +Lines: 52 +Message-ID: <1289850773.16461.166.camel@Joe-Laptop> +References: <cover.1289789604.git.joe@perches.com> + <97fd199b7dac50613f6843156687223928cce44a.1289789605.git.joe@perches.com> + <20101115134939.GC12986@rakim.wolfsonmicro.main> + <1289840957.16461.138.camel@Joe-Laptop> + <20101115173031.GI12986@rakim.wolfsonmicro.main> + <1289842444.16461.140.camel@Joe-Laptop> + <20101115182708.GJ12986@rakim.wolfsonmicro.main> + <1289845830.16461.149.camel@Joe-Laptop> + <20101115190738.GF3338@sirena.org.uk> + <1289848458.16461.150.camel@Joe-Laptop> + <20101115193407.GK12986@rakim.wolfsonmicro.main> +Mime-Version: 1.0 +Content-Type: text/plain; charset="UTF-8" +Content-Transfer-Encoding: 7bit +Cc: Jiri Kosina <trivial@kernel.org>, + Ian Lartey <ian@opensource.wolfsonmicro.com>, + Dimitris Papastamos <dp@opensource.wolfsonmicro.com>, + Liam Girdwood <lrg@slimlogic.co.uk>, + Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de>, + alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org +To: Mark Brown <broonie@opensource.wolfsonmicro.com> +X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 20:53:21 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PI57A-0001v9-CG + for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 20:53:20 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S932871Ab0KOTw5 (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Mon, 15 Nov 2010 14:52:57 -0500 +Received: from mail.perches.com ([173.55.12.10]:1328 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1758222Ab0KOTw4 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Mon, 15 Nov 2010 14:52:56 -0500 +Received: from [192.168.1.162] (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id CE13524368; + Mon, 15 Nov 2010 11:51:05 -0800 (PST) +In-Reply-To: <20101115193407.GK12986@rakim.wolfsonmicro.main> +X-Mailer: Evolution 2.30.3 +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062724> + +On Mon, 2010-11-15 at 19:34 +0000, Mark Brown wrote: +> On Mon, Nov 15, 2010 at 11:14:18AM -0800, Joe Perches wrote: +> > On Mon, 2010-11-15 at 19:07 +0000, Mark Brown wrote: +> > > I'd suggest using pattern matching to look up the +> > > rules for generating the prefixes (it's pretty much entirely prefixes) +> > > in the same way you're handling figuring out who to mail - that'd +> > > probably cover it in an automatable fashion. +> > Publish a tool that works and I'll use it. +> It appears your scripts are already hooked into get_maintainers.pl which +> would seem the obvious place to do this? Sadly I don't do perl, though +> it looks like you're doing pretty much all the work on that anyway. + +Sadly, no it's not the right place. + +That script just generates cc email addresses +for pre-formatted commit patches. + +It'd have to be a script that modifies the git commit subject line +to the taste of the subsystem maintainer. + +Right now, I use a commit script that's something like: + +#!/bin/bash +echo "$1: Remove unnecessary semicolons" > msg +echo >> msg +#cat >> msg <<EOF +#Unnecessary semicolons should not exist. +#EOF +git commit -s -F msg $1 + +There could be a modification to $1 (path) +or some such. + +Maybe a script like +./scripts/convert_commit_subject_to_subsystem_maintainer_taste +or something. + +Care to write one in sh/bash/perl/python/c/ocaml/c#? + +As far as I know, the only subsystem pedants^H^H^H^H^Hople +that care much about the commit subject style are +arch/x86 and sound. + +I can understand the desire of these subsystem maintainers +to have a consistent style. I think though that requiring +a subject header style without providing more than a +general guideline is a but much. + +I'd use any other automated tool you want to provide. + +cheers, Joe + + + diff --git a/test/corpora/lkml/cur/1382298793.003013:2, b/test/corpora/lkml/cur/1382298793.003013:2, new file mode 100644 index 00000000..945ce7c5 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.003013:2, @@ -0,0 +1,128 @@ +From: Mark Brown <broonie@opensource.wolfsonmicro.com> +Subject: Re: [PATCH 44/44] sound/soc/codecs: Remove unnecessary + semicolons +Date: Tue, 16 Nov 2010 10:49:22 +0000 +Lines: 50 +Message-ID: <20101116104921.GL12986@rakim.wolfsonmicro.main> +References: <20101115134939.GC12986@rakim.wolfsonmicro.main> + <1289840957.16461.138.camel@Joe-Laptop> + <20101115173031.GI12986@rakim.wolfsonmicro.main> + <1289842444.16461.140.camel@Joe-Laptop> + <20101115182708.GJ12986@rakim.wolfsonmicro.main> + <1289845830.16461.149.camel@Joe-Laptop> + <20101115190738.GF3338@sirena.org.uk> + <1289848458.16461.150.camel@Joe-Laptop> + <20101115193407.GK12986@rakim.wolfsonmicro.main> + <1289850773.16461.166.camel@Joe-Laptop> +Mime-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Cc: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>, + alsa-devel@alsa-project.org, Jiri Kosina <trivial@kernel.org>, + Takashi Iwai <tiwai@suse.de>, linux-kernel@vger.kernel.org, + Ian Lartey <ian@opensource.wolfsonmicro.com>, + Liam Girdwood <lrg@slimlogic.co.uk> +To: Joe Perches <joe@perches.com> +X-From: alsa-devel-bounces@alsa-project.org Tue Nov 16 11:49:29 2010 +Return-path: <alsa-devel-bounces@alsa-project.org> +Envelope-to: glad-alsa-devel-2@m.gmane.org +Received: from alsa0.perex.cz ([212.20.107.51]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <alsa-devel-bounces@alsa-project.org>) + id 1PIJ6O-0003Hl-Gx + for glad-alsa-devel-2@m.gmane.org; Tue, 16 Nov 2010 11:49:28 +0100 +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id C3B89243EB; Tue, 16 Nov 2010 11:49:27 +0100 (CET) +X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on mail1.perex.cz +X-Spam-Level: +X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=disabled + version=3.2.4 +Received: from alsa0.perex.cz (localhost [127.0.0.1]) + by alsa0.perex.cz (Postfix) with ESMTP id 5204E243EB; + Tue, 16 Nov 2010 11:49:26 +0100 (CET) +X-Original-To: alsa-devel@alsa-project.org +Delivered-To: alsa-devel@alsa-project.org +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id D1E2E243EC; Tue, 16 Nov 2010 11:49:24 +0100 (CET) +Received: from opensource2.wolfsonmicro.com (opensource.wolfsonmicro.com + [80.75.67.52]) by alsa0.perex.cz (Postfix) with ESMTP id 16268243EA + for <alsa-devel@alsa-project.org>; Tue, 16 Nov 2010 11:49:24 +0100 (CET) +Received: from rakim.wolfsonmicro.main (lumison.wolfsonmicro.com + [87.246.78.27]) + by opensource2.wolfsonmicro.com (Postfix) with ESMTPSA id 4AC4E3B438A; + Tue, 16 Nov 2010 10:49:23 +0000 (GMT) +Received: from broonie by rakim.wolfsonmicro.main with local (Exim 4.72) + (envelope-from <broonie@rakim.wolfsonmicro.main>) + id 1PIJ6I-0001Kz-Cf; Tue, 16 Nov 2010 10:49:22 +0000 +Content-Disposition: inline +In-Reply-To: <1289850773.16461.166.camel@Joe-Laptop> +X-Cookie: I like your SNOOPY POSTER!! +User-Agent: Mutt/1.5.20 (2009-06-14) +X-BeenThere: alsa-devel@alsa-project.org +X-Mailman-Version: 2.1.9 +Precedence: list +List-Id: "Alsa-devel mailing list for ALSA developers - + http://www.alsa-project.org" <alsa-devel.alsa-project.org> +List-Unsubscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe> +List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel> +List-Post: <mailto:alsa-devel@alsa-project.org> +List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help> +List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> +Sender: alsa-devel-bounces@alsa-project.org +Errors-To: alsa-devel-bounces@alsa-project.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1063040> + +On Mon, Nov 15, 2010 at 11:52:53AM -0800, Joe Perches wrote: +> On Mon, 2010-11-15 at 19:34 +0000, Mark Brown wrote: + +> > It appears your scripts are already hooked into get_maintainers.pl which +> > would seem the obvious place to do this? Sadly I don't do perl, though +> > it looks like you're doing pretty much all the work on that anyway. + +> Sadly, no it's not the right place. + +To query MAINTAINERS? I'd assume that's where you'd want to put that +stuff? + +> There could be a modification to $1 (path) +> or some such. +> +> Maybe a script like +> ./scripts/convert_commit_subject_to_subsystem_maintainer_taste +> or something. + +> Care to write one in sh/bash/perl/python/c/ocaml/c#? + +Like I say I'd expect this to be a get_maintainers based lookup to dump +some data out? + +> As far as I know, the only subsystem pedants^H^H^H^H^Hople +> that care much about the commit subject style are +> arch/x86 and sound. + +If you look at the kernel you'll see quite a few subsystems which have +some sort of standard practice which they do try to enforce, you +shouldn't take silence as people being happy here - it's taken me some +considerable time to get round to mentioning this, for example, and I +might not have bothered if the patch had applied first time around. +Like working against -next it's one of these things that would make your +patches easier to deal with. + +> I can understand the desire of these subsystem maintainers +> to have a consistent style. I think though that requiring +> a subject header style without providing more than a +> general guideline is a but much. + +The general guideline I tend to go with is that if what you're doing +looks odd for the code you're submitting against for some reason you're +doing something wrong unless you understand why you're doing something +different and there's a good reason. + +> I'd use any other automated tool you want to provide. + +Like I say, I'd expect the lookup from the database to be handled by +get_maintainers.pl. Having a separate database would seem odd. + + diff --git a/test/corpora/lkml/cur/1382298793.003145:2, b/test/corpora/lkml/cur/1382298793.003145:2, new file mode 100644 index 00000000..7418171a --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.003145:2, @@ -0,0 +1,89 @@ +From: Joe Perches <joe@perches.com> +Subject: rfc: rewrite commit subject line for subsystem maintainer + preference tool +Date: Tue, 16 Nov 2010 06:51:17 -0800 +Lines: 36 +Message-ID: <1289919077.28741.50.camel@Joe-Laptop> +References: <20101115134939.GC12986@rakim.wolfsonmicro.main> + <1289840957.16461.138.camel@Joe-Laptop> + <20101115173031.GI12986@rakim.wolfsonmicro.main> + <1289842444.16461.140.camel@Joe-Laptop> + <20101115182708.GJ12986@rakim.wolfsonmicro.main> + <1289845830.16461.149.camel@Joe-Laptop> + <20101115190738.GF3338@sirena.org.uk> + <1289848458.16461.150.camel@Joe-Laptop> + <20101115193407.GK12986@rakim.wolfsonmicro.main> + <1289850773.16461.166.camel@Joe-Laptop> + <20101116104921.GL12986@rakim.wolfsonmicro.main> +Mime-Version: 1.0 +Content-Type: text/plain; charset="UTF-8" +Content-Transfer-Encoding: 7bit +Cc: Jiri Kosina <trivial@kernel.org>, + Andrew Morton <akpm@linux-foundation.org>, + Florian Mickler <florian@mickler.org>, + alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org +To: Mark Brown <broonie@opensource.wolfsonmicro.com> +X-From: linux-kernel-owner@vger.kernel.org Tue Nov 16 15:51:41 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PIMsn-0003tR-Ee + for glk-linux-kernel-3@lo.gmane.org; Tue, 16 Nov 2010 15:51:41 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1758690Ab0KPOvV (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Tue, 16 Nov 2010 09:51:21 -0500 +Received: from mail.perches.com ([173.55.12.10]:1433 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1755918Ab0KPOvU (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Tue, 16 Nov 2010 09:51:20 -0500 +Received: from [192.168.1.162] (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 38D5C24368; + Tue, 16 Nov 2010 06:49:10 -0800 (PST) +In-Reply-To: <20101116104921.GL12986@rakim.wolfsonmicro.main> +X-Mailer: Evolution 2.30.3 +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1063175> + +On Tue, 2010-11-16 at 10:49 +0000, Mark Brown wrote: +> On Mon, Nov 15, 2010 at 11:52:53AM -0800, Joe Perches wrote: +> > On Mon, 2010-11-15 at 19:34 +0000, Mark Brown wrote: +> > > It appears your scripts are already hooked into get_maintainers.pl which +> > > would seem the obvious place to do this? Sadly I don't do perl, though +> > > it looks like you're doing pretty much all the work on that anyway. +> > Sadly, no it's not the right place. +> To query MAINTAINERS? I'd assume that's where you'd want to put that +> stuff? + +I trimmed cc's and added Andrew Morton and Florian Mickler. +First thread link for them: http://lkml.org/lkml/2010/11/15/262 + +I use get_maintainer to find email addresses with +"git send-email --cc-cmd=" but sure it could be extended +to find some other new information in the MAINTAINERS file. + +Anyway, I think that get_maintainers isn't the proper tool +to rewrite commit subject lines, though it could certainly +do the lookup of a key in the MAINTAINERS file. + +Maybe add a new MAINTAINERS section line something like: + "C: CommitSubjectGrammarStyle" +where CommitSubjectGrammarStyle is something more +information rich than "style 1", "style 2". + +Perhaps you'll propose a grammar to convert path to header +and go through and add these "C:" style entries to the +sections you maintain. + +Also, what would you expect the output to be when a single +patch modified files from 2 subsystems that use different +styles? + +cheers, Joe + + + diff --git a/test/corpora/lkml/cur/1382298793.003148:2, b/test/corpora/lkml/cur/1382298793.003148:2, new file mode 100644 index 00000000..bd56e87b --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.003148:2, @@ -0,0 +1,92 @@ +From: Mark Brown <broonie@opensource.wolfsonmicro.com> +Subject: Re: rfc: rewrite commit subject line for subsystem + maintainer preference tool +Date: Tue, 16 Nov 2010 15:04:51 +0000 +Lines: 15 +Message-ID: <20101116150451.GA26239@rakim.wolfsonmicro.main> +References: <20101115173031.GI12986@rakim.wolfsonmicro.main> + <1289842444.16461.140.camel@Joe-Laptop> + <20101115182708.GJ12986@rakim.wolfsonmicro.main> + <1289845830.16461.149.camel@Joe-Laptop> + <20101115190738.GF3338@sirena.org.uk> + <1289848458.16461.150.camel@Joe-Laptop> + <20101115193407.GK12986@rakim.wolfsonmicro.main> + <1289850773.16461.166.camel@Joe-Laptop> + <20101116104921.GL12986@rakim.wolfsonmicro.main> + <1289919077.28741.50.camel@Joe-Laptop> +Mime-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Cc: Florian Mickler <florian@mickler.org>, + Andrew Morton <akpm@linux-foundation.org>, + Jiri Kosina <trivial@kernel.org>, alsa-devel@alsa-project.org, + linux-kernel@vger.kernel.org +To: Joe Perches <joe@perches.com> +X-From: alsa-devel-bounces@alsa-project.org Tue Nov 16 16:05:00 2010 +Return-path: <alsa-devel-bounces@alsa-project.org> +Envelope-to: glad-alsa-devel-2@m.gmane.org +Received: from alsa0.perex.cz ([212.20.107.51]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <alsa-devel-bounces@alsa-project.org>) + id 1PIN5f-0004ME-Rp + for glad-alsa-devel-2@m.gmane.org; Tue, 16 Nov 2010 16:04:59 +0100 +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id E869810380D; Tue, 16 Nov 2010 16:04:57 +0100 (CET) +X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on mail1.perex.cz +X-Spam-Level: +X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=disabled + version=3.2.4 +Received: from alsa0.perex.cz (localhost [127.0.0.1]) + by alsa0.perex.cz (Postfix) with ESMTP id 159A924457; + Tue, 16 Nov 2010 16:04:57 +0100 (CET) +X-Original-To: alsa-devel@alsa-project.org +Delivered-To: alsa-devel@alsa-project.org +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id 43E4E24458; Tue, 16 Nov 2010 16:04:55 +0100 (CET) +Received: from opensource2.wolfsonmicro.com (opensource.wolfsonmicro.com + [80.75.67.52]) by alsa0.perex.cz (Postfix) with ESMTP id CED8D243CD + for <alsa-devel@alsa-project.org>; Tue, 16 Nov 2010 16:04:54 +0100 (CET) +Received: from rakim.wolfsonmicro.main (lumison.wolfsonmicro.com + [87.246.78.27]) + by opensource2.wolfsonmicro.com (Postfix) with ESMTPSA id A251D3B445E; + Tue, 16 Nov 2010 15:04:52 +0000 (GMT) +Received: from broonie by rakim.wolfsonmicro.main with local (Exim 4.72) + (envelope-from <broonie@rakim.wolfsonmicro.main>) + id 1PIN5X-0007x2-Qm; Tue, 16 Nov 2010 15:04:51 +0000 +Content-Disposition: inline +In-Reply-To: <1289919077.28741.50.camel@Joe-Laptop> +X-Cookie: Onward through the fog. +User-Agent: Mutt/1.5.20 (2009-06-14) +X-BeenThere: alsa-devel@alsa-project.org +X-Mailman-Version: 2.1.9 +Precedence: list +List-Id: "Alsa-devel mailing list for ALSA developers - + http://www.alsa-project.org" <alsa-devel.alsa-project.org> +List-Unsubscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe> +List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel> +List-Post: <mailto:alsa-devel@alsa-project.org> +List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help> +List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> +Sender: alsa-devel-bounces@alsa-project.org +Errors-To: alsa-devel-bounces@alsa-project.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1063178> + +On Tue, Nov 16, 2010 at 06:51:17AM -0800, Joe Perches wrote: + +> Maybe add a new MAINTAINERS section line something like: +> "C: CommitSubjectGrammarStyle" +> where CommitSubjectGrammarStyle is something more +> information rich than "style 1", "style 2". + +Something printfish would seem reasonable? + +> Also, what would you expect the output to be when a single +> patch modified files from 2 subsystems that use different +> styles? + +The traditional thing is "ThingX/ThingY: blah" but as with anything else +you need to be sensible. + + diff --git a/test/corpora/lkml/cur/1382298793.003216:2, b/test/corpora/lkml/cur/1382298793.003216:2, new file mode 100644 index 00000000..655f450b --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.003216:2, @@ -0,0 +1,113 @@ +From: Florian Mickler <florian@mickler.org> +Subject: Re: rfc: rewrite commit subject line for subsystem maintainer + preference tool +Date: Tue, 16 Nov 2010 18:37:07 +0100 +Lines: 59 +Message-ID: <20101116183707.179964dd@schatten.dmk.lab> +References: <20101115134939.GC12986@rakim.wolfsonmicro.main> + <1289840957.16461.138.camel@Joe-Laptop> + <20101115173031.GI12986@rakim.wolfsonmicro.main> + <1289842444.16461.140.camel@Joe-Laptop> + <20101115182708.GJ12986@rakim.wolfsonmicro.main> + <1289845830.16461.149.camel@Joe-Laptop> + <20101115190738.GF3338@sirena.org.uk> + <1289848458.16461.150.camel@Joe-Laptop> + <20101115193407.GK12986@rakim.wolfsonmicro.main> + <1289850773.16461.166.camel@Joe-Laptop> + <20101116104921.GL12986@rakim.wolfsonmicro.main> + <1289919077.28741.50.camel@Joe-Laptop> +Mime-Version: 1.0 +Content-Type: text/plain; charset=US-ASCII +Content-Transfer-Encoding: 7bit +Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>, + Jiri Kosina <trivial@kernel.org>, + Andrew Morton <akpm@linux-foundation.org>, + alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org +To: Joe Perches <joe@perches.com> +X-From: linux-kernel-owner@vger.kernel.org Tue Nov 16 18:37:57 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PIPTh-0007Ey-5Q + for glk-linux-kernel-3@lo.gmane.org; Tue, 16 Nov 2010 18:37:57 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1756054Ab0KPRhi (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Tue, 16 Nov 2010 12:37:38 -0500 +Received: from ist.d-labs.de ([213.239.218.44]:44291 "EHLO mx01.d-labs.de" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1754101Ab0KPRhh (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Tue, 16 Nov 2010 12:37:37 -0500 +Received: from schatten.dmk.lab (f053209081.adsl.alicedsl.de [78.53.209.81]) + by mx01.d-labs.de (Postfix) with ESMTPSA id 1EB9E7FFD4; + Tue, 16 Nov 2010 18:36:55 +0100 (CET) +In-Reply-To: <1289919077.28741.50.camel@Joe-Laptop> +X-Mailer: Claws Mail 3.7.6cvs31 (GTK+ 2.20.1; x86_64-unknown-linux-gnu) +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1063246> + +On Tue, 16 Nov 2010 06:51:17 -0800 +Joe Perches <joe@perches.com> wrote: + +> On Tue, 2010-11-16 at 10:49 +0000, Mark Brown wrote: +> > On Mon, Nov 15, 2010 at 11:52:53AM -0800, Joe Perches wrote: +> > > On Mon, 2010-11-15 at 19:34 +0000, Mark Brown wrote: +> > > > It appears your scripts are already hooked into get_maintainers.pl which +> > > > would seem the obvious place to do this? Sadly I don't do perl, though +> > > > it looks like you're doing pretty much all the work on that anyway. +> > > Sadly, no it's not the right place. +> > To query MAINTAINERS? I'd assume that's where you'd want to put that +> > stuff? +> +> I trimmed cc's and added Andrew Morton and Florian Mickler. +> First thread link for them: http://lkml.org/lkml/2010/11/15/262 +> +> I use get_maintainer to find email addresses with +> "git send-email --cc-cmd=" but sure it could be extended +> to find some other new information in the MAINTAINERS file. +> +> Anyway, I think that get_maintainers isn't the proper tool +> to rewrite commit subject lines, though it could certainly +> do the lookup of a key in the MAINTAINERS file. +> +> Maybe add a new MAINTAINERS section line something like: +> "C: CommitSubjectGrammarStyle" +> where CommitSubjectGrammarStyle is something more +> information rich than "style 1", "style 2". +> +> Perhaps you'll propose a grammar to convert path to header +> and go through and add these "C:" style entries to the +> sections you maintain. +> +> Also, what would you expect the output to be when a single +> patch modified files from 2 subsystems that use different +> styles? +> +> cheers, Joe +> + +My first reaction to this is, it's silly. Certainly a +subsystem-maintainer is capable of hacking something together that +suits his needs or may just use a good editor to get the job done. +After all, he might want to edit the commit message anyway. Also he has +to have his act together for all non-conforming submitters anyway, +because shurely, telling people to re-edit their patches subject line +is not what one would consider "welcoming to newbies", or whatever it +is kernel subsystem maintainers have to be nowadays *g*... + +On second thought, if that facility existed, i think nobody would mind +it either. So, why not. I don't see a way to specify what to do with +cross-subsystem patches though. + +(MAINTAINERS seems to be the logical place to put this +information.) + +Regards, +Flo + + + diff --git a/test/corpora/lkml/cur/1382298793.003231:2, b/test/corpora/lkml/cur/1382298793.003231:2, new file mode 100644 index 00000000..0f4a1237 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.003231:2, @@ -0,0 +1,82 @@ +From: Mark Brown <broonie@opensource.wolfsonmicro.com> +Subject: Re: rfc: rewrite commit subject line for subsystem maintainer + preference tool +Date: Tue, 16 Nov 2010 18:12:27 +0000 +Lines: 26 +Message-ID: <20101116181226.GB26239@rakim.wolfsonmicro.main> +References: <1289842444.16461.140.camel@Joe-Laptop> + <20101115182708.GJ12986@rakim.wolfsonmicro.main> + <1289845830.16461.149.camel@Joe-Laptop> + <20101115190738.GF3338@sirena.org.uk> + <1289848458.16461.150.camel@Joe-Laptop> + <20101115193407.GK12986@rakim.wolfsonmicro.main> + <1289850773.16461.166.camel@Joe-Laptop> + <20101116104921.GL12986@rakim.wolfsonmicro.main> + <1289919077.28741.50.camel@Joe-Laptop> + <20101116183707.179964dd@schatten.dmk.lab> +Mime-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Cc: Joe Perches <joe@perches.com>, Jiri Kosina <trivial@kernel.org>, + Andrew Morton <akpm@linux-foundation.org>, + alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org +To: Florian Mickler <florian@mickler.org> +X-From: linux-kernel-owner@vger.kernel.org Tue Nov 16 19:12:51 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PIQ1Q-0006KJ-Uw + for glk-linux-kernel-3@lo.gmane.org; Tue, 16 Nov 2010 19:12:49 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1756467Ab0KPSMa (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Tue, 16 Nov 2010 13:12:30 -0500 +Received: from opensource.wolfsonmicro.com ([80.75.67.52]:42692 "EHLO + opensource2.wolfsonmicro.com" rhost-flags-OK-OK-OK-FAIL) + by vger.kernel.org with ESMTP id S1755686Ab0KPSM3 (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Tue, 16 Nov 2010 13:12:29 -0500 +Received: from rakim.wolfsonmicro.main (lumison.wolfsonmicro.com [87.246.78.27]) + by opensource2.wolfsonmicro.com (Postfix) with ESMTPSA id 3E8603B44D5; + Tue, 16 Nov 2010 18:12:28 +0000 (GMT) +Received: from broonie by rakim.wolfsonmicro.main with local (Exim 4.72) + (envelope-from <broonie@rakim.wolfsonmicro.main>) + id 1PIQ15-0000oJ-5s; Tue, 16 Nov 2010 18:12:27 +0000 +Content-Disposition: inline +In-Reply-To: <20101116183707.179964dd@schatten.dmk.lab> +X-Cookie: Onward through the fog. +User-Agent: Mutt/1.5.20 (2009-06-14) +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1063261> + +On Tue, Nov 16, 2010 at 06:37:07PM +0100, Florian Mickler wrote: + +> My first reaction to this is, it's silly. Certainly a +> subsystem-maintainer is capable of hacking something together that +> suits his needs or may just use a good editor to get the job done. +> After all, he might want to edit the commit message anyway. Also he has +> to have his act together for all non-conforming submitters anyway, +> because shurely, telling people to re-edit their patches subject line +> is not what one would consider "welcoming to newbies", or whatever it +> is kernel subsystem maintainers have to be nowadays *g*... + +So, my general policy on this is that I tend to push back on patches +which don't just work with the toolset (subject lines are just one part +of it) to a variable extent depending on who's submitting and what +they're submitting. One of the factors is that the more patches are +coming from someone the easier I expect their patches to be to work +with. + +The reason this came up is that this is one of the issues with Joe's +patches (which are rather frequent) but he is only willing to do things +that he can automate. + +> (MAINTAINERS seems to be the logical place to put this +> information.) + +Indeed. + + diff --git a/test/corpora/lkml/cur/1382298793.003278:2, b/test/corpora/lkml/cur/1382298793.003278:2, new file mode 100644 index 00000000..b3b0f0cc --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.003278:2, @@ -0,0 +1,89 @@ +From: Florian Mickler <florian@mickler.org> +Subject: Re: rfc: rewrite commit subject line for subsystem maintainer + preference tool +Date: Tue, 16 Nov 2010 20:35:22 +0100 +Lines: 37 +Message-ID: <20101116203522.65240b18@schatten.dmk.lab> +References: <1289842444.16461.140.camel@Joe-Laptop> + <20101115182708.GJ12986@rakim.wolfsonmicro.main> + <1289845830.16461.149.camel@Joe-Laptop> + <20101115190738.GF3338@sirena.org.uk> + <1289848458.16461.150.camel@Joe-Laptop> + <20101115193407.GK12986@rakim.wolfsonmicro.main> + <1289850773.16461.166.camel@Joe-Laptop> + <20101116104921.GL12986@rakim.wolfsonmicro.main> + <1289919077.28741.50.camel@Joe-Laptop> + <20101116183707.179964dd@schatten.dmk.lab> + <20101116181226.GB26239@rakim.wolfsonmicro.main> +Mime-Version: 1.0 +Content-Type: text/plain; charset=US-ASCII +Content-Transfer-Encoding: 7bit +Cc: Joe Perches <joe@perches.com>, Jiri Kosina <trivial@kernel.org>, + Andrew Morton <akpm@linux-foundation.org>, + alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org +To: Mark Brown <broonie@opensource.wolfsonmicro.com> +X-From: linux-kernel-owner@vger.kernel.org Tue Nov 16 20:36:24 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PIRKK-0004cK-An + for glk-linux-kernel-3@lo.gmane.org; Tue, 16 Nov 2010 20:36:24 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S932105Ab0KPTfy (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Tue, 16 Nov 2010 14:35:54 -0500 +Received: from ist.d-labs.de ([213.239.218.44]:46199 "EHLO mx01.d-labs.de" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1756324Ab0KPTfw (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Tue, 16 Nov 2010 14:35:52 -0500 +Received: from schatten.dmk.lab (f053209081.adsl.alicedsl.de [78.53.209.81]) + by mx01.d-labs.de (Postfix) with ESMTPSA id 8CEAA7FAFE; + Tue, 16 Nov 2010 20:35:09 +0100 (CET) +In-Reply-To: <20101116181226.GB26239@rakim.wolfsonmicro.main> +X-Mailer: Claws Mail 3.7.6cvs31 (GTK+ 2.20.1; x86_64-unknown-linux-gnu) +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1063309> + +On Tue, 16 Nov 2010 18:12:27 +0000 +Mark Brown <broonie@opensource.wolfsonmicro.com> wrote: + +> On Tue, Nov 16, 2010 at 06:37:07PM +0100, Florian Mickler wrote: +> +> > My first reaction to this is, it's silly. Certainly a +> > subsystem-maintainer is capable of hacking something together that +> > suits his needs or may just use a good editor to get the job done. +> > After all, he might want to edit the commit message anyway. Also he has +> > to have his act together for all non-conforming submitters anyway, +> > because shurely, telling people to re-edit their patches subject line +> > is not what one would consider "welcoming to newbies", or whatever it +> > is kernel subsystem maintainers have to be nowadays *g*... +> +> So, my general policy on this is that I tend to push back on patches +> which don't just work with the toolset (subject lines are just one part +> of it) to a variable extent depending on who's submitting and what +> they're submitting. One of the factors is that the more patches are +> coming from someone the easier I expect their patches to be to work +> with. +> +> The reason this came up is that this is one of the issues with Joe's +> patches (which are rather frequent) but he is only willing to do things +> that he can automate. + +Hehe, I know that I wouldn't want to hand edit every autogenerated patch +people throw at me... What about just dropping everything before the +last "]" or ":" and putting an autogenerated prefix before it in a +pre-commit hook on your side? + +That should work most of the time... don't know... maybe other +subsystem maintainers have some more suggestions on reducing the +workload... this could even be an interesting topic for some summit... + +Regards, +Flo + + + diff --git a/test/corpora/lkml/cur/1382298793.003295:2, b/test/corpora/lkml/cur/1382298793.003295:2, new file mode 100644 index 00000000..802eca72 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.003295:2, @@ -0,0 +1,92 @@ +From: Mark Brown <broonie@opensource.wolfsonmicro.com> +Subject: Re: rfc: rewrite commit subject line for subsystem + maintainer preference tool +Date: Tue, 16 Nov 2010 19:55:31 +0000 +Lines: 16 +Message-ID: <20101116195530.GA7523@rakim.wolfsonmicro.main> +References: <1289845830.16461.149.camel@Joe-Laptop> + <20101115190738.GF3338@sirena.org.uk> + <1289848458.16461.150.camel@Joe-Laptop> + <20101115193407.GK12986@rakim.wolfsonmicro.main> + <1289850773.16461.166.camel@Joe-Laptop> + <20101116104921.GL12986@rakim.wolfsonmicro.main> + <1289919077.28741.50.camel@Joe-Laptop> + <20101116183707.179964dd@schatten.dmk.lab> + <20101116181226.GB26239@rakim.wolfsonmicro.main> + <20101116203522.65240b18@schatten.dmk.lab> +Mime-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Cc: Joe Perches <joe@perches.com>, Andrew Morton <akpm@linux-foundation.org>, + Jiri Kosina <trivial@kernel.org>, alsa-devel@alsa-project.org, + linux-kernel@vger.kernel.org +To: Florian Mickler <florian@mickler.org> +X-From: alsa-devel-bounces@alsa-project.org Tue Nov 16 20:55:48 2010 +Return-path: <alsa-devel-bounces@alsa-project.org> +Envelope-to: glad-alsa-devel-2@m.gmane.org +Received: from alsa0.perex.cz ([212.20.107.51]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <alsa-devel-bounces@alsa-project.org>) + id 1PIRd2-0000Zr-GV + for glad-alsa-devel-2@m.gmane.org; Tue, 16 Nov 2010 20:55:44 +0100 +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id 02BEA2417E; Tue, 16 Nov 2010 20:55:36 +0100 (CET) +X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on mail1.perex.cz +X-Spam-Level: +X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=disabled + version=3.2.4 +Received: from alsa0.perex.cz (localhost [127.0.0.1]) + by alsa0.perex.cz (Postfix) with ESMTP id 8AFD424159; + Tue, 16 Nov 2010 20:55:35 +0100 (CET) +X-Original-To: alsa-devel@alsa-project.org +Delivered-To: alsa-devel@alsa-project.org +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id 32ADC24179; Tue, 16 Nov 2010 20:55:34 +0100 (CET) +Received: from opensource2.wolfsonmicro.com (opensource.wolfsonmicro.com + [80.75.67.52]) by alsa0.perex.cz (Postfix) with ESMTP id 913CA24158 + for <alsa-devel@alsa-project.org>; Tue, 16 Nov 2010 20:55:33 +0100 (CET) +Received: from rakim.wolfsonmicro.main (lumison.wolfsonmicro.com + [87.246.78.27]) + by opensource2.wolfsonmicro.com (Postfix) with ESMTPSA id C4CDE3B4538; + Tue, 16 Nov 2010 19:55:31 +0000 (GMT) +Received: from broonie by rakim.wolfsonmicro.main with local (Exim 4.72) + (envelope-from <broonie@rakim.wolfsonmicro.main>) + id 1PIRcp-0004nx-60; Tue, 16 Nov 2010 19:55:31 +0000 +Content-Disposition: inline +In-Reply-To: <20101116203522.65240b18@schatten.dmk.lab> +X-Cookie: Killing turkeys causes winter. +User-Agent: Mutt/1.5.20 (2009-06-14) +X-BeenThere: alsa-devel@alsa-project.org +X-Mailman-Version: 2.1.9 +Precedence: list +List-Id: "Alsa-devel mailing list for ALSA developers - + http://www.alsa-project.org" <alsa-devel.alsa-project.org> +List-Unsubscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe> +List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel> +List-Post: <mailto:alsa-devel@alsa-project.org> +List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help> +List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> +Sender: alsa-devel-bounces@alsa-project.org +Errors-To: alsa-devel-bounces@alsa-project.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1063326> + +On Tue, Nov 16, 2010 at 08:35:22PM +0100, Florian Mickler wrote: + +> Hehe, I know that I wouldn't want to hand edit every autogenerated patch +> people throw at me... What about just dropping everything before the +> last "]" or ":" and putting an autogenerated prefix before it in a +> pre-commit hook on your side? + +> That should work most of the time... don't know... maybe other + +It's the most of the time bit that worries me, I'm generally reluctant +to script things like this when the scripts aren't very widely used and +it's a pain to get hooks distributed over all my systems and working for +all the things I need to apply patches for. + +From my point of view my current approach is actually working pretty +well with most submitters, even people doing similar janitorial stuff. + + diff --git a/test/corpora/lkml/cur/1382298793.003316:2, b/test/corpora/lkml/cur/1382298793.003316:2, new file mode 100644 index 00000000..7b09d35c --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.003316:2, @@ -0,0 +1,105 @@ +From: Randy Dunlap <rdunlap@xenotime.net> +Subject: Re: rfc: rewrite commit subject line for subsystem + maintainer preference tool +Date: Tue, 16 Nov 2010 12:21:02 -0800 +Organization: YPO4 +Lines: 34 +Message-ID: <20101116122102.86e7e0b9.rdunlap@xenotime.net> +References: <1289845830.16461.149.camel@Joe-Laptop> + <20101115190738.GF3338@sirena.org.uk> + <1289848458.16461.150.camel@Joe-Laptop> + <20101115193407.GK12986@rakim.wolfsonmicro.main> + <1289850773.16461.166.camel@Joe-Laptop> + <20101116104921.GL12986@rakim.wolfsonmicro.main> + <1289919077.28741.50.camel@Joe-Laptop> + <20101116183707.179964dd@schatten.dmk.lab> + <20101116181226.GB26239@rakim.wolfsonmicro.main> + <20101116203522.65240b18@schatten.dmk.lab> + <20101116195530.GA7523@rakim.wolfsonmicro.main> +Mime-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Cc: alsa-devel@alsa-project.org, Jiri Kosina <trivial@kernel.org>, + linux-kernel@vger.kernel.org, Florian Mickler <florian@mickler.org>, + Joe Perches <joe@perches.com>, Andrew Morton <akpm@linux-foundation.org> +To: Mark Brown <broonie@opensource.wolfsonmicro.com> +X-From: alsa-devel-bounces@alsa-project.org Tue Nov 16 21:21:20 2010 +Return-path: <alsa-devel-bounces@alsa-project.org> +Envelope-to: glad-alsa-devel-2@m.gmane.org +Received: from alsa0.perex.cz ([212.20.107.51]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <alsa-devel-bounces@alsa-project.org>) + id 1PIS1m-0001Kj-Rd + for glad-alsa-devel-2@m.gmane.org; Tue, 16 Nov 2010 21:21:18 +0100 +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id 2FC2024371; Tue, 16 Nov 2010 21:21:18 +0100 (CET) +X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on mail1.perex.cz +X-Spam-Level: +X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=disabled + version=3.2.4 +Received: from alsa0.perex.cz (localhost [127.0.0.1]) + by alsa0.perex.cz (Postfix) with ESMTP id ACBEB24368; + Tue, 16 Nov 2010 21:21:16 +0100 (CET) +X-Original-To: alsa-devel@alsa-project.org +Delivered-To: alsa-devel@alsa-project.org +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id 6AFBB24369; Tue, 16 Nov 2010 21:21:15 +0100 (CET) +Received: from xenotime.net (xenotime.net [72.52.115.56]) + by alsa0.perex.cz (Postfix) with SMTP id 6FDFD24363 + for <alsa-devel@alsa-project.org>; Tue, 16 Nov 2010 21:21:14 +0100 (CET) +Received: from chimera.site ([173.50.240.230]) by xenotime.net for + <alsa-devel@alsa-project.org>; Tue, 16 Nov 2010 12:21:06 -0800 +In-Reply-To: <20101116195530.GA7523@rakim.wolfsonmicro.main> +X-Mailer: Sylpheed 2.7.1 (GTK+ 2.16.6; x86_64-unknown-linux-gnu) +X-BeenThere: alsa-devel@alsa-project.org +X-Mailman-Version: 2.1.9 +Precedence: list +List-Id: "Alsa-devel mailing list for ALSA developers - + http://www.alsa-project.org" <alsa-devel.alsa-project.org> +List-Unsubscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe> +List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel> +List-Post: <mailto:alsa-devel@alsa-project.org> +List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help> +List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> +Sender: alsa-devel-bounces@alsa-project.org +Errors-To: alsa-devel-bounces@alsa-project.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1063347> + +On Tue, 16 Nov 2010 19:55:31 +0000 Mark Brown wrote: + +> On Tue, Nov 16, 2010 at 08:35:22PM +0100, Florian Mickler wrote: +> +> > Hehe, I know that I wouldn't want to hand edit every autogenerated patch +> > people throw at me... What about just dropping everything before the +> > last "]" or ":" and putting an autogenerated prefix before it in a +> > pre-commit hook on your side? +> +> > That should work most of the time... don't know... maybe other +> +> It's the most of the time bit that worries me, I'm generally reluctant +> to script things like this when the scripts aren't very widely used and +> it's a pain to get hooks distributed over all my systems and working for +> all the things I need to apply patches for. +> +> From my point of view my current approach is actually working pretty +> well with most submitters, even people doing similar janitorial stuff. + +I don't know what you asked Joe to change, but asking someone to use +the documented canonical patch format: + +<quote> +The canonical patch subject line is: + + Subject: [PATCH 001/123] subsystem: summary phrase +</quote> + +should be fine. And there is no need for printf-ish templates +for this in MAINTAINERS either. + +--- +~Randy +*** Remember to use Documentation/SubmitChecklist when testing your code *** + + diff --git a/test/corpora/lkml/cur/1382298793.003334:2, b/test/corpora/lkml/cur/1382298793.003334:2, new file mode 100644 index 00000000..9a58840c --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.003334:2, @@ -0,0 +1,106 @@ +From: Joe Perches <joe@perches.com> +Subject: Re: rfc: rewrite commit subject line for subsystem maintainer + preference tool +Date: Tue, 16 Nov 2010 12:42:36 -0800 +Lines: 51 +Message-ID: <1289940156.28741.207.camel@Joe-Laptop> +References: <1289845830.16461.149.camel@Joe-Laptop> + <20101115190738.GF3338@sirena.org.uk> + <1289848458.16461.150.camel@Joe-Laptop> + <20101115193407.GK12986@rakim.wolfsonmicro.main> + <1289850773.16461.166.camel@Joe-Laptop> + <20101116104921.GL12986@rakim.wolfsonmicro.main> + <1289919077.28741.50.camel@Joe-Laptop> + <20101116183707.179964dd@schatten.dmk.lab> + <20101116181226.GB26239@rakim.wolfsonmicro.main> + <20101116203522.65240b18@schatten.dmk.lab> + <20101116195530.GA7523@rakim.wolfsonmicro.main> + <20101116122102.86e7e0b9.rdunlap@xenotime.net> +Mime-Version: 1.0 +Content-Type: text/plain; charset="UTF-8" +Content-Transfer-Encoding: 7bit +Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>, + Florian Mickler <florian@mickler.org>, + Jiri Kosina <trivial@kernel.org>, + Andrew Morton <akpm@linux-foundation.org>, + alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org +To: Randy Dunlap <rdunlap@xenotime.net> +X-From: linux-kernel-owner@vger.kernel.org Tue Nov 16 21:43:01 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PISMm-00074k-9X + for glk-linux-kernel-3@lo.gmane.org; Tue, 16 Nov 2010 21:43:00 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1757174Ab0KPUmj (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Tue, 16 Nov 2010 15:42:39 -0500 +Received: from mail.perches.com ([173.55.12.10]:1476 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1754409Ab0KPUmi (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Tue, 16 Nov 2010 15:42:38 -0500 +Received: from [192.168.1.162] (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 17CC824368; + Tue, 16 Nov 2010 12:40:23 -0800 (PST) +In-Reply-To: <20101116122102.86e7e0b9.rdunlap@xenotime.net> +X-Mailer: Evolution 2.30.3 +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1063365> + +On Tue, 2010-11-16 at 12:21 -0800, Randy Dunlap wrote: +> On Tue, 16 Nov 2010 19:55:31 +0000 Mark Brown wrote: +> I don't know what you asked Joe to change, but asking someone to use +> the documented canonical patch format: +> <quote> +> The canonical patch subject line is: +> Subject: [PATCH 001/123] subsystem: summary phrase +> </quote> +> should be fine. And there is no need for printf-ish templates +> for this in MAINTAINERS either. + +I've never read that before. Learn something new etc... +It seems path prefixes aren't good nor even commonly used. + +A review of kernel patch subjects: + +$ git log --no-merges --pretty=oneline | \ + cut -f2- -d" " | cut -f1 -d: | sort | uniq -c | sort -rn + +is interesting. Here's the head: + 5007 x86 + 3943 Staging + 3220 USB + 2790 sh + 2707 KVM + 2624 ARM + 2449 ALSA + 1571 Input + 1549 ASoC + 1470 iwlwifi + 1423 ACPI + 1397 mac80211 + 1384 V4L/DVB + 1226 sched + 1200 Btrfs + 1184 powerpc + 1106 [NETFILTER] + 1080 MIPS + 1049 net + 1047 ide + 1014 drm/i915 + 993 staging + 921 ath9k + +Some subsystem maintainers like upper case, some mixed, some lower. +Some aren't consistent. (Staging/staging) + +It doesn't seem a rule can be pregenerated so maybe adding these +"C:" lines to MAINTAINERS has some value. + + + + diff --git a/test/corpora/lkml/cur/1382298793.003340:2, b/test/corpora/lkml/cur/1382298793.003340:2, new file mode 100644 index 00000000..ff520cb9 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.003340:2, @@ -0,0 +1,138 @@ +From: Randy Dunlap <rdunlap@xenotime.net> +Subject: Re: rfc: rewrite commit subject line for subsystem + maintainer preference tool +Date: Tue, 16 Nov 2010 12:46:09 -0800 +Organization: YPO4 +Lines: 64 +Message-ID: <20101116124609.382e42fb.rdunlap@xenotime.net> +References: <1289845830.16461.149.camel@Joe-Laptop> + <20101115190738.GF3338@sirena.org.uk> + <1289848458.16461.150.camel@Joe-Laptop> + <20101115193407.GK12986@rakim.wolfsonmicro.main> + <1289850773.16461.166.camel@Joe-Laptop> + <20101116104921.GL12986@rakim.wolfsonmicro.main> + <1289919077.28741.50.camel@Joe-Laptop> + <20101116183707.179964dd@schatten.dmk.lab> + <20101116181226.GB26239@rakim.wolfsonmicro.main> + <20101116203522.65240b18@schatten.dmk.lab> + <20101116195530.GA7523@rakim.wolfsonmicro.main> + <20101116122102.86e7e0b9.rdunlap@xenotime.net> + <1289940156.28741.207.camel@Joe-Laptop> +Mime-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Cc: alsa-devel@alsa-project.org, Jiri Kosina <trivial@kernel.org>, + Mark Brown <broonie@opensource.wolfsonmicro.com>, + linux-kernel@vger.kernel.org, Florian Mickler <florian@mickler.org>, + Andrew Morton <akpm@linux-foundation.org> +To: Joe Perches <joe@perches.com> +X-From: alsa-devel-bounces@alsa-project.org Tue Nov 16 21:46:23 2010 +Return-path: <alsa-devel-bounces@alsa-project.org> +Envelope-to: glad-alsa-devel-2@m.gmane.org +Received: from alsa0.perex.cz ([212.20.107.51]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <alsa-devel-bounces@alsa-project.org>) + id 1PISQ1-0000rd-2s + for glad-alsa-devel-2@m.gmane.org; Tue, 16 Nov 2010 21:46:21 +0100 +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id 5421B2438C; Tue, 16 Nov 2010 21:46:20 +0100 (CET) +X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on mail1.perex.cz +X-Spam-Level: * +X-Spam-Status: No, score=1.0 required=5.0 tests=PRX_BODY_29 autolearn=disabled + version=3.2.4 +Received: from alsa0.perex.cz (localhost [127.0.0.1]) + by alsa0.perex.cz (Postfix) with ESMTP id 774FE24390; + Tue, 16 Nov 2010 21:46:19 +0100 (CET) +X-Original-To: alsa-devel@alsa-project.org +Delivered-To: alsa-devel@alsa-project.org +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id 6051924391; Tue, 16 Nov 2010 21:46:17 +0100 (CET) +Received: from xenotime.net (xenotime.net [72.52.115.56]) + by alsa0.perex.cz (Postfix) with SMTP id 4F17D2438C + for <alsa-devel@alsa-project.org>; Tue, 16 Nov 2010 21:46:15 +0100 (CET) +Received: from chimera.site ([173.50.240.230]) by xenotime.net for + <alsa-devel@alsa-project.org>; Tue, 16 Nov 2010 12:46:10 -0800 +In-Reply-To: <1289940156.28741.207.camel@Joe-Laptop> +X-Mailer: Sylpheed 2.7.1 (GTK+ 2.16.6; x86_64-unknown-linux-gnu) +X-BeenThere: alsa-devel@alsa-project.org +X-Mailman-Version: 2.1.9 +Precedence: list +List-Id: "Alsa-devel mailing list for ALSA developers - + http://www.alsa-project.org" <alsa-devel.alsa-project.org> +List-Unsubscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe> +List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel> +List-Post: <mailto:alsa-devel@alsa-project.org> +List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help> +List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> +Sender: alsa-devel-bounces@alsa-project.org +Errors-To: alsa-devel-bounces@alsa-project.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1063371> + +On Tue, 16 Nov 2010 12:42:36 -0800 Joe Perches wrote: + +> On Tue, 2010-11-16 at 12:21 -0800, Randy Dunlap wrote: +> > On Tue, 16 Nov 2010 19:55:31 +0000 Mark Brown wrote: +> > I don't know what you asked Joe to change, but asking someone to use +> > the documented canonical patch format: +> > <quote> +> > The canonical patch subject line is: +> > Subject: [PATCH 001/123] subsystem: summary phrase +> > </quote> +> > should be fine. And there is no need for printf-ish templates +> > for this in MAINTAINERS either. +> +> I've never read that before. Learn something new etc... +> It seems path prefixes aren't good nor even commonly used. +> +> A review of kernel patch subjects: +> +> $ git log --no-merges --pretty=oneline | \ +> cut -f2- -d" " | cut -f1 -d: | sort | uniq -c | sort -rn +> +> is interesting. Here's the head: +> 5007 x86 +> 3943 Staging +> 3220 USB +> 2790 sh +> 2707 KVM +> 2624 ARM +> 2449 ALSA +> 1571 Input +> 1549 ASoC +> 1470 iwlwifi +> 1423 ACPI +> 1397 mac80211 +> 1384 V4L/DVB +> 1226 sched +> 1200 Btrfs +> 1184 powerpc +> 1106 [NETFILTER] +> 1080 MIPS +> 1049 net +> 1047 ide +> 1014 drm/i915 +> 993 staging +> 921 ath9k + +$ARCH is a commonly accepted substitute for subsystem. + +And yes, lots of people use <drivername> there as well. + + +> Some subsystem maintainers like upper case, some mixed, some lower. +> Some aren't consistent. (Staging/staging) + +Case usually doesn't matter to most of us. + +> It doesn't seem a rule can be pregenerated so maybe adding these +> "C:" lines to MAINTAINERS has some value. + +Hopefully it won't go that far. + +--- +~Randy +*** Remember to use Documentation/SubmitChecklist when testing your code *** + + diff --git a/test/corpora/lkml/cur/1382298793.003448:2, b/test/corpora/lkml/cur/1382298793.003448:2, new file mode 100644 index 00000000..d9ecd6a3 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.003448:2, @@ -0,0 +1,100 @@ +From: Mark Brown <broonie@opensource.wolfsonmicro.com> +Subject: Re: rfc: rewrite commit subject line for subsystem + maintainer preference tool +Date: Tue, 16 Nov 2010 23:01:26 +0000 +Lines: 24 +Message-ID: <20101116230126.GB24623@opensource.wolfsonmicro.com> +References: <1289848458.16461.150.camel@Joe-Laptop> + <20101115193407.GK12986@rakim.wolfsonmicro.main> + <1289850773.16461.166.camel@Joe-Laptop> + <20101116104921.GL12986@rakim.wolfsonmicro.main> + <1289919077.28741.50.camel@Joe-Laptop> + <20101116183707.179964dd@schatten.dmk.lab> + <20101116181226.GB26239@rakim.wolfsonmicro.main> + <20101116203522.65240b18@schatten.dmk.lab> + <20101116195530.GA7523@rakim.wolfsonmicro.main> + <20101116122102.86e7e0b9.rdunlap@xenotime.net> +Mime-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Cc: alsa-devel@alsa-project.org, Jiri Kosina <trivial@kernel.org>, + linux-kernel@vger.kernel.org, Florian Mickler <florian@mickler.org>, + Joe Perches <joe@perches.com>, Andrew Morton <akpm@linux-foundation.org> +To: Randy Dunlap <rdunlap@xenotime.net> +X-From: alsa-devel-bounces@alsa-project.org Wed Nov 17 00:01:43 2010 +Return-path: <alsa-devel-bounces@alsa-project.org> +Envelope-to: glad-alsa-devel-2@m.gmane.org +Received: from alsa0.perex.cz ([212.20.107.51]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <alsa-devel-bounces@alsa-project.org>) + id 1PIUWr-0004yP-6J + for glad-alsa-devel-2@m.gmane.org; Wed, 17 Nov 2010 00:01:33 +0100 +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id A434B103882; Wed, 17 Nov 2010 00:01:26 +0100 (CET) +X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on mail1.perex.cz +X-Spam-Level: +X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=disabled + version=3.2.4 +Received: from alsa0.perex.cz (localhost [127.0.0.1]) + by alsa0.perex.cz (Postfix) with ESMTP id 9B9A81037FB; + Wed, 17 Nov 2010 00:01:23 +0100 (CET) +X-Original-To: alsa-devel@alsa-project.org +Delivered-To: alsa-devel@alsa-project.org +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id 47D7B1037FB; Wed, 17 Nov 2010 00:01:22 +0100 (CET) +Received: from opensource2.wolfsonmicro.com (opensource.wolfsonmicro.com + [80.75.67.52]) by alsa0.perex.cz (Postfix) with ESMTP id F24201037E3 + for <alsa-devel@alsa-project.org>; Wed, 17 Nov 2010 00:01:20 +0100 (CET) +Received: from finisterre.wolfsonmicro.main + (cpc3-sgyl4-0-0-cust125.sgyl.cable.virginmedia.com [82.41.240.126]) + by opensource2.wolfsonmicro.com (Postfix) with ESMTPSA id F2D407881C9; + Tue, 16 Nov 2010 23:01:18 +0000 (GMT) +Received: from broonie by finisterre.wolfsonmicro.main with local (Exim 4.72) + (envelope-from <broonie@opensource.wolfsonmicro.com>) + id 1PIUWk-0007m9-B8; Tue, 16 Nov 2010 23:01:26 +0000 +Content-Disposition: inline +In-Reply-To: <20101116122102.86e7e0b9.rdunlap@xenotime.net> +X-Cookie: Beware of Bigfoot! +User-Agent: Mutt/1.5.20 (2009-06-14) +X-BeenThere: alsa-devel@alsa-project.org +X-Mailman-Version: 2.1.9 +Precedence: list +List-Id: "Alsa-devel mailing list for ALSA developers - + http://www.alsa-project.org" <alsa-devel.alsa-project.org> +List-Unsubscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe> +List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel> +List-Post: <mailto:alsa-devel@alsa-project.org> +List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help> +List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> +Sender: alsa-devel-bounces@alsa-project.org +Errors-To: alsa-devel-bounces@alsa-project.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1063481> + +On Tue, Nov 16, 2010 at 12:21:02PM -0800, Randy Dunlap wrote: + +> I don't know what you asked Joe to change, but asking someone to use +> the documented canonical patch format: + +> <quote> +> The canonical patch subject line is: + +> Subject: [PATCH 001/123] subsystem: summary phrase +> </quote> + +> should be fine. And there is no need for printf-ish templates +> for this in MAINTAINERS either. + +That's exactly what I asked him to do. He said he's not willing to use +anything for "subsystem" which can't be automatically generated. + +The formats I mentioned because some subsystems have their own things +within this format like "subsystem: driver:" or whatever. While it's +probably not an issue for the sort of patch Joe generates if we do have +a tool for this I'd expect it'll go the same way that checkpatch does +and get used by people doing more specific work. It'd be good to try to +head off the friction that may cause by at least having an idea how we +might cope with that. + + diff --git a/test/corpora/lkml/cur/1382298793.003459:2, b/test/corpora/lkml/cur/1382298793.003459:2, new file mode 100644 index 00000000..8fddae82 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.003459:2, @@ -0,0 +1,88 @@ +From: Mark Brown <broonie@opensource.wolfsonmicro.com> +Subject: Re: rfc: rewrite commit subject line for subsystem + maintainer preference tool +Date: Tue, 16 Nov 2010 23:22:58 +0000 +Lines: 12 +Message-ID: <20101116232258.GC24623@opensource.wolfsonmicro.com> +References: <1289850773.16461.166.camel@Joe-Laptop> + <20101116104921.GL12986@rakim.wolfsonmicro.main> + <1289919077.28741.50.camel@Joe-Laptop> + <20101116183707.179964dd@schatten.dmk.lab> + <20101116181226.GB26239@rakim.wolfsonmicro.main> + <20101116203522.65240b18@schatten.dmk.lab> + <20101116195530.GA7523@rakim.wolfsonmicro.main> + <20101116122102.86e7e0b9.rdunlap@xenotime.net> + <1289940156.28741.207.camel@Joe-Laptop> + <20101116124609.382e42fb.rdunlap@xenotime.net> +Mime-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Cc: alsa-devel@alsa-project.org, Jiri Kosina <trivial@kernel.org>, + linux-kernel@vger.kernel.org, Florian Mickler <florian@mickler.org>, + Joe Perches <joe@perches.com>, Andrew Morton <akpm@linux-foundation.org> +To: Randy Dunlap <rdunlap@xenotime.net> +X-From: alsa-devel-bounces@alsa-project.org Wed Nov 17 00:22:58 2010 +Return-path: <alsa-devel-bounces@alsa-project.org> +Envelope-to: glad-alsa-devel-2@m.gmane.org +Received: from alsa0.perex.cz ([212.20.107.51]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <alsa-devel-bounces@alsa-project.org>) + id 1PIUrZ-0001Km-F5 + for glad-alsa-devel-2@m.gmane.org; Wed, 17 Nov 2010 00:22:57 +0100 +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id 28F9610381A; Wed, 17 Nov 2010 00:22:55 +0100 (CET) +X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on mail1.perex.cz +X-Spam-Level: +X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=disabled + version=3.2.4 +Received: from alsa0.perex.cz (localhost [127.0.0.1]) + by alsa0.perex.cz (Postfix) with ESMTP id 1CC8D10381B; + Wed, 17 Nov 2010 00:22:55 +0100 (CET) +X-Original-To: alsa-devel@alsa-project.org +Delivered-To: alsa-devel@alsa-project.org +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id B1B8B10381B; Wed, 17 Nov 2010 00:22:52 +0100 (CET) +Received: from opensource2.wolfsonmicro.com (opensource.wolfsonmicro.com + [80.75.67.52]) by alsa0.perex.cz (Postfix) with ESMTP id CB03810381A + for <alsa-devel@alsa-project.org>; Wed, 17 Nov 2010 00:22:51 +0100 (CET) +Received: from finisterre.wolfsonmicro.main + (cpc3-sgyl4-0-0-cust125.sgyl.cable.virginmedia.com [82.41.240.126]) + by opensource2.wolfsonmicro.com (Postfix) with ESMTPSA id 39A957881C9; + Tue, 16 Nov 2010 23:22:51 +0000 (GMT) +Received: from broonie by finisterre.wolfsonmicro.main with local (Exim 4.72) + (envelope-from <broonie@opensource.wolfsonmicro.com>) + id 1PIUra-0001BL-NS; Tue, 16 Nov 2010 23:22:58 +0000 +Content-Disposition: inline +In-Reply-To: <20101116124609.382e42fb.rdunlap@xenotime.net> +X-Cookie: Beware of Bigfoot! +User-Agent: Mutt/1.5.20 (2009-06-14) +X-BeenThere: alsa-devel@alsa-project.org +X-Mailman-Version: 2.1.9 +Precedence: list +List-Id: "Alsa-devel mailing list for ALSA developers - + http://www.alsa-project.org" <alsa-devel.alsa-project.org> +List-Unsubscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe> +List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel> +List-Post: <mailto:alsa-devel@alsa-project.org> +List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help> +List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> +Sender: alsa-devel-bounces@alsa-project.org +Errors-To: alsa-devel-bounces@alsa-project.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1063492> + +On Tue, Nov 16, 2010 at 12:46:09PM -0800, Randy Dunlap wrote: +> On Tue, 16 Nov 2010 12:42:36 -0800 Joe Perches wrote: + +> > Some subsystem maintainers like upper case, some mixed, some lower. +> > Some aren't consistent. (Staging/staging) + +> Case usually doesn't matter to most of us. + +Given that we're working in case sensitive languages here it's probably +safe to assume that a reasonable proportion of people will care; being +reasonably consistent with existing practice for the subsystem seems +sensible. + + diff --git a/test/corpora/lkml/cur/1382298793.003462:2, b/test/corpora/lkml/cur/1382298793.003462:2, new file mode 100644 index 00000000..4f6ba5ae --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.003462:2, @@ -0,0 +1,97 @@ +From: Randy Dunlap <rdunlap@xenotime.net> +Subject: Re: rfc: rewrite commit subject line for subsystem + maintainer preference tool +Date: Tue, 16 Nov 2010 15:28:35 -0800 +Organization: YPO4 +Lines: 26 +Message-ID: <20101116152835.b0ab571c.rdunlap@xenotime.net> +References: <1289850773.16461.166.camel@Joe-Laptop> + <20101116104921.GL12986@rakim.wolfsonmicro.main> + <1289919077.28741.50.camel@Joe-Laptop> + <20101116183707.179964dd@schatten.dmk.lab> + <20101116181226.GB26239@rakim.wolfsonmicro.main> + <20101116203522.65240b18@schatten.dmk.lab> + <20101116195530.GA7523@rakim.wolfsonmicro.main> + <20101116122102.86e7e0b9.rdunlap@xenotime.net> + <1289940156.28741.207.camel@Joe-Laptop> + <20101116124609.382e42fb.rdunlap@xenotime.net> + <20101116232258.GC24623@opensource.wolfsonmicro.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Cc: alsa-devel@alsa-project.org, Jiri Kosina <trivial@kernel.org>, + linux-kernel@vger.kernel.org, Florian Mickler <florian@mickler.org>, + Joe Perches <joe@perches.com>, Andrew Morton <akpm@linux-foundation.org> +To: Mark Brown <broonie@opensource.wolfsonmicro.com> +X-From: alsa-devel-bounces@alsa-project.org Wed Nov 17 00:29:00 2010 +Return-path: <alsa-devel-bounces@alsa-project.org> +Envelope-to: glad-alsa-devel-2@m.gmane.org +Received: from alsa0.perex.cz ([212.20.107.51]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <alsa-devel-bounces@alsa-project.org>) + id 1PIUxP-0004iI-Hq + for glad-alsa-devel-2@m.gmane.org; Wed, 17 Nov 2010 00:28:59 +0100 +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id AD65410388C; Wed, 17 Nov 2010 00:28:58 +0100 (CET) +X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on mail1.perex.cz +X-Spam-Level: +X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=disabled + version=3.2.4 +Received: from alsa0.perex.cz (localhost [127.0.0.1]) + by alsa0.perex.cz (Postfix) with ESMTP id 21296103822; + Wed, 17 Nov 2010 00:28:57 +0100 (CET) +X-Original-To: alsa-devel@alsa-project.org +Delivered-To: alsa-devel@alsa-project.org +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id 58AE7103822; Wed, 17 Nov 2010 00:28:54 +0100 (CET) +Received: from xenotime.net (xenotime.net [72.52.115.56]) + by alsa0.perex.cz (Postfix) with SMTP id 1947B10381B + for <alsa-devel@alsa-project.org>; Wed, 17 Nov 2010 00:28:52 +0100 (CET) +Received: from chimera.site ([173.50.240.230]) by xenotime.net for + <alsa-devel@alsa-project.org>; Tue, 16 Nov 2010 15:28:36 -0800 +In-Reply-To: <20101116232258.GC24623@opensource.wolfsonmicro.com> +X-Mailer: Sylpheed 2.7.1 (GTK+ 2.16.6; x86_64-unknown-linux-gnu) +X-BeenThere: alsa-devel@alsa-project.org +X-Mailman-Version: 2.1.9 +Precedence: list +List-Id: "Alsa-devel mailing list for ALSA developers - + http://www.alsa-project.org" <alsa-devel.alsa-project.org> +List-Unsubscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe> +List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel> +List-Post: <mailto:alsa-devel@alsa-project.org> +List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help> +List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> +Sender: alsa-devel-bounces@alsa-project.org +Errors-To: alsa-devel-bounces@alsa-project.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1063495> + +On Tue, 16 Nov 2010 23:22:58 +0000 Mark Brown wrote: + +> On Tue, Nov 16, 2010 at 12:46:09PM -0800, Randy Dunlap wrote: +> > On Tue, 16 Nov 2010 12:42:36 -0800 Joe Perches wrote: +> +> > > Some subsystem maintainers like upper case, some mixed, some lower. +> > > Some aren't consistent. (Staging/staging) +> +> > Case usually doesn't matter to most of us. +> +> Given that we're working in case sensitive languages here it's probably +> safe to assume that a reasonable proportion of people will care; being +> reasonably consistent with existing practice for the subsystem seems +> sensible. + +Greg takes patches that say STAGING or Staging or staging. + +DaveM takes patches that say net: or netdev: or network: or NET: + +The sound maintainers take patches that say sound: or alsa: or ALSA: + +etc. + +--- +~Randy +*** Remember to use Documentation/SubmitChecklist when testing your code *** + + diff --git a/test/corpora/lkml/cur/1382298793.003468:2, b/test/corpora/lkml/cur/1382298793.003468:2, new file mode 100644 index 00000000..a26128d3 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.003468:2, @@ -0,0 +1,99 @@ +From: Mark Brown <broonie@opensource.wolfsonmicro.com> +Subject: Re: rfc: rewrite commit subject line for subsystem + maintainer preference tool +Date: Tue, 16 Nov 2010 23:50:26 +0000 +Lines: 23 +Message-ID: <20101116235025.GA7256@opensource.wolfsonmicro.com> +References: <1289919077.28741.50.camel@Joe-Laptop> + <20101116183707.179964dd@schatten.dmk.lab> + <20101116181226.GB26239@rakim.wolfsonmicro.main> + <20101116203522.65240b18@schatten.dmk.lab> + <20101116195530.GA7523@rakim.wolfsonmicro.main> + <20101116122102.86e7e0b9.rdunlap@xenotime.net> + <1289940156.28741.207.camel@Joe-Laptop> + <20101116124609.382e42fb.rdunlap@xenotime.net> + <20101116232258.GC24623@opensource.wolfsonmicro.com> + <20101116152835.b0ab571c.rdunlap@xenotime.net> +Mime-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Cc: alsa-devel@alsa-project.org, Jiri Kosina <trivial@kernel.org>, + linux-kernel@vger.kernel.org, Florian Mickler <florian@mickler.org>, + Joe Perches <joe@perches.com>, Andrew Morton <akpm@linux-foundation.org> +To: Randy Dunlap <rdunlap@xenotime.net> +X-From: alsa-devel-bounces@alsa-project.org Wed Nov 17 00:50:24 2010 +Return-path: <alsa-devel-bounces@alsa-project.org> +Envelope-to: glad-alsa-devel-2@m.gmane.org +Received: from alsa0.perex.cz ([212.20.107.51]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <alsa-devel-bounces@alsa-project.org>) + id 1PIVI7-00006s-O3 + for glad-alsa-devel-2@m.gmane.org; Wed, 17 Nov 2010 00:50:23 +0100 +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id F007910388B; Wed, 17 Nov 2010 00:50:22 +0100 (CET) +X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on mail1.perex.cz +X-Spam-Level: +X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=disabled + version=3.2.4 +Received: from alsa0.perex.cz (localhost [127.0.0.1]) + by alsa0.perex.cz (Postfix) with ESMTP id 9E0B9103822; + Wed, 17 Nov 2010 00:50:21 +0100 (CET) +X-Original-To: alsa-devel@alsa-project.org +Delivered-To: alsa-devel@alsa-project.org +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id AD918103822; Wed, 17 Nov 2010 00:50:19 +0100 (CET) +Received: from opensource2.wolfsonmicro.com (opensource.wolfsonmicro.com + [80.75.67.52]) by alsa0.perex.cz (Postfix) with ESMTP id 39C5A10381B + for <alsa-devel@alsa-project.org>; Wed, 17 Nov 2010 00:50:19 +0100 (CET) +Received: from finisterre.wolfsonmicro.main + (cpc3-sgyl4-0-0-cust125.sgyl.cable.virginmedia.com [82.41.240.126]) + by opensource2.wolfsonmicro.com (Postfix) with ESMTPSA id B19503B4628; + Tue, 16 Nov 2010 23:50:18 +0000 (GMT) +Received: from broonie by finisterre.wolfsonmicro.main with local (Exim 4.72) + (envelope-from <broonie@opensource.wolfsonmicro.com>) + id 1PIVIA-0003UP-7d; Tue, 16 Nov 2010 23:50:26 +0000 +Content-Disposition: inline +In-Reply-To: <20101116152835.b0ab571c.rdunlap@xenotime.net> +X-Cookie: You enjoy the company of other people. +User-Agent: Mutt/1.5.20 (2009-06-14) +X-BeenThere: alsa-devel@alsa-project.org +X-Mailman-Version: 2.1.9 +Precedence: list +List-Id: "Alsa-devel mailing list for ALSA developers - + http://www.alsa-project.org" <alsa-devel.alsa-project.org> +List-Unsubscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe> +List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel> +List-Post: <mailto:alsa-devel@alsa-project.org> +List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help> +List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> +Sender: alsa-devel-bounces@alsa-project.org +Errors-To: alsa-devel-bounces@alsa-project.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1063501> + +On Tue, Nov 16, 2010 at 03:28:35PM -0800, Randy Dunlap wrote: +> On Tue, 16 Nov 2010 23:22:58 +0000 Mark Brown wrote: +> > On Tue, Nov 16, 2010 at 12:46:09PM -0800, Randy Dunlap wrote: + +> > > Case usually doesn't matter to most of us. + +> > Given that we're working in case sensitive languages here it's probably +> > safe to assume that a reasonable proportion of people will care; being +> > reasonably consistent with existing practice for the subsystem seems +> > sensible. + +> Greg takes patches that say STAGING or Staging or staging. + +> DaveM takes patches that say net: or netdev: or network: or NET: + +> The sound maintainers take patches that say sound: or alsa: or ALSA: + +> etc. + +...and best practice would be to pay attention to what the standard +thing is for the subsystem and follow that. We shouldn't be suggesting +that people just ignore the case, though obviously if it's not clear +then it's not worth worrying too much about it. + + diff --git a/test/corpora/lkml/cur/1382298793.003471:2, b/test/corpora/lkml/cur/1382298793.003471:2, new file mode 100644 index 00000000..1e1fc4a8 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.003471:2, @@ -0,0 +1,79 @@ +From: Joe Perches <joe@perches.com> +Subject: Re: rfc: rewrite commit subject line for subsystem maintainer + preference tool +Date: Tue, 16 Nov 2010 15:57:57 -0800 +Lines: 25 +Message-ID: <1289951877.28741.262.camel@Joe-Laptop> +References: <1289850773.16461.166.camel@Joe-Laptop> + <20101116104921.GL12986@rakim.wolfsonmicro.main> + <1289919077.28741.50.camel@Joe-Laptop> + <20101116183707.179964dd@schatten.dmk.lab> + <20101116181226.GB26239@rakim.wolfsonmicro.main> + <20101116203522.65240b18@schatten.dmk.lab> + <20101116195530.GA7523@rakim.wolfsonmicro.main> + <20101116122102.86e7e0b9.rdunlap@xenotime.net> + <1289940156.28741.207.camel@Joe-Laptop> + <20101116124609.382e42fb.rdunlap@xenotime.net> + <20101116232258.GC24623@opensource.wolfsonmicro.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset="UTF-8" +Content-Transfer-Encoding: 7bit +Cc: Randy Dunlap <rdunlap@xenotime.net>, + Florian Mickler <florian@mickler.org>, + Jiri Kosina <trivial@kernel.org>, + Andrew Morton <akpm@linux-foundation.org>, + alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org +To: Mark Brown <broonie@opensource.wolfsonmicro.com> +X-From: linux-kernel-owner@vger.kernel.org Wed Nov 17 00:58:25 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PIVPr-0004pn-RQ + for glk-linux-kernel-3@lo.gmane.org; Wed, 17 Nov 2010 00:58:24 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1757881Ab0KPX6A (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Tue, 16 Nov 2010 18:58:00 -0500 +Received: from mail.perches.com ([173.55.12.10]:1493 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1757143Ab0KPX57 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Tue, 16 Nov 2010 18:57:59 -0500 +Received: from [192.168.1.162] (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id B87C82436B; + Tue, 16 Nov 2010 15:55:40 -0800 (PST) +In-Reply-To: <20101116232258.GC24623@opensource.wolfsonmicro.com> +X-Mailer: Evolution 2.30.3 +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1063504> + +On Tue, 2010-11-16 at 23:22 +0000, Mark Brown wrote: +> On Tue, Nov 16, 2010 at 12:46:09PM -0800, Randy Dunlap wrote: +> > On Tue, 16 Nov 2010 12:42:36 -0800 Joe Perches wrote: +> > > Some subsystem maintainers like upper case, some mixed, some lower. +> > > Some aren't consistent. (Staging/staging) +> > Case usually doesn't matter to most of us. +> Given that we're working in case sensitive languages here it's probably +> safe to assume that a reasonable proportion of people will care; being +> reasonably consistent with existing practice for the subsystem seems +> sensible. + +Presumably the tool would also have to traverse up the tree +to find the appropriate style so every MAINTAINERS section +would not need a C entry. + +ie: sound/soc/codecs/foo could use the C: entry for sound/soc/ + +Perhaps something like: + C: ASoC basename: + +and for arch/x86/: + C: x86, dirname: + +etc. + + + diff --git a/test/corpora/lkml/cur/1382298793.003472:2, b/test/corpora/lkml/cur/1382298793.003472:2, new file mode 100644 index 00000000..0e360fd9 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.003472:2, @@ -0,0 +1,84 @@ +From: Joe Perches <joe@perches.com> +Subject: Re: rfc: rewrite commit subject line for subsystem maintainer + preference tool +Date: Tue, 16 Nov 2010 15:57:55 -0800 +Lines: 29 +Message-ID: <1289951875.28741.261.camel@Joe-Laptop> +References: <1289850773.16461.166.camel@Joe-Laptop> + <20101116104921.GL12986@rakim.wolfsonmicro.main> + <1289919077.28741.50.camel@Joe-Laptop> + <20101116183707.179964dd@schatten.dmk.lab> + <20101116181226.GB26239@rakim.wolfsonmicro.main> + <20101116203522.65240b18@schatten.dmk.lab> + <20101116195530.GA7523@rakim.wolfsonmicro.main> + <20101116122102.86e7e0b9.rdunlap@xenotime.net> + <1289940156.28741.207.camel@Joe-Laptop> + <20101116124609.382e42fb.rdunlap@xenotime.net> + <20101116232258.GC24623@opensource.wolfsonmicro.com> + <20101116152835.b0ab571c.rdunlap@xenotime.net> +Mime-Version: 1.0 +Content-Type: text/plain; charset="UTF-8" +Content-Transfer-Encoding: 7bit +Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>, + Florian Mickler <florian@mickler.org>, + Jiri Kosina <trivial@kernel.org>, + Andrew Morton <akpm@linux-foundation.org>, + alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org +To: Randy Dunlap <rdunlap@xenotime.net> +X-From: linux-kernel-owner@vger.kernel.org Wed Nov 17 00:58:26 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PIVPr-0004pn-AW + for glk-linux-kernel-3@lo.gmane.org; Wed, 17 Nov 2010 00:58:23 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1757099Ab0KPX56 (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Tue, 16 Nov 2010 18:57:58 -0500 +Received: from mail.perches.com ([173.55.12.10]:1485 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1751238Ab0KPX55 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Tue, 16 Nov 2010 18:57:57 -0500 +Received: from [192.168.1.162] (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 18B3A24368; + Tue, 16 Nov 2010 15:55:38 -0800 (PST) +In-Reply-To: <20101116152835.b0ab571c.rdunlap@xenotime.net> +X-Mailer: Evolution 2.30.3 +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1063505> + +On Tue, 2010-11-16 at 15:28 -0800, Randy Dunlap wrote: +> On Tue, 16 Nov 2010 23:22:58 +0000 Mark Brown wrote: +> > On Tue, Nov 16, 2010 at 12:46:09PM -0800, Randy Dunlap wrote: +> > > On Tue, 16 Nov 2010 12:42:36 -0800 Joe Perches wrote: +> > > > Some subsystem maintainers like upper case, some mixed, some lower. +> > > > Some aren't consistent. (Staging/staging) +> > > Case usually doesn't matter to most of us. +> > Given that we're working in case sensitive languages here it's probably +> > safe to assume that a reasonable proportion of people will care; being +> > reasonably consistent with existing practice for the subsystem seems +> > sensible. +> Greg takes patches that say STAGING or Staging or staging. + +Greg seems to rewrite patch subjects and is inconsistent +about case, so he might be doing that by hand. + +> DaveM takes patches that say net: or netdev: or network: or NET: + +DaveM doesn't appear to be choosy about patch subject lines. +He seems to take any sensible patch and as far as I know he +doesn't edit the subject lines. He does reject inferior +patches outright. + +> The sound maintainers take patches that say sound: or alsa: or ALSA: + +The sound maintainers seem to rewrite patch subjects on an +ad-hoc basis. + + + + diff --git a/test/corpora/lkml/cur/1382298793.003478:2, b/test/corpora/lkml/cur/1382298793.003478:2, new file mode 100644 index 00000000..c95e3f86 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.003478:2, @@ -0,0 +1,113 @@ +From: Joel Becker <Joel.Becker@oracle.com> +Subject: Re: [PATCH 36/44] fs/ocfs2: Remove unnecessary + semicolons +Date: Tue, 16 Nov 2010 16:10:47 -0800 +Lines: 38 +Message-ID: <20101117001046.GE10237@mail.oracle.com> +References: <cover.1289789604.git.joe@perches.com> + <e32409b17aaa1a54fec85f3654583ef08fcf851c.1289789605.git.joe@perches.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Cc: Mark Fasheh <mfasheh@suse.com>, Jiri Kosina <trivial@kernel.org>, + linux-kernel@vger.kernel.org, ocfs2-devel@oss.oracle.com +To: Joe Perches <joe@perches.com> +X-From: ocfs2-devel-bounces@oss.oracle.com Wed Nov 17 01:11:36 2010 +Return-path: <ocfs2-devel-bounces@oss.oracle.com> +Envelope-to: gcfod-ocfs2-devel@gmane.org +Received: from rcsinet10.oracle.com ([148.87.113.121]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <ocfs2-devel-bounces@oss.oracle.com>) + id 1PIVcY-0003qc-VC + for gcfod-ocfs2-devel@gmane.org; Wed, 17 Nov 2010 01:11:31 +0100 +Received: from rcsinet15.oracle.com (rcsinet15.oracle.com [148.87.113.117]) + by rcsinet10.oracle.com (Switch-3.4.2/Switch-3.4.2) with ESMTP id oAH0B96Y007820 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); + Wed, 17 Nov 2010 00:11:10 GMT +Received: from oss.oracle.com (oss.oracle.com [141.146.12.120]) + by rcsinet15.oracle.com (Switch-3.4.2/Switch-3.4.1) with ESMTP id oAH0B6rM032434 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); + Wed, 17 Nov 2010 00:11:07 GMT +Received: from localhost ([127.0.0.1] helo=oss.oracle.com) + by oss.oracle.com with esmtp (Exim 4.63) + (envelope-from <ocfs2-devel-bounces@oss.oracle.com>) + id 1PIVcA-0001bs-K0; Tue, 16 Nov 2010 16:11:06 -0800 +Received: from rcsinet15.oracle.com ([148.87.113.117]) + by oss.oracle.com with esmtp (Exim 4.63) + (envelope-from <joel.becker@oracle.com>) id 1PIVc7-0001bl-Td + for ocfs2-devel@oss.oracle.com; Tue, 16 Nov 2010 16:11:04 -0800 +Received: from acsmt354.oracle.com (acsmt354.oracle.com [141.146.40.154]) + by rcsinet15.oracle.com (Switch-3.4.2/Switch-3.4.1) with ESMTP id + oAH0B1gV032165; Wed, 17 Nov 2010 00:11:01 GMT +Received: from ca-server1.us.oracle.com by acsmt353.oracle.com + with ESMTP id 784380701289952654; Tue, 16 Nov 2010 16:10:54 -0800 +Received: from jlbec by ca-server1.us.oracle.com with local (Exim 4.69) + (envelope-from <joel.becker@oracle.com>) + id 1PIVbx-0007gG-4G; Tue, 16 Nov 2010 16:10:53 -0800 +Mail-Followup-To: Joe Perches <joe@perches.com>, + Jiri Kosina <trivial@kernel.org>, Mark Fasheh <mfasheh@suse.com>, + ocfs2-devel@oss.oracle.com, linux-kernel@vger.kernel.org +Content-Disposition: inline +In-Reply-To: <e32409b17aaa1a54fec85f3654583ef08fcf851c.1289789605.git.joe@perches.com> +X-Burt-Line: Trees are cool. +X-Red-Smith: Ninety feet between bases is perhaps as close as man has ever + come to perfection. +User-Agent: Mutt/1.5.20 (2009-06-14) +X-BeenThere: ocfs2-devel@oss.oracle.com +X-Mailman-Version: 2.1.9 +Precedence: list +List-Id: <ocfs2-devel.oss.oracle.com> +List-Unsubscribe: <http://oss.oracle.com/mailman/listinfo/ocfs2-devel>, + <mailto:ocfs2-devel-request@oss.oracle.com?subject=unsubscribe> +List-Archive: <http://oss.oracle.com/pipermail/ocfs2-devel> +List-Post: <mailto:ocfs2-devel@oss.oracle.com> +List-Help: <mailto:ocfs2-devel-request@oss.oracle.com?subject=help> +List-Subscribe: <http://oss.oracle.com/mailman/listinfo/ocfs2-devel>, + <mailto:ocfs2-devel-request@oss.oracle.com?subject=subscribe> +Sender: ocfs2-devel-bounces@oss.oracle.com +Errors-To: ocfs2-devel-bounces@oss.oracle.com +X-Source-IP: oss.oracle.com [141.146.12.120] +X-Auth-Type: Internal IP +X-CT-RefId: str=0001.0A090207.4CE31D9C.007A:SCFSTAT3865452,ss=1,fgs=0 +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1063511> + +On Sun, Nov 14, 2010 at 07:04:55PM -0800, Joe Perches wrote: +> Signed-off-by: Joe Perches <joe@perches.com> + +Acked-by: Joel Becker <joel.becker@oracle.com> + + +> --- +> fs/ocfs2/refcounttree.c | 2 +- +> 1 files changed, 1 insertions(+), 1 deletions(-) +> +> diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c +> index b5f9160..da14a42 100644 +> --- a/fs/ocfs2/refcounttree.c +> +++ b/fs/ocfs2/refcounttree.c +> @@ -3704,7 +3704,7 @@ int ocfs2_refcount_cow_xattr(struct inode *inode, +> context->cow_start = cow_start; +> context->cow_len = cow_len; +> context->ref_tree = ref_tree; +> - context->ref_root_bh = ref_root_bh;; +> + context->ref_root_bh = ref_root_bh; +> context->cow_object = xv; +> +> context->cow_duplicate_clusters = ocfs2_duplicate_clusters_by_jbd; +> -- +> 1.7.3.1.g432b3.dirty +> + +-- + +Life's Little Instruction Book #237 + + "Seek out the good in people." + +Joel Becker +Senior Development Manager +Oracle +E-mail: joel.becker@oracle.com +Phone: (650) 506-8127 + + diff --git a/test/corpora/lkml/cur/1382298793.003497:2, b/test/corpora/lkml/cur/1382298793.003497:2, new file mode 100644 index 00000000..ab478861 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.003497:2, @@ -0,0 +1,94 @@ +From: Stefan Richter <stefanr@s5r6.in-berlin.de> +Subject: Re: rfc: rewrite commit subject line for subsystem maintainer + preference tool +Date: Wed, 17 Nov 2010 01:44:27 +0100 +Lines: 34 +Message-ID: <20101117014427.41d85b13@stein> +References: <1289848458.16461.150.camel@Joe-Laptop> + <20101115193407.GK12986@rakim.wolfsonmicro.main> + <1289850773.16461.166.camel@Joe-Laptop> + <20101116104921.GL12986@rakim.wolfsonmicro.main> + <1289919077.28741.50.camel@Joe-Laptop> + <20101116183707.179964dd@schatten.dmk.lab> + <20101116181226.GB26239@rakim.wolfsonmicro.main> + <20101116203522.65240b18@schatten.dmk.lab> + <20101116195530.GA7523@rakim.wolfsonmicro.main> + <20101116122102.86e7e0b9.rdunlap@xenotime.net> + <20101116230126.GB24623@opensource.wolfsonmicro.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=US-ASCII +Content-Transfer-Encoding: 7bit +Cc: Randy Dunlap <rdunlap@xenotime.net>, + Florian Mickler <florian@mickler.org>, + Joe Perches <joe@perches.com>, + Jiri Kosina <trivial@kernel.org>, + Andrew Morton <akpm@linux-foundation.org>, + alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org +To: Mark Brown <broonie@opensource.wolfsonmicro.com> +X-From: linux-kernel-owner@vger.kernel.org Wed Nov 17 01:45:44 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PIW9d-0005et-Ft + for glk-linux-kernel-3@lo.gmane.org; Wed, 17 Nov 2010 01:45:41 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S933190Ab0KQApU (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Tue, 16 Nov 2010 19:45:20 -0500 +Received: from einhorn.in-berlin.de ([192.109.42.8]:40608 "EHLO + einhorn.in-berlin.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S932265Ab0KQApS (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Tue, 16 Nov 2010 19:45:18 -0500 +X-Envelope-From: stefanr@s5r6.in-berlin.de +Received: from stein ([83.221.231.7]) + (authenticated bits=0) + by einhorn.in-berlin.de (8.13.6/8.13.6/Debian-1) with ESMTP id oAH0iRjV025917 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); + Wed, 17 Nov 2010 01:44:28 +0100 +In-Reply-To: <20101116230126.GB24623@opensource.wolfsonmicro.com> +X-Mailer: Claws Mail 3.7.6 (GTK+ 2.20.1; x86_64-pc-linux-gnu) +X-Scanned-By: MIMEDefang_at_IN-Berlin_e.V. on 192.109.42.8 +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1063530> + +On Nov 16 Mark Brown wrote: +> On Tue, Nov 16, 2010 at 12:21:02PM -0800, Randy Dunlap wrote: +> +> > I don't know what you asked Joe to change, but asking someone to use +> > the documented canonical patch format: +> +> > <quote> +> > The canonical patch subject line is: +> +> > Subject: [PATCH 001/123] subsystem: summary phrase +> > </quote> +> +> > should be fine. And there is no need for printf-ish templates +> > for this in MAINTAINERS either. +> +> That's exactly what I asked him to do. He said he's not willing to use +> anything for "subsystem" which can't be automatically generated. + +Why should we codify our conventions in MAINTAINERS to accommodate the +specific problem of virtually a _single_ patch author? + +Conventions are living and are being adjusted all the time, as code +organization changes, people join and go, projects start and cease. + +Said author please looks the conventions up in the git history. If he +finds that this decelerates his patch generation rate, he can surely +code a script that looks into git for him and suggests plausible +prefixes for his patch titles to him. Or he can collect a kind of +database (a config file) locally for his own use in which he records +conventional prefixes on the go. +-- +Stefan Richter +-=====-==-=- =-== =---= +http://arcgraph.de/sr/ + + diff --git a/test/corpora/lkml/cur/1382298793.003501:2, b/test/corpora/lkml/cur/1382298793.003501:2, new file mode 100644 index 00000000..67668d17 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.003501:2, @@ -0,0 +1,89 @@ +From: Jiri Kosina <jkosina@suse.cz> +Subject: Re: rfc: rewrite commit subject line for subsystem maintainer + preference tool +Date: Wed, 17 Nov 2010 01:53:35 +0100 (CET) +Lines: 43 +Message-ID: <alpine.LNX.2.00.1011170150060.7420@pobox.suse.cz> +References: <1289848458.16461.150.camel@Joe-Laptop> <20101115193407.GK12986@rakim.wolfsonmicro.main> <1289850773.16461.166.camel@Joe-Laptop> <20101116104921.GL12986@rakim.wolfsonmicro.main> <1289919077.28741.50.camel@Joe-Laptop> <20101116183707.179964dd@schatten.dmk.lab> + <20101116181226.GB26239@rakim.wolfsonmicro.main> <20101116203522.65240b18@schatten.dmk.lab> <20101116195530.GA7523@rakim.wolfsonmicro.main> <20101116122102.86e7e0b9.rdunlap@xenotime.net> <20101116230126.GB24623@opensource.wolfsonmicro.com> + <20101117014427.41d85b13@stein> +Mime-Version: 1.0 +Content-Type: TEXT/PLAIN; charset=US-ASCII +Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>, + Randy Dunlap <rdunlap@xenotime.net>, + Florian Mickler <florian@mickler.org>, + Joe Perches <joe@perches.com>, + Andrew Morton <akpm@linux-foundation.org>, + alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org +To: Stefan Richter <stefanr@s5r6.in-berlin.de> +X-From: linux-kernel-owner@vger.kernel.org Wed Nov 17 01:53:55 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PIWHa-0001VG-H4 + for glk-linux-kernel-3@lo.gmane.org; Wed, 17 Nov 2010 01:53:54 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S933245Ab0KQAxi (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Tue, 16 Nov 2010 19:53:38 -0500 +Received: from cantor2.suse.de ([195.135.220.15]:45188 "EHLO mx2.suse.de" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S932265Ab0KQAxh (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Tue, 16 Nov 2010 19:53:37 -0500 +Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) + by mx2.suse.de (Postfix) with ESMTP id 1C9DD867E2; + Wed, 17 Nov 2010 01:53:36 +0100 (CET) +In-Reply-To: <20101117014427.41d85b13@stein> +User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1063534> + +On Wed, 17 Nov 2010, Stefan Richter wrote: + +> > > I don't know what you asked Joe to change, but asking someone to use +> > > the documented canonical patch format: +> > +> > > <quote> +> > > The canonical patch subject line is: +> > +> > > Subject: [PATCH 001/123] subsystem: summary phrase +> > > </quote> +> > +> > > should be fine. And there is no need for printf-ish templates +> > > for this in MAINTAINERS either. +> > +> > That's exactly what I asked him to do. He said he's not willing to use +> > anything for "subsystem" which can't be automatically generated. +> +> Why should we codify our conventions in MAINTAINERS to accommodate the +> specific problem of virtually a _single_ patch author? +> +> Conventions are living and are being adjusted all the time, as code +> organization changes, people join and go, projects start and cease. +> +> Said author please looks the conventions up in the git history. If he +> finds that this decelerates his patch generation rate, he can surely +> code a script that looks into git for him and suggests plausible +> prefixes for his patch titles to him. Or he can collect a kind of +> database (a config file) locally for his own use in which he records +> conventional prefixes on the go. + +Come on guys, this debate is really horribly boring. + +Either the maintainer wants the patch. Then he is certainly able to apply +it no matter the subject line (I personally am getting a lot of patches +which don't follow the format I am using in my tree ... converting +Subject: lines is so trivial that I have never felt like bothering anyone +about it ... it's basically single condition in a shellscript). Or the +maintainer doesn't feel like the patch is worth it, and then the +subject-line format really doesn't matter. + +-- +Jiri Kosina +SUSE Labs, Novell Inc. + + diff --git a/test/corpora/lkml/cur/1382298793.003503:2, b/test/corpora/lkml/cur/1382298793.003503:2, new file mode 100644 index 00000000..0ea87ecf --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.003503:2, @@ -0,0 +1,110 @@ +From: Randy Dunlap <rdunlap@xenotime.net> +Subject: Re: rfc: rewrite commit subject line for subsystem + maintainer preference tool +Date: Tue, 16 Nov 2010 16:55:56 -0800 +Organization: YPO4 +Lines: 36 +Message-ID: <20101116165556.3ee8e236.rdunlap@xenotime.net> +References: <1289850773.16461.166.camel@Joe-Laptop> + <20101116104921.GL12986@rakim.wolfsonmicro.main> + <1289919077.28741.50.camel@Joe-Laptop> + <20101116183707.179964dd@schatten.dmk.lab> + <20101116181226.GB26239@rakim.wolfsonmicro.main> + <20101116203522.65240b18@schatten.dmk.lab> + <20101116195530.GA7523@rakim.wolfsonmicro.main> + <20101116122102.86e7e0b9.rdunlap@xenotime.net> + <1289940156.28741.207.camel@Joe-Laptop> + <20101116124609.382e42fb.rdunlap@xenotime.net> + <20101116232258.GC24623@opensource.wolfsonmicro.com> + <20101116152835.b0ab571c.rdunlap@xenotime.net> + <1289951875.28741.261.camel@Joe-Laptop> +Mime-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Cc: alsa-devel@alsa-project.org, Jiri Kosina <trivial@kernel.org>, + Mark Brown <broonie@opensource.wolfsonmicro.com>, + linux-kernel@vger.kernel.org, Florian Mickler <florian@mickler.org>, + Andrew Morton <akpm@linux-foundation.org> +To: Joe Perches <joe@perches.com> +X-From: alsa-devel-bounces@alsa-project.org Wed Nov 17 01:56:19 2010 +Return-path: <alsa-devel-bounces@alsa-project.org> +Envelope-to: glad-alsa-devel-2@m.gmane.org +Received: from alsa0.perex.cz ([212.20.107.51]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <alsa-devel-bounces@alsa-project.org>) + id 1PIWJv-0002k1-9C + for glad-alsa-devel-2@m.gmane.org; Wed, 17 Nov 2010 01:56:19 +0100 +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id 9953B1038A4; Wed, 17 Nov 2010 01:56:17 +0100 (CET) +X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on mail1.perex.cz +X-Spam-Level: +X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=disabled + version=3.2.4 +Received: from alsa0.perex.cz (localhost [127.0.0.1]) + by alsa0.perex.cz (Postfix) with ESMTP id C25DC24439; + Wed, 17 Nov 2010 01:56:09 +0100 (CET) +X-Original-To: alsa-devel@alsa-project.org +Delivered-To: alsa-devel@alsa-project.org +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id 316CC24439; Wed, 17 Nov 2010 01:56:08 +0100 (CET) +Received: from xenotime.net (xenotime.net [72.52.115.56]) + by alsa0.perex.cz (Postfix) with SMTP id 043F124436 + for <alsa-devel@alsa-project.org>; Wed, 17 Nov 2010 01:56:06 +0100 (CET) +Received: from chimera.site ([173.50.240.230]) by xenotime.net for + <alsa-devel@alsa-project.org>; Tue, 16 Nov 2010 16:55:57 -0800 +In-Reply-To: <1289951875.28741.261.camel@Joe-Laptop> +X-Mailer: Sylpheed 2.7.1 (GTK+ 2.16.6; x86_64-unknown-linux-gnu) +X-BeenThere: alsa-devel@alsa-project.org +X-Mailman-Version: 2.1.9 +Precedence: list +List-Id: "Alsa-devel mailing list for ALSA developers - + http://www.alsa-project.org" <alsa-devel.alsa-project.org> +List-Unsubscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe> +List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel> +List-Post: <mailto:alsa-devel@alsa-project.org> +List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help> +List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> +Sender: alsa-devel-bounces@alsa-project.org +Errors-To: alsa-devel-bounces@alsa-project.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1063536> + +On Tue, 16 Nov 2010 15:57:55 -0800 Joe Perches wrote: + +> On Tue, 2010-11-16 at 15:28 -0800, Randy Dunlap wrote: +> > On Tue, 16 Nov 2010 23:22:58 +0000 Mark Brown wrote: +> > > On Tue, Nov 16, 2010 at 12:46:09PM -0800, Randy Dunlap wrote: +> > > > On Tue, 16 Nov 2010 12:42:36 -0800 Joe Perches wrote: +> > > > > Some subsystem maintainers like upper case, some mixed, some lower. +> > > > > Some aren't consistent. (Staging/staging) +> > > > Case usually doesn't matter to most of us. +> > > Given that we're working in case sensitive languages here it's probably +> > > safe to assume that a reasonable proportion of people will care; being +> > > reasonably consistent with existing practice for the subsystem seems +> > > sensible. +> > Greg takes patches that say STAGING or Staging or staging. +> +> Greg seems to rewrite patch subjects and is inconsistent +> about case, so he might be doing that by hand. +> +> > DaveM takes patches that say net: or netdev: or network: or NET: +> +> DaveM doesn't appear to be choosy about patch subject lines. +> He seems to take any sensible patch and as far as I know he +> doesn't edit the subject lines. He does reject inferior +> patches outright. +> +> > The sound maintainers take patches that say sound: or alsa: or ALSA: +> +> The sound maintainers seem to rewrite patch subjects on an +> ad-hoc basis. + +OK, I can accept your summary. +However, I can't tell that we are making any progress. + +--- +~Randy +*** Remember to use Documentation/SubmitChecklist when testing your code *** + + diff --git a/test/corpora/lkml/cur/1382298793.003971:2, b/test/corpora/lkml/cur/1382298793.003971:2, new file mode 100644 index 00000000..4b510adc --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.003971:2, @@ -0,0 +1,106 @@ +From: Mark Brown <broonie@opensource.wolfsonmicro.com> +Subject: Re: rfc: rewrite commit subject line for subsystem + maintainer preference tool +Date: Wed, 17 Nov 2010 17:07:47 +0000 +Lines: 29 +Message-ID: <20101117170746.GB19488@rakim.wolfsonmicro.main> +References: <20101116104921.GL12986@rakim.wolfsonmicro.main> + <1289919077.28741.50.camel@Joe-Laptop> + <20101116183707.179964dd@schatten.dmk.lab> + <20101116181226.GB26239@rakim.wolfsonmicro.main> + <20101116203522.65240b18@schatten.dmk.lab> + <20101116195530.GA7523@rakim.wolfsonmicro.main> + <20101116122102.86e7e0b9.rdunlap@xenotime.net> + <20101116230126.GB24623@opensource.wolfsonmicro.com> + <20101117014427.41d85b13@stein> + <alpine.LNX.2.00.1011170150060.7420@pobox.suse.cz> +Mime-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, + Florian Mickler <florian@mickler.org>, Randy Dunlap <rdunlap@xenotime.net>, + Stefan Richter <stefanr@s5r6.in-berlin.de>, Joe Perches <joe@perches.com>, + Andrew Morton <akpm@linux-foundation.org> +To: Jiri Kosina <jkosina@suse.cz> +X-From: alsa-devel-bounces@alsa-project.org Wed Nov 17 18:07:59 2010 +Return-path: <alsa-devel-bounces@alsa-project.org> +Envelope-to: glad-alsa-devel-2@m.gmane.org +Received: from alsa0.perex.cz ([212.20.107.51]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <alsa-devel-bounces@alsa-project.org>) + id 1PIlUD-000436-I4 + for glad-alsa-devel-2@m.gmane.org; Wed, 17 Nov 2010 18:07:57 +0100 +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id B1000245CE; Wed, 17 Nov 2010 18:07:54 +0100 (CET) +X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on mail1.perex.cz +X-Spam-Level: +X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=disabled + version=3.2.4 +Received: from alsa0.perex.cz (localhost [127.0.0.1]) + by alsa0.perex.cz (Postfix) with ESMTP id C35471037EC; + Wed, 17 Nov 2010 18:07:52 +0100 (CET) +X-Original-To: alsa-devel@alsa-project.org +Delivered-To: alsa-devel@alsa-project.org +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id 4EE8F1037EC; Wed, 17 Nov 2010 18:07:51 +0100 (CET) +Received: from opensource2.wolfsonmicro.com (opensource.wolfsonmicro.com + [80.75.67.52]) by alsa0.perex.cz (Postfix) with ESMTP id A8A16245CE + for <alsa-devel@alsa-project.org>; Wed, 17 Nov 2010 18:07:50 +0100 (CET) +Received: from rakim.wolfsonmicro.main (lumison.wolfsonmicro.com + [87.246.78.27]) + by opensource2.wolfsonmicro.com (Postfix) with ESMTPSA id 9E3591147AC; + Wed, 17 Nov 2010 17:07:48 +0000 (GMT) +Received: from broonie by rakim.wolfsonmicro.main with local (Exim 4.72) + (envelope-from <broonie@rakim.wolfsonmicro.main>) + id 1PIlU3-00061C-Bl; Wed, 17 Nov 2010 17:07:47 +0000 +Content-Disposition: inline +In-Reply-To: <alpine.LNX.2.00.1011170150060.7420@pobox.suse.cz> +X-Cookie: Killing turkeys causes winter. +User-Agent: Mutt/1.5.20 (2009-06-14) +X-BeenThere: alsa-devel@alsa-project.org +X-Mailman-Version: 2.1.9 +Precedence: list +List-Id: "Alsa-devel mailing list for ALSA developers - + http://www.alsa-project.org" <alsa-devel.alsa-project.org> +List-Unsubscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe> +List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel> +List-Post: <mailto:alsa-devel@alsa-project.org> +List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help> +List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> +Sender: alsa-devel-bounces@alsa-project.org +Errors-To: alsa-devel-bounces@alsa-project.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1064007> + +On Wed, Nov 17, 2010 at 01:53:35AM +0100, Jiri Kosina wrote: +> On Wed, 17 Nov 2010, Stefan Richter wrote: + +> > Why should we codify our conventions in MAINTAINERS to accommodate the +> > specific problem of virtually a _single_ patch author? + +It seems to be the way we're heading in general - look at all the recent +work on MAINTAINERS and get_maintainer.pl. There seems to be a genral +push to make all this stuff automatable. + +> Either the maintainer wants the patch. Then he is certainly able to apply +> it no matter the subject line (I personally am getting a lot of patches +> which don't follow the format I am using in my tree ... converting +> Subject: lines is so trivial that I have never felt like bothering anyone +> about it ... it's basically single condition in a shellscript). Or the + +It's slightly more than that if you're dealing with more than one area, +and I also find this sort of stuff is a good flag for scrubbing the +patch in greater detail - when patches stand out from a 1000ft visual +overview there's a fair chance that there's other issues so if people +regularly submit good patches that have only cosmetic issues I find it's +worth guiding them away from that. + +> maintainer doesn't feel like the patch is worth it, and then the +> subject-line format really doesn't matter. + +In this case if I don't apply it it's likely to end up going in via your +tree and then I'll still have to deal with the merge conflicts which are +more annoying. + + diff --git a/test/corpora/lkml/cur/1382298793.004059:2, b/test/corpora/lkml/cur/1382298793.004059:2, new file mode 100644 index 00000000..646ac835 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.004059:2, @@ -0,0 +1,88 @@ +From: Pavel Machek <pavel@ucw.cz> +Subject: Re: [PATCH 44/44] sound/soc/codecs: Remove unnecessary + semicolons +Date: Wed, 17 Nov 2010 20:32:56 +0100 +Lines: 19 +Message-ID: <20101117193256.GA28010@ucw.cz> +References: <cover.1289789604.git.joe@perches.com> + <97fd199b7dac50613f6843156687223928cce44a.1289789605.git.joe@perches.com> + <20101115134939.GC12986@rakim.wolfsonmicro.main> + <1289840957.16461.138.camel@Joe-Laptop> + <20101115173031.GI12986@rakim.wolfsonmicro.main> + <1289842444.16461.140.camel@Joe-Laptop> +Mime-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Cc: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>, + alsa-devel@alsa-project.org, Jiri Kosina <trivial@kernel.org>, + Takashi Iwai <tiwai@suse.de>, linux-kernel@vger.kernel.org, + Mark Brown <broonie@opensource.wolfsonmicro.com>, + Ian Lartey <ian@opensource.wolfsonmicro.com>, + Liam Girdwood <lrg@slimlogic.co.uk> +To: Joe Perches <joe@perches.com> +X-From: alsa-devel-bounces@alsa-project.org Wed Nov 17 20:33:19 2010 +Return-path: <alsa-devel-bounces@alsa-project.org> +Envelope-to: glad-alsa-devel-2@m.gmane.org +Received: from alsa0.perex.cz ([212.20.107.51]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <alsa-devel-bounces@alsa-project.org>) + id 1PInkr-0005bs-LY + for glad-alsa-devel-2@m.gmane.org; Wed, 17 Nov 2010 20:33:17 +0100 +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id D7C501038BF; Wed, 17 Nov 2010 20:33:14 +0100 (CET) +X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on mail1.perex.cz +X-Spam-Level: +X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=disabled + version=3.2.4 +Received: from alsa0.perex.cz (localhost [127.0.0.1]) + by alsa0.perex.cz (Postfix) with ESMTP id 193061038BD; + Wed, 17 Nov 2010 20:33:08 +0100 (CET) +X-Original-To: alsa-devel@alsa-project.org +Delivered-To: alsa-devel@alsa-project.org +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id 664E91038BD; Wed, 17 Nov 2010 20:33:06 +0100 (CET) +Received: from atrey.karlin.mff.cuni.cz (ksp.mff.cuni.cz [195.113.26.206]) + by alsa0.perex.cz (Postfix) with ESMTP id 9E5621038BA + for <alsa-devel@alsa-project.org>; Wed, 17 Nov 2010 20:33:05 +0100 (CET) +Received: by atrey.karlin.mff.cuni.cz (Postfix, from userid 512) + id AC6A1F23E1; Wed, 17 Nov 2010 20:33:04 +0100 (CET) +Content-Disposition: inline +In-Reply-To: <1289842444.16461.140.camel@Joe-Laptop> +User-Agent: Mutt/1.5.20 (2009-06-14) +X-BeenThere: alsa-devel@alsa-project.org +X-Mailman-Version: 2.1.9 +Precedence: list +List-Id: "Alsa-devel mailing list for ALSA developers - + http://www.alsa-project.org" <alsa-devel.alsa-project.org> +List-Unsubscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe> +List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel> +List-Post: <mailto:alsa-devel@alsa-project.org> +List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help> +List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> +Sender: alsa-devel-bounces@alsa-project.org +Errors-To: alsa-devel-bounces@alsa-project.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1064096> + +On Mon 2010-11-15 09:34:04, Joe Perches wrote: +> On Mon, 2010-11-15 at 17:30 +0000, Mark Brown wrote: +> > On Mon, Nov 15, 2010 at 09:09:17AM -0800, Joe Perches wrote: +> > > Signed-off-by: Joe Perches <joe@perches.com> +> > Applied, thanks. +> > Please try to use changelog formats consistent with the code you're +> > modifying. +> +> I think it's more important to use consistent changelogs +> for a patch series. + +And I agree here. Having to learn code-style quirks for patches is +bad, having to learn new changelog style for each subsystem is very +bad. + Pavel + +-- +(english) http://www.livejournal.com/~pavelmachek +(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html + + diff --git a/test/corpora/lkml/cur/1382298793.004091:2, b/test/corpora/lkml/cur/1382298793.004091:2, new file mode 100644 index 00000000..1abc297f --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.004091:2, @@ -0,0 +1,133 @@ +From: Stefan Richter <stefanr@s5r6.in-berlin.de> +Subject: Re: rfc: rewrite commit subject line for subsystem maintainer + preference tool +Date: Wed, 17 Nov 2010 22:07:37 +0100 +Lines: 74 +Message-ID: <20101117220737.2d3d7356@stein> +References: <20101116104921.GL12986@rakim.wolfsonmicro.main> + <1289919077.28741.50.camel@Joe-Laptop> + <20101116183707.179964dd@schatten.dmk.lab> + <20101116181226.GB26239@rakim.wolfsonmicro.main> + <20101116203522.65240b18@schatten.dmk.lab> + <20101116195530.GA7523@rakim.wolfsonmicro.main> + <20101116122102.86e7e0b9.rdunlap@xenotime.net> + <20101116230126.GB24623@opensource.wolfsonmicro.com> + <20101117014427.41d85b13@stein> + <alpine.LNX.2.00.1011170150060.7420@pobox.suse.cz> + <20101117170746.GB19488@rakim.wolfsonmicro.main> +Mime-Version: 1.0 +Content-Type: text/plain; charset=US-ASCII +Content-Transfer-Encoding: 7bit +Cc: Jiri Kosina <jkosina@suse.cz>, Randy Dunlap <rdunlap@xenotime.net>, + Florian Mickler <florian@mickler.org>, + Joe Perches <joe@perches.com>, + Andrew Morton <akpm@linux-foundation.org>, + alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org +To: Mark Brown <broonie@opensource.wolfsonmicro.com> +X-From: linux-kernel-owner@vger.kernel.org Wed Nov 17 22:08:15 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PIpEk-0006ge-Hz + for glk-linux-kernel-3@lo.gmane.org; Wed, 17 Nov 2010 22:08:14 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1758632Ab0KQVHz (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Wed, 17 Nov 2010 16:07:55 -0500 +Received: from einhorn.in-berlin.de ([192.109.42.8]:48630 "EHLO + einhorn.in-berlin.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1751563Ab0KQVHy (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Wed, 17 Nov 2010 16:07:54 -0500 +X-Envelope-From: stefanr@s5r6.in-berlin.de +Received: from stein ([83.221.231.7]) + (authenticated bits=0) + by einhorn.in-berlin.de (8.13.6/8.13.6/Debian-1) with ESMTP id oAHL7dhi014114 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); + Wed, 17 Nov 2010 22:07:39 +0100 +In-Reply-To: <20101117170746.GB19488@rakim.wolfsonmicro.main> +X-Mailer: Claws Mail 3.7.6 (GTK+ 2.20.1; x86_64-pc-linux-gnu) +X-Scanned-By: MIMEDefang_at_IN-Berlin_e.V. on 192.109.42.8 +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1064128> + +On Nov 17 Mark Brown wrote: +> On Wed, Nov 17, 2010 at 01:53:35AM +0100, Jiri Kosina wrote: +> > On Wed, 17 Nov 2010, Stefan Richter wrote: +> +> > > Why should we codify our conventions in MAINTAINERS to accommodate the +> > > specific problem of virtually a _single_ patch author? +> +> It seems to be the way we're heading in general - look at all the recent +> work on MAINTAINERS and get_maintainer.pl. There seems to be a genral +> push to make all this stuff automatable. + +get_maintainer.pl, used with judgment and together with "gitk +the/patched/source.c" is nice not only for people like Joe who +regularly work tree-wide but also for ones like me who only rarely want +to submit a bug report or patch for a subsystem with they are +unfamiliar with. + +But the thought of a database of "how to start a good patch title" is +far-fetched. Really, as a patch author, just look how other people +write patch titles and judge whether this is good for your work too or +not. + +> > Either the maintainer wants the patch. Then he is certainly able to apply +> > it no matter the subject line (I personally am getting a lot of patches +> > which don't follow the format I am using in my tree ... converting +> > Subject: lines is so trivial that I have never felt like bothering anyone +> > about it ... it's basically single condition in a shellscript). Or the +> +> It's slightly more than that if you're dealing with more than one area, +> and I also find this sort of stuff is a good flag for scrubbing the +> patch in greater detail - when patches stand out from a 1000ft visual +> overview there's a fair chance that there's other issues so if people +> regularly submit good patches that have only cosmetic issues I find it's +> worth guiding them away from that. + +On one hand Jiri is right that maintainers can adjust title prefixes ad +hoc. (Downside: Weaker connection to mailinglist archives.) On the +other hand, in the case of long-term prolific authors like Joe it is +more optimal if there is a good patch title right from the outset. + +So, if this boring thread does at least yield the conclusion that +${path}/${filename}: is a bad title prefix, at least something was +won. :-) + +Another thought: Whether a typical part of a mass conversion, e.g. to +use a new helper macro without change of functionality, is named + + [PATCH] [subsystem] driver: use foo_bar helper +or + [PATCH] use foo_bar helper in subsystem, driver + +does not really matter, does it? This change is more about the helper +than about the driver. It is really a different kind of changeset than +a functional change that we want to be called + + [PATCH] [subsystem] driver: fix crash at disconnection + +or so. This is something that those who look for release notes of +that driver or subsystem want to grep in the changelog. + +Or in other words: If you as patch author wonder what would be a good +title for your patch, then ask yourself: How should this change show up +in kernel release notes that are constructed from the git shortlog? +Sometimes the answer to this question includes among else a prefix with +a canonical subsystem name (even case sensitive, with brackets or +colon), whereas other times such formalities are utterly pointless. + +[Sorry for the spent electrons. But OTOH, issues like (1.) optimum +use of reviewer bandwidth, (2.) kernel changelog alias release +notes /do/ matter.] +-- +Stefan Richter +-=====-==-=- =-== =---= +http://arcgraph.de/sr/ + + diff --git a/test/corpora/lkml/cur/1382298793.004190:2, b/test/corpora/lkml/cur/1382298793.004190:2, new file mode 100644 index 00000000..10a54af1 --- /dev/null +++ b/test/corpora/lkml/cur/1382298793.004190:2, @@ -0,0 +1,67 @@ +From: Joe Perches <joe@perches.com> +Subject: Re: rfc: rewrite commit subject line for subsystem maintainer + preference tool +Date: Wed, 17 Nov 2010 15:49:19 -0800 +Lines: 11 +Message-ID: <1290037759.28741.313.camel@Joe-Laptop> +References: <20101116104921.GL12986@rakim.wolfsonmicro.main> + <1289919077.28741.50.camel@Joe-Laptop> + <20101116183707.179964dd@schatten.dmk.lab> + <20101116181226.GB26239@rakim.wolfsonmicro.main> + <20101116203522.65240b18@schatten.dmk.lab> + <20101116195530.GA7523@rakim.wolfsonmicro.main> + <20101116122102.86e7e0b9.rdunlap@xenotime.net> + <20101116230126.GB24623@opensource.wolfsonmicro.com> + <20101117014427.41d85b13@stein> + <alpine.LNX.2.00.1011170150060.7420@pobox.suse.cz> + <20101117170746.GB19488@rakim.wolfsonmicro.main> + <20101117220737.2d3d7356@stein> +Mime-Version: 1.0 +Content-Type: text/plain; charset="UTF-8" +Content-Transfer-Encoding: 7bit +Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>, + Jiri Kosina <jkosina@suse.cz>, + Randy Dunlap <rdunlap@xenotime.net>, + Florian Mickler <florian@mickler.org>, + Andrew Morton <akpm@linux-foundation.org>, + alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org +To: Stefan Richter <stefanr@s5r6.in-berlin.de> +X-From: linux-kernel-owner@vger.kernel.org Thu Nov 18 00:49:42 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PIrkz-0000bE-Ro + for glk-linux-kernel-3@lo.gmane.org; Thu, 18 Nov 2010 00:49:42 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1752426Ab0KQXtX (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Wed, 17 Nov 2010 18:49:23 -0500 +Received: from mail.perches.com ([173.55.12.10]:1507 "EHLO mail.perches.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1750850Ab0KQXtW (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Wed, 17 Nov 2010 18:49:22 -0500 +Received: from [192.168.1.162] (unknown [192.168.1.162]) + by mail.perches.com (Postfix) with ESMTP id 7D75724368; + Wed, 17 Nov 2010 15:49:17 -0800 (PST) +In-Reply-To: <20101117220737.2d3d7356@stein> +X-Mailer: Evolution 2.30.3 +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1064228> + +On Wed, 2010-11-17 at 22:07 +0100, Stefan Richter wrote: +> So, if this boring thread does at least yield the conclusion that +> ${path}/${filename}: is a bad title prefix, at least something was +> won. :-) + +I've changed my scripts to use this style: + +Subject: [PATCH] $(basename $(dirname $file)): commit desc... + +until a better tool is available. + + + diff --git a/test/corpora/lkml/cur/1382298795.000299:2, b/test/corpora/lkml/cur/1382298795.000299:2, new file mode 100644 index 00000000..ea8522f0 --- /dev/null +++ b/test/corpora/lkml/cur/1382298795.000299:2, @@ -0,0 +1,79 @@ +From: Artem Bityutskiy <dedekind1@gmail.com> +Subject: Re: [PATCH 37/44] fs/ubifs: Remove unnecessary semicolons +Date: Fri, 19 Nov 2010 15:21:08 +0200 +Lines: 13 +Message-ID: <1290172868.4768.2.camel@localhost> +References: <cover.1289789604.git.joe@perches.com> + <902d76520da2f65e5dc44339dccb07159947f23d.1289789605.git.joe@perches.com> +Reply-To: dedekind1@gmail.com +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: QUOTED-PRINTABLE +Cc: Jiri Kosina <trivial@kernel.org>, + Adrian Hunter <adrian.hunter@nokia.com>, + linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org +To: Joe Perches <joe@perches.com> +X-From: linux-kernel-owner@vger.kernel.org Fri Nov 19 14:22:08 2010 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PJQuj-00008T-0Z + for glk-linux-kernel-3@lo.gmane.org; Fri, 19 Nov 2010 14:22:05 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1754099Ab0KSNVg convert rfc822-to-quoted-printable (ORCPT + <rfc822;glk-linux-kernel-3@m.gmane.org>); + Fri, 19 Nov 2010 08:21:36 -0500 +Received: from mail-bw0-f46.google.com ([209.85.214.46]:60443 "EHLO + mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1753270Ab0KSNVf (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Fri, 19 Nov 2010 08:21:35 -0500 +Received: by bwz15 with SMTP id 15so3864554bwz.19 + for <linux-kernel@vger.kernel.org>; Fri, 19 Nov 2010 05:21:33 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=gmail.com; s=gamma; + h=domainkey-signature:received:received:subject:from:reply-to:to:cc + :in-reply-to:references:content-type:date:message-id:mime-version + :x-mailer:content-transfer-encoding; + bh=I+JFeMB9svh3ZIIGdVlHav4mOQmOa+QTh4VZGVL0a/0=; + b=hLukn/U4YkodFZ8CEkuJJmYvpTDXhavKiL1YZ12QApXyCb9xBeYORheXEIQUygjUpL + Fy9zyFIWzw3YAiLEa4WUJnC4L+VWq4Nhtua9a1XBQBCK8HZuDITUcmtYcobib1kBg4KE + 0nBOF7IL6d17HN8QGC+Nn+YTu7JxHSq4cHy8Y= +DomainKey-Signature: a=rsa-sha1; c=nofws; + d=gmail.com; s=gamma; + h=subject:from:reply-to:to:cc:in-reply-to:references:content-type + :date:message-id:mime-version:x-mailer:content-transfer-encoding; + b=WiSerhUAnUL/tGRi8PqwwkXymz8N1Uf58rludUDWzSk+L3KSJqGtAvdv8xYqW8x4PQ + Vla/qoLPjcqQQmaLgLKtDvGIL9BFQ86dXrgokJhcrT1qSs2xN3VKGdhm49MOd/HrYZ/F + v4wespzjVohrMt2tOP38nOKZpPeu4t1wUJYOQ= +Received: by 10.204.79.142 with SMTP id p14mr1988895bkk.175.1290172893650; + Fri, 19 Nov 2010 05:21:33 -0800 (PST) +Received: from ?IPv6:::1? (shutemov.name [188.40.19.243]) + by mx.google.com with ESMTPS id v25sm850549bkt.6.2010.11.19.05.21.30 + (version=SSLv3 cipher=RC4-MD5); + Fri, 19 Nov 2010 05:21:31 -0800 (PST) +In-Reply-To: <902d76520da2f65e5dc44339dccb07159947f23d.1289789605.git.joe@perches.com> +X-Mailer: Evolution 2.32.0 (2.32.0-2.fc14) +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1065301> + +On Sun, 2010-11-14 at 19:04 -0800, Joe Perches wrote: +> Signed-off-by: Joe Perches <joe@perches.com> +> --- +> fs/ubifs/scan.c | 2 +- +> 1 files changed, 1 insertions(+), 1 deletions(-) + +Thanks, I'll pick this up. + +--=20 +Best Regards, +Artem Bityutskiy (=D0=90=D1=80=D1=82=D1=91=D0=BC =D0=91=D0=B8=D1=82=D1=8E= +=D1=86=D0=BA=D0=B8=D0=B9) + + + diff --git a/test/corpora/lkml/cur/1382298795.001362:2, b/test/corpora/lkml/cur/1382298795.001362:2, new file mode 100644 index 00000000..a723d580 --- /dev/null +++ b/test/corpora/lkml/cur/1382298795.001362:2, @@ -0,0 +1,96 @@ +From: Takashi Iwai <tiwai@suse.de> +Subject: Re: [PATCH 43/44] sound/core/pcm_lib.c: Remove + unnecessary semicolons +Date: Mon, 22 Nov 2010 07:44:21 +0100 +Lines: 31 +Message-ID: <s5h4ob9svqy.wl%tiwai@suse.de> +References: <cover.1289789604.git.joe@perches.com> + <9fa8e193ce125ef4fd19a952792629c5ee84953f.1289789605.git.joe@perches.com> +Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Cc: alsa-devel@alsa-project.org, Jiri Kosina <trivial@kernel.org>, + linux-kernel@vger.kernel.org +To: Joe Perches <joe@perches.com> +X-From: alsa-devel-bounces@alsa-project.org Mon Nov 22 07:44:31 2010 +Return-path: <alsa-devel-bounces@alsa-project.org> +Envelope-to: glad-alsa-devel-2@m.gmane.org +Received: from alsa0.perex.cz ([212.20.107.51]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <alsa-devel-bounces@alsa-project.org>) + id 1PKQ8Y-0002qf-F0 + for glad-alsa-devel-2@m.gmane.org; Mon, 22 Nov 2010 07:44:26 +0100 +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id 26BFF103863; Mon, 22 Nov 2010 07:44:26 +0100 (CET) +X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on mail1.perex.cz +X-Spam-Level: +X-Spam-Status: No, score=-8.0 required=5.0 tests=RCVD_IN_DNSWL_HI + autolearn=disabled version=3.2.4 +Received: from alsa0.perex.cz (localhost [127.0.0.1]) + by alsa0.perex.cz (Postfix) with ESMTP id 1E4EF103848; + Mon, 22 Nov 2010 07:44:24 +0100 (CET) +X-Original-To: alsa-devel@alsa-project.org +Delivered-To: alsa-devel@alsa-project.org +Received: by alsa0.perex.cz (Postfix, from userid 1000) + id 0861E103851; Mon, 22 Nov 2010 07:44:22 +0100 (CET) +Received: from mx1.suse.de (cantor.suse.de [195.135.220.2]) + by alsa0.perex.cz (Postfix) with ESMTP id 7007710383C + for <alsa-devel@alsa-project.org>; Mon, 22 Nov 2010 07:44:21 +0100 (CET) +Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by mx1.suse.de (Postfix) with ESMTP id 53C1B947B6; + Mon, 22 Nov 2010 07:44:21 +0100 (CET) +In-Reply-To: <9fa8e193ce125ef4fd19a952792629c5ee84953f.1289789605.git.joe@perches.com> +User-Agent: Wanderlust/2.15.6 (Almost Unreal) SEMI/1.14.6 (Maruoka) + FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/23.1 + (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) +X-BeenThere: alsa-devel@alsa-project.org +X-Mailman-Version: 2.1.9 +Precedence: list +List-Id: "Alsa-devel mailing list for ALSA developers - + http://www.alsa-project.org" <alsa-devel.alsa-project.org> +List-Unsubscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe> +List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel> +List-Post: <mailto:alsa-devel@alsa-project.org> +List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help> +List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, + <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> +Sender: alsa-devel-bounces@alsa-project.org +Errors-To: alsa-devel-bounces@alsa-project.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1066369> + +At Sun, 14 Nov 2010 19:05:02 -0800, +Joe Perches wrote: +> +> Signed-off-by: Joe Perches <joe@perches.com> + +Applied now. Thanks. + + +Takashi + + +> --- +> sound/core/pcm_lib.c | 2 +- +> 1 files changed, 1 insertions(+), 1 deletions(-) +> +> diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c +> index a1707cc..b75db8e 100644 +> --- a/sound/core/pcm_lib.c +> +++ b/sound/core/pcm_lib.c +> @@ -223,7 +223,7 @@ static void xrun_log(struct snd_pcm_substream *substream, +> entry->jiffies = jiffies; +> entry->pos = pos; +> entry->period_size = runtime->period_size; +> - entry->buffer_size = runtime->buffer_size;; +> + entry->buffer_size = runtime->buffer_size; +> entry->old_hw_ptr = runtime->status->hw_ptr; +> entry->hw_ptr_base = runtime->hw_ptr_base; +> log->idx = (log->idx + 1) % XRUN_LOG_CNT; +> -- +> 1.7.3.1.g432b3.dirty +> + + diff --git a/test/corpora/lkml/cur/1382298795.002635:2, b/test/corpora/lkml/cur/1382298795.002635:2, new file mode 100644 index 00000000..3c04b86a --- /dev/null +++ b/test/corpora/lkml/cur/1382298795.002635:2, @@ -0,0 +1,54 @@ +From: Matthew Garrett <mjg59@srcf.ucam.org> +Subject: Re: [PATCH 19/44] drivers/platform/x86: Remove unnecessary + semicolons +Date: Wed, 24 Nov 2010 16:52:46 +0000 +Lines: 4 +Message-ID: <20101124165246.GH2150@srcf.ucam.org> +References: <cover.1289789604.git.joe@perches.com> <eda82bcfaad265fc5cd3901bc4f41bfcfac2403b.1289789604.git.joe@perches.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Cc: Jiri Kosina <trivial@kernel.org>, + Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>, + Daniel Oliveira Nascimento <don@syst.com.br>, + Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>, + platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, + ibm-acpi-devel@lists.sourceforge.net +To: Joe Perches <joe@perches.com> +X-From: platform-driver-x86-owner@vger.kernel.org Wed Nov 24 17:53:05 2010 +Return-path: <platform-driver-x86-owner@vger.kernel.org> +Envelope-to: gldpxd-platform-driver-x86@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <platform-driver-x86-owner@vger.kernel.org>) + id 1PLIae-0001zN-Vf + for gldpxd-platform-driver-x86@lo.gmane.org; Wed, 24 Nov 2010 17:53:05 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1754012Ab0KXQxE (ORCPT + <rfc822;gldpxd-platform-driver-x86@m.gmane.org>); + Wed, 24 Nov 2010 11:53:04 -0500 +Received: from cavan.codon.org.uk ([93.93.128.6]:37338 "EHLO + cavan.codon.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1753985Ab0KXQxD (ORCPT + <rfc822;platform-driver-x86@vger.kernel.org>); + Wed, 24 Nov 2010 11:53:03 -0500 +Received: from mjg59 by cavan.codon.org.uk with local (Exim 4.69) + (envelope-from <mjg59@cavan.codon.org.uk>) + id 1PLIaM-0000fC-HX; Wed, 24 Nov 2010 16:52:46 +0000 +Content-Disposition: inline +In-Reply-To: <eda82bcfaad265fc5cd3901bc4f41bfcfac2403b.1289789604.git.joe@perches.com> +User-Agent: Mutt/1.5.18 (2008-05-17) +X-SA-Exim-Connect-IP: <locally generated> +X-SA-Exim-Mail-From: mjg59@cavan.codon.org.uk +X-SA-Exim-Scanned: No (on cavan.codon.org.uk); SAEximRunCond expanded to false +Sender: platform-driver-x86-owner@vger.kernel.org +Precedence: bulk +List-ID: <platform-driver-x86.vger.kernel.org> +X-Mailing-List: platform-driver-x86@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1067655> + +Applied, thanks. + +-- +Matthew Garrett | mjg59@srcf.ucam.org + + diff --git a/test/corpora/lkml/cur/1382298796.001941:2, b/test/corpora/lkml/cur/1382298796.001941:2, new file mode 100644 index 00000000..c65a72fa --- /dev/null +++ b/test/corpora/lkml/cur/1382298796.001941:2, @@ -0,0 +1,73 @@ +From: Chris Ball <cjb@laptop.org> +Subject: Re: [PATCH 11/44] drivers/mmc: Remove unnecessary semicolons +Date: Sun, 5 Dec 2010 03:32:32 +0000 +Lines: 33 +Message-ID: <20101205033232.GD24000@void.printf.net> +References: <cover.1289789604.git.joe@perches.com> <6391af02ba7ec4a76c5c5f462d8013fc1f52f999.1289789604.git.joe@perches.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Cc: Jiri Kosina <trivial@kernel.org>, linux-mmc@vger.kernel.org, + linux-kernel@vger.kernel.org +To: Joe Perches <joe@perches.com> +X-From: linux-mmc-owner@vger.kernel.org Sun Dec 05 04:32:38 2010 +Return-path: <linux-mmc-owner@vger.kernel.org> +Envelope-to: glkm-linux-mmc@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-mmc-owner@vger.kernel.org>) + id 1PP5L3-0005AB-4b + for glkm-linux-mmc@lo.gmane.org; Sun, 05 Dec 2010 04:32:37 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1752522Ab0LEDcg (ORCPT <rfc822;glkm-linux-mmc@m.gmane.org>); + Sat, 4 Dec 2010 22:32:36 -0500 +Received: from void.printf.net ([89.145.121.20]:42897 "EHLO void.printf.net" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1752473Ab0LEDcf (ORCPT <rfc822;linux-mmc@vger.kernel.org>); + Sat, 4 Dec 2010 22:32:35 -0500 +Received: from chris by void.printf.net with local (Exim 4.69) + (envelope-from <chris@void.printf.net>) + id 1PP5Ky-0006Ly-KC; Sun, 05 Dec 2010 03:32:32 +0000 +Content-Disposition: inline +In-Reply-To: <6391af02ba7ec4a76c5c5f462d8013fc1f52f999.1289789604.git.joe@perches.com> +User-Agent: Mutt/1.5.18 (2008-05-17) +Sender: linux-mmc-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-mmc.vger.kernel.org> +X-Mailing-List: linux-mmc@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1071959> + +Hi Joe, + +On Sun, Nov 14, 2010 at 07:04:30PM -0800, Joe Perches wrote: +> Signed-off-by: Joe Perches <joe@perches.com> +> --- +> drivers/mmc/host/davinci_mmc.c | 2 +- +> 1 files changed, 1 insertions(+), 1 deletions(-) +> +> diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c +> index e15547c..b643dde 100644 +> --- a/drivers/mmc/host/davinci_mmc.c +> +++ b/drivers/mmc/host/davinci_mmc.c +> @@ -480,7 +480,7 @@ static void mmc_davinci_send_dma_request(struct mmc_davinci_host *host, +> struct scatterlist *sg; +> unsigned sg_len; +> unsigned bytes_left = host->bytes_left; +> - const unsigned shift = ffs(rw_threshold) - 1;; +> + const unsigned shift = ffs(rw_threshold) - 1; +> +> if (host->data_dir == DAVINCI_MMC_DATADIR_WRITE) { +> template = &host->tx_template; +> -- + +Pushed to mmc-next for .38, thanks. + +-- +Chris Ball <cjb@laptop.org> <http://printf.net/> +One Laptop Per Child +-- +To unsubscribe from this list: send the line "unsubscribe linux-mmc" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + + diff --git a/test/corpora/lkml/cur/1382298805.004526:2, b/test/corpora/lkml/cur/1382298805.004526:2, new file mode 100644 index 00000000..05dbb9d7 --- /dev/null +++ b/test/corpora/lkml/cur/1382298805.004526:2, @@ -0,0 +1,89 @@ +From: Colin Cross <ccross@android.com> +Subject: [PATCH] ARM: vfp: Always save VFP state in vfp_pm_suspend +Date: Sun, 13 Feb 2011 15:13:33 -0800 +Lines: 45 +Message-ID: <1297638813-1315-1-git-send-email-ccross@android.com> +Cc: Colin Cross <ccross@android.com>, + Catalin Marinas <catalin.marinas@arm.com>, + Russell King <linux@arm.linux.org.uk>, + linux-kernel@vger.kernel.org +To: linux-arm-kernel@lists.infradead.org +X-From: linux-kernel-owner@vger.kernel.org Mon Feb 14 00:14:16 2011 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1Pol8x-0007RZ-Hw + for glk-linux-kernel-3@lo.gmane.org; Mon, 14 Feb 2011 00:14:15 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1755242Ab1BMXOA (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Sun, 13 Feb 2011 18:14:00 -0500 +Received: from smtp-out.google.com ([74.125.121.67]:10204 "EHLO + smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1753669Ab1BMXN5 (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Sun, 13 Feb 2011 18:13:57 -0500 +Received: from hpaq1.eem.corp.google.com (hpaq1.eem.corp.google.com [172.25.149.1]) + by smtp-out.google.com with ESMTP id p1DNDjFc030645; + Sun, 13 Feb 2011 15:13:45 -0800 +Received: from walnut.mtv.corp.google.com (walnut.mtv.corp.google.com [172.18.102.62]) + by hpaq1.eem.corp.google.com with ESMTP id p1DNDdKg016468; + Sun, 13 Feb 2011 15:13:39 -0800 +Received: by walnut.mtv.corp.google.com (Postfix, from userid 99897) + id 1F65025772D; Sun, 13 Feb 2011 15:13:39 -0800 (PST) +X-Mailer: git-send-email 1.7.3.1 +X-System-Of-Record: true +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1099558> + +vfp_pm_suspend should save the VFP state any time there is +a last_VFP_context. If it only saves when the VFP is enabled, +the state can get lost when, on a UP system: + Thread 1 uses the VFP + Context switch occurs to thread 2, VFP is disabled but the + VFP context is not saved to allow lazy save and restore + Thread 2 initiates suspend + vfp_pm_suspend is called with the VFP disabled, but the + context has not been saved. + +Modify vfp_pm_suspend to save the VFP context whenever +last_VFP_context is set. + +Cc: Catalin Marinas <catalin.marinas@arm.com> +Signed-off-by: Colin Cross <ccross@android.com> +--- + arch/arm/vfp/vfpmodule.c | 11 +++++------ + 1 files changed, 5 insertions(+), 6 deletions(-) + +diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c +index 66bf8d1..7aea616 100644 +--- a/arch/arm/vfp/vfpmodule.c ++++ b/arch/arm/vfp/vfpmodule.c +@@ -415,13 +415,12 @@ static int vfp_pm_suspend(struct sys_device *dev, pm_message_t state) + struct thread_info *ti = current_thread_info(); + u32 fpexc = fmrx(FPEXC); + +- /* if vfp is on, then save state for resumption */ +- if (fpexc & FPEXC_EN) { ++ /* save state for resume */ ++ if (last_VFP_context[ti->cpu]) { + printk(KERN_DEBUG "%s: saving vfp state\n", __func__); +- vfp_save_state(&ti->vfpstate, fpexc); +- +- /* disable, just in case */ +- fmxr(FPEXC, fmrx(FPEXC) & ~FPEXC_EN); ++ fmxr(FPEXC, fpexc | FPEXC_EN); ++ vfp_save_state(last_VFP_context[ti->cpu], fpexc); ++ fmxr(FPEXC, fpexc & ~FPEXC_EN); + } + + /* clear any information we had about last context state */ +-- +1.7.3.1 + + + diff --git a/test/corpora/lkml/cur/1382298805.004551:2, b/test/corpora/lkml/cur/1382298805.004551:2, new file mode 100644 index 00000000..0e21b167 --- /dev/null +++ b/test/corpora/lkml/cur/1382298805.004551:2, @@ -0,0 +1,90 @@ +From: Justin Mattock <justinmattock-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> +Subject: bluetooth disabled with current 2.6.38-rc4 +Date: Sun, 13 Feb 2011 17:30:04 -0800 +Lines: 30 +Message-ID: <1A8743E5-65EA-4625-82FD-658C9722629F@gmail.com> +Mime-Version: 1.0 (Apple Message framework v936) +Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes +Content-Transfer-Encoding: 7bit +Cc: "linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Mailing List" + <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +To: linux-bluetooth-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +X-From: linux-bluetooth-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Mon Feb 14 02:30:20 2011 +Return-path: <linux-bluetooth-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> +Envelope-to: glbk-linux-bluetooth-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-bluetooth-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>) + id 1PonGb-0000BP-Ns + for glbk-linux-bluetooth-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Mon, 14 Feb 2011 02:30:18 +0100 +Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1755415Ab1BNBaO (ORCPT + <rfc822;glbk-linux-bluetooth@m.gmane.org>); + Sun, 13 Feb 2011 20:30:14 -0500 +Received: from mail-iw0-f174.google.com ([209.85.214.174]:33676 "EHLO + mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1755315Ab1BNBaJ (ORCPT + <rfc822;linux-bluetooth-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>); + Sun, 13 Feb 2011 20:30:09 -0500 +Received: by iwn9 with SMTP id 9so4315727iwn.19 + for <multiple recipients>; Sun, 13 Feb 2011 17:30:08 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=gmail.com; s=gamma; + h=domainkey-signature:message-id:from:to:content-type + :content-transfer-encoding:mime-version:subject:date:cc:x-mailer; + bh=Hm2xpT9F5uspvKowKW51PBMJXHVySz8oO68WD+15vw4=; + b=CYWbVChg8u/vPwCQijLtu4qwy88RnlkiXipfYaorEsKoqnL/riJzvgVjtYz3uoSWE5 + m9IsBgZBGd2zuZMuDEfGiLQo1h5ReLbCsQ2FSLRM8dW15g3xENkK0Zd86EHNATbnU4CQ + YMF3gYQHr5BffWBu8xllNHnUKHzMGZz827BEk= +DomainKey-Signature: a=rsa-sha1; c=nofws; + d=gmail.com; s=gamma; + h=message-id:from:to:content-type:content-transfer-encoding + :mime-version:subject:date:cc:x-mailer; + b=DU4h/EWn8O7B48JT0DuiMTjHma3v+7cSup8eYqLmOgYopjvr42kO9BACgxHMR/mpI/ + sa4AtFAuWg3TkZkPOjJg2SiPiUGQcj7kqjycvHWvWiQHEE6tLEH7g6aGF7ojSTrsiJxN + zpjZBS0EvbDtIrQf8YAV9eFQJSkQ5yYXmK00c= +Received: by 10.42.228.201 with SMTP id jf9mr3782213icb.471.1297647007933; + Sun, 13 Feb 2011 17:30:07 -0800 (PST) +Received: from [10.0.0.13] ([76.89.133.205]) + by mx.google.com with ESMTPS id y8sm1925328ica.2.2011.02.13.17.30.06 + (version=TLSv1/SSLv3 cipher=OTHER); + Sun, 13 Feb 2011 17:30:07 -0800 (PST) +X-Mailer: Apple Mail (2.936) +Sender: linux-bluetooth-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: <linux-bluetooth.vger.kernel.org> +X-Mailing-List: linux-bluetooth-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1099583> + +maybe I missed something, but my bluetooth is just not functioning with +2.6.38-rc4(works with 2.6.37-rc4) + +I've done a bisect on this, but was pointed to: +c0e45c1ca3162acb2e77b3d9e152ce6e7b6fa3f5 +but doesn't look correct to me + +here is what I am seeing with the bluetooth-applet etc..: + +working correctly: +http://www.flickr.com/photos/44066293@N08/5443727238/ + +not working: +http://www.flickr.com/photos/44066293@N08/5443124859/ + +my /var/log/daemon.log shows: + +Feb 13 17:12:22 Linux-2 acpid: 1 client rule loaded +Feb 13 17:12:23 Linux-2 bluetoothd[1950]: HCI dev 0 registered +Feb 13 17:12:23 Linux-2 bluetoothd[1950]: Listening for HCI events on +hci0 +Feb 13 17:12:23 Linux-2 bluetoothd[1950]: HCI dev 0 up +Feb 13 17:12:23 Linux-2 bluetoothd[1950]: Unable to find matching +adapter + +I can try at another bisect, but might take some time.. let me know if +there is something I can test +or do. + +Justin P. Mattock + + diff --git a/test/corpora/lkml/cur/1382298805.004613:2, b/test/corpora/lkml/cur/1382298805.004613:2, new file mode 100644 index 00000000..5a12c8be --- /dev/null +++ b/test/corpora/lkml/cur/1382298805.004613:2, @@ -0,0 +1,94 @@ +From: Henrik Kretzschmar <henne@nachtwindheim.de> +Subject: [PATCH 1/6] x86: move ioapic_irq_destination_types +Date: Mon, 14 Feb 2011 11:00:07 +0100 +Lines: 55 +Message-ID: <1297677612-12405-1-git-send-email-henne@nachtwindheim.de> +Cc: tglx@linutronix.de, hpa@zytor.com, x86@kernel.org, tj@kernel.org, + yinghai@kernel.org, ak@linux.intel.com, robert.richter@amd.com, + linux-kernel@vger.kernel.org, henne@nachtwindheim.de +To: mingo@readhat.com +X-From: linux-kernel-owner@vger.kernel.org Mon Feb 14 11:00:33 2011 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PovEP-0006ED-4Z + for glk-linux-kernel-3@lo.gmane.org; Mon, 14 Feb 2011 11:00:33 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1752832Ab1BNKAX (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Mon, 14 Feb 2011 05:00:23 -0500 +Received: from server103.greatnet.de ([83.133.97.6]:38305 "EHLO + server103.greatnet.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1752268Ab1BNKAW (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Mon, 14 Feb 2011 05:00:22 -0500 +Received: from localhost.localdomain (cmnz-d9bab6be.pool.mediaWays.net [217.186.182.190]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by server103.greatnet.de (Postfix) with ESMTPSA id D2234950DB2; + Mon, 14 Feb 2011 10:59:03 +0100 (CET) +X-Mailer: git-send-email 1.7.1 +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1099645> + +This enum is used also by non-ioapic code, e.g apic_noop, +so its better kept in apicdef.h. + +Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de> +--- + arch/x86/include/asm/apicdef.h | 12 ++++++++++++ + arch/x86/include/asm/io_apic.h | 11 ----------- + 2 files changed, 12 insertions(+), 11 deletions(-) + +diff --git a/arch/x86/include/asm/apicdef.h b/arch/x86/include/asm/apicdef.h +index 47a30ff..2de3e95 100644 +--- a/arch/x86/include/asm/apicdef.h ++++ b/arch/x86/include/asm/apicdef.h +@@ -426,4 +426,16 @@ struct local_apic { + #else + #define BAD_APICID 0xFFFFu + #endif ++ ++enum ioapic_irq_destination_types { ++ dest_Fixed = 0, ++ dest_LowestPrio = 1, ++ dest_SMI = 2, ++ dest__reserved_1 = 3, ++ dest_NMI = 4, ++ dest_INIT = 5, ++ dest__reserved_2 = 6, ++ dest_ExtINT = 7 ++}; ++ + #endif /* _ASM_X86_APICDEF_H */ +diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h +index f327d38..e1a9b0e 100644 +--- a/arch/x86/include/asm/io_apic.h ++++ b/arch/x86/include/asm/io_apic.h +@@ -63,17 +63,6 @@ union IO_APIC_reg_03 { + } __attribute__ ((packed)) bits; + }; + +-enum ioapic_irq_destination_types { +- dest_Fixed = 0, +- dest_LowestPrio = 1, +- dest_SMI = 2, +- dest__reserved_1 = 3, +- dest_NMI = 4, +- dest_INIT = 5, +- dest__reserved_2 = 6, +- dest_ExtINT = 7 +-}; +- + struct IO_APIC_route_entry { + __u32 vector : 8, + delivery_mode : 3, /* 000: FIXED +-- +1.7.2.3 + + + diff --git a/test/corpora/lkml/cur/1382298805.004614:2, b/test/corpora/lkml/cur/1382298805.004614:2, new file mode 100644 index 00000000..ce850fff --- /dev/null +++ b/test/corpora/lkml/cur/1382298805.004614:2, @@ -0,0 +1,89 @@ +From: Henrik Kretzschmar <henne@nachtwindheim.de> +Subject: [PATCH 2/6] x86: ifdef enable_IR_x2apic() out +Date: Mon, 14 Feb 2011 11:00:08 +0100 +Lines: 48 +Message-ID: <1297677612-12405-2-git-send-email-henne@nachtwindheim.de> +References: <1297677612-12405-1-git-send-email-henne@nachtwindheim.de> +Cc: tglx@linutronix.de, hpa@zytor.com, x86@kernel.org, tj@kernel.org, + yinghai@kernel.org, ak@linux.intel.com, robert.richter@amd.com, + linux-kernel@vger.kernel.org, henne@nachtwindheim.de +To: mingo@readhat.com +X-From: linux-kernel-owner@vger.kernel.org Mon Feb 14 11:00:34 2011 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PovEP-0006ED-LT + for glk-linux-kernel-3@lo.gmane.org; Mon, 14 Feb 2011 11:00:34 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1752908Ab1BNKA1 (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Mon, 14 Feb 2011 05:00:27 -0500 +Received: from server103.greatnet.de ([83.133.97.6]:38321 "EHLO + server103.greatnet.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1752778Ab1BNKAX (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Mon, 14 Feb 2011 05:00:23 -0500 +Received: from localhost.localdomain (cmnz-d9bab6be.pool.mediaWays.net [217.186.182.190]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by server103.greatnet.de (Postfix) with ESMTPSA id 1AFC7950DB3; + Mon, 14 Feb 2011 10:59:06 +0100 (CET) +X-Mailer: git-send-email 1.7.1 +In-Reply-To: <1297677612-12405-1-git-send-email-henne@nachtwindheim.de> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1099646> + +The only caller of enable_IR_x2apic() is probe_64.c, which is only +compiled on x86-64 bit machines. +This function causes compilation problems on 32-bit machines with no +io-apic enabled, so we remove it from 32s and keep the way it was on 64s. + +Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de> +--- + arch/x86/include/asm/apic.h | 2 ++ + arch/x86/kernel/apic/apic.c | 2 +- + 2 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h +index b8a3484..b1d77e1 100644 +--- a/arch/x86/include/asm/apic.h ++++ b/arch/x86/include/asm/apic.h +@@ -216,7 +216,9 @@ static inline void x2apic_force_phys(void) + #define x2apic_supported() 0 + #endif + ++#ifdef CONFIG_X86_64 + extern void enable_IR_x2apic(void); ++#endif + + extern int get_physical_broadcast(void); + +diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c +index 306386f..27a7497 100644 +--- a/arch/x86/kernel/apic/apic.c ++++ b/arch/x86/kernel/apic/apic.c +@@ -1467,6 +1467,7 @@ int __init enable_IR(void) + return 0; + } + ++#ifdef CONFIG_X86_64 + void __init enable_IR_x2apic(void) + { + unsigned long flags; +@@ -1540,7 +1541,6 @@ out: + pr_info("Not enabling x2apic, Intr-remapping init failed.\n"); + } + +-#ifdef CONFIG_X86_64 + /* + * Detect and enable local APICs on non-SMP boards. + * Original code written by Keir Fraser. +-- +1.7.2.3 + + + diff --git a/test/corpora/lkml/cur/1382298805.004615:2, b/test/corpora/lkml/cur/1382298805.004615:2, new file mode 100644 index 00000000..cceabb54 --- /dev/null +++ b/test/corpora/lkml/cur/1382298805.004615:2, @@ -0,0 +1,64 @@ +From: Henrik Kretzschmar <henne@nachtwindheim.de> +Subject: [PATCH 4/6] x86: add dummy mp_save_irq() +Date: Mon, 14 Feb 2011 11:00:10 +0100 +Lines: 23 +Message-ID: <1297677612-12405-4-git-send-email-henne@nachtwindheim.de> +References: <1297677612-12405-1-git-send-email-henne@nachtwindheim.de> +Cc: tglx@linutronix.de, hpa@zytor.com, x86@kernel.org, tj@kernel.org, + yinghai@kernel.org, ak@linux.intel.com, robert.richter@amd.com, + linux-kernel@vger.kernel.org, henne@nachtwindheim.de +To: mingo@readhat.com +X-From: linux-kernel-owner@vger.kernel.org Mon Feb 14 11:00:36 2011 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PovEQ-0006ED-6t + for glk-linux-kernel-3@lo.gmane.org; Mon, 14 Feb 2011 11:00:34 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1752958Ab1BNKA3 (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Mon, 14 Feb 2011 05:00:29 -0500 +Received: from server103.greatnet.de ([83.133.97.6]:38321 "EHLO + server103.greatnet.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1752592Ab1BNKAY (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Mon, 14 Feb 2011 05:00:24 -0500 +Received: from localhost.localdomain (cmnz-d9bab6be.pool.mediaWays.net [217.186.182.190]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by server103.greatnet.de (Postfix) with ESMTPSA id 4B47D950DB5; + Mon, 14 Feb 2011 10:59:08 +0100 (CET) +X-Mailer: git-send-email 1.7.1 +In-Reply-To: <1297677612-12405-1-git-send-email-henne@nachtwindheim.de> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1099647> + +mmparse.c needs a mp_save_irq() function, which is only available +when CONFIG_X86_IO_APIC is defined. So here we give it a dummy one. + +Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de> +--- + arch/x86/include/asm/io_apic.h | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h +index e1a9b0e..7af0f5f 100644 +--- a/arch/x86/include/asm/io_apic.h ++++ b/arch/x86/include/asm/io_apic.h +@@ -188,6 +188,7 @@ static inline int mp_find_ioapic(u32 gsi) { return 0; } + struct io_apic_irq_attr; + static inline int io_apic_set_pci_routing(struct device *dev, int irq, + struct io_apic_irq_attr *irq_attr) { return 0; } ++static inline void mp_save_irq(struct mpc_intsrc *m) { } + #endif + + #endif /* _ASM_X86_IO_APIC_H */ +-- +1.7.2.3 + + + diff --git a/test/corpora/lkml/cur/1382298805.004617:2, b/test/corpora/lkml/cur/1382298805.004617:2, new file mode 100644 index 00000000..71f2f1fe --- /dev/null +++ b/test/corpora/lkml/cur/1382298805.004617:2, @@ -0,0 +1,67 @@ +From: Henrik Kretzschmar <henne@nachtwindheim.de> +Subject: [PATCH 6/6] x86: makes X86_UP_IOAPIC work again +Date: Mon, 14 Feb 2011 11:00:12 +0100 +Lines: 26 +Message-ID: <1297677612-12405-6-git-send-email-henne@nachtwindheim.de> +References: <1297677612-12405-1-git-send-email-henne@nachtwindheim.de> +Cc: tglx@linutronix.de, hpa@zytor.com, x86@kernel.org, tj@kernel.org, + yinghai@kernel.org, ak@linux.intel.com, robert.richter@amd.com, + linux-kernel@vger.kernel.org, henne@nachtwindheim.de +To: mingo@readhat.com +X-From: linux-kernel-owner@vger.kernel.org Mon Feb 14 11:01:26 2011 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PovFD-0006cV-Si + for glk-linux-kernel-3@lo.gmane.org; Mon, 14 Feb 2011 11:01:24 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1753137Ab1BNKAo (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Mon, 14 Feb 2011 05:00:44 -0500 +Received: from server103.greatnet.de ([83.133.97.6]:38361 "EHLO + server103.greatnet.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1752877Ab1BNKA0 (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Mon, 14 Feb 2011 05:00:26 -0500 +Received: from localhost.localdomain (cmnz-d9bab6be.pool.mediaWays.net [217.186.182.190]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by server103.greatnet.de (Postfix) with ESMTPSA id 26BC1950DB7; + Mon, 14 Feb 2011 10:59:10 +0100 (CET) +X-Mailer: git-send-email 1.7.1 +In-Reply-To: <1297677612-12405-1-git-send-email-henne@nachtwindheim.de> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1099649> + +This fixes a typo, which made CONFIG_X86_UP_IOAPIC defunctional, +in commit 7cd92366a593246650cc7d6198e2c7d3af8c1d8a. + +This has been successfully tested. + +Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de> +--- + arch/x86/Kconfig | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig +index 95c36c4..66c6801 100644 +--- a/arch/x86/Kconfig ++++ b/arch/x86/Kconfig +@@ -811,7 +811,7 @@ config X86_LOCAL_APIC + + config X86_IO_APIC + def_bool y +- depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC ++ depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_IOAPIC + + config X86_VISWS_APIC + def_bool y +-- +1.7.2.3 + + + diff --git a/test/corpora/lkml/cur/1382298805.004618:2, b/test/corpora/lkml/cur/1382298805.004618:2, new file mode 100644 index 00000000..620bed13 --- /dev/null +++ b/test/corpora/lkml/cur/1382298805.004618:2, @@ -0,0 +1,70 @@ +From: Henrik Kretzschmar <henne@nachtwindheim.de> +Subject: [PATCH 5/6] x86: ifdef ioapic related function out +Date: Mon, 14 Feb 2011 11:00:11 +0100 +Lines: 29 +Message-ID: <1297677612-12405-5-git-send-email-henne@nachtwindheim.de> +References: <1297677612-12405-1-git-send-email-henne@nachtwindheim.de> +Cc: tglx@linutronix.de, hpa@zytor.com, x86@kernel.org, tj@kernel.org, + yinghai@kernel.org, ak@linux.intel.com, robert.richter@amd.com, + linux-kernel@vger.kernel.org, henne@nachtwindheim.de +To: mingo@readhat.com +X-From: linux-kernel-owner@vger.kernel.org Mon Feb 14 11:01:27 2011 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PovFE-0006cV-Cn + for glk-linux-kernel-3@lo.gmane.org; Mon, 14 Feb 2011 11:01:24 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1753212Ab1BNKAq (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Mon, 14 Feb 2011 05:00:46 -0500 +Received: from server103.greatnet.de ([83.133.97.6]:38350 "EHLO + server103.greatnet.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1752841Ab1BNKAZ (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Mon, 14 Feb 2011 05:00:25 -0500 +Received: from localhost.localdomain (cmnz-d9bab6be.pool.mediaWays.net [217.186.182.190]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by server103.greatnet.de (Postfix) with ESMTPSA id 37BBE950DB6; + Mon, 14 Feb 2011 10:59:09 +0100 (CET) +X-Mailer: git-send-email 1.7.1 +In-Reply-To: <1297677612-12405-1-git-send-email-henne@nachtwindheim.de> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1099650> + +arch_disable_smp_config() is an IO-APIC related function on x86, +and should only be needed if SMP is enabled. +But the IO-APIC code calls it when the parameter "noapic" is given to +the kernel, which doesn't mean SMP is enabled. + +Anyway this fixes compilation on x86_32 UP systems with APIC and no IO-APIC. + +Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de> +--- + arch/x86/kernel/apic/apic.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c +index 999c531..4998f0a 100644 +--- a/arch/x86/kernel/apic/apic.c ++++ b/arch/x86/kernel/apic/apic.c +@@ -1218,7 +1218,9 @@ void __cpuinit setup_local_APIC(void) + rdtscll(tsc); + + if (disable_apic) { ++#ifdef CONFIG_X86_IO_APIC + arch_disable_smp_support(); ++#endif + return; + } + +-- +1.7.2.3 + + + diff --git a/test/corpora/lkml/cur/1382298805.004619:2, b/test/corpora/lkml/cur/1382298805.004619:2, new file mode 100644 index 00000000..f7895dda --- /dev/null +++ b/test/corpora/lkml/cur/1382298805.004619:2, @@ -0,0 +1,99 @@ +From: Henrik Kretzschmar <henne@nachtwindheim.de> +Subject: [PATCH 3/6] x86: ifdef INTR_REMAP code out +Date: Mon, 14 Feb 2011 11:00:09 +0100 +Lines: 58 +Message-ID: <1297677612-12405-3-git-send-email-henne@nachtwindheim.de> +References: <1297677612-12405-1-git-send-email-henne@nachtwindheim.de> +Cc: tglx@linutronix.de, hpa@zytor.com, x86@kernel.org, tj@kernel.org, + yinghai@kernel.org, ak@linux.intel.com, robert.richter@amd.com, + linux-kernel@vger.kernel.org, henne@nachtwindheim.de +To: mingo@readhat.com +X-From: linux-kernel-owner@vger.kernel.org Mon Feb 14 11:01:30 2011 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PovFF-0006cV-Te + for glk-linux-kernel-3@lo.gmane.org; Mon, 14 Feb 2011 11:01:26 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1753126Ab1BNKBX (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Mon, 14 Feb 2011 05:01:23 -0500 +Received: from server103.greatnet.de ([83.133.97.6]:38330 "EHLO + server103.greatnet.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1752268Ab1BNKAX (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Mon, 14 Feb 2011 05:00:23 -0500 +Received: from localhost.localdomain (cmnz-d9bab6be.pool.mediaWays.net [217.186.182.190]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by server103.greatnet.de (Postfix) with ESMTPSA id 29517950DB4; + Mon, 14 Feb 2011 10:59:07 +0100 (CET) +X-Mailer: git-send-email 1.7.1 +In-Reply-To: <1297677612-12405-1-git-send-email-henne@nachtwindheim.de> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1099651> + +Interrupt remapping is only available on 64-bit machines, +so it has no place in lapic_resume() for 32bit machines. + +Compilation on 32bit machines would produce errors here. + +Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de> +--- + arch/x86/kernel/apic/apic.c | 8 +++++++- + 1 files changed, 7 insertions(+), 1 deletions(-) + +diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c +index 27a7497..999c531 100644 +--- a/arch/x86/kernel/apic/apic.c ++++ b/arch/x86/kernel/apic/apic.c +@@ -2109,12 +2109,15 @@ static int lapic_resume(struct sys_device *dev) + unsigned long flags; + int maxlvt; + int ret = 0; +- struct IO_APIC_route_entry **ioapic_entries = NULL; + + if (!apic_pm_state.active) + return 0; + + local_irq_save(flags); ++ ++#ifdef CONFIG_INTR_REMAP ++ struct IO_APIC_route_entry **ioapic_entries = NULL; ++ + if (intr_remapping_enabled) { + ioapic_entries = alloc_ioapic_entries(); + if (!ioapic_entries) { +@@ -2133,6 +2136,7 @@ static int lapic_resume(struct sys_device *dev) + mask_IO_APIC_setup(ioapic_entries); + legacy_pic->mask_all(); + } ++#endif + + if (x2apic_mode) + enable_x2apic(); +@@ -2173,6 +2177,7 @@ static int lapic_resume(struct sys_device *dev) + apic_write(APIC_ESR, 0); + apic_read(APIC_ESR); + ++#ifdef CONFIG_INTR_REMAP + if (intr_remapping_enabled) { + reenable_intr_remapping(x2apic_mode); + legacy_pic->restore_mask(); +@@ -2180,6 +2185,7 @@ static int lapic_resume(struct sys_device *dev) + free_ioapic_entries(ioapic_entries); + } + restore: ++#endif + local_irq_restore(flags); + + return ret; +-- +1.7.2.3 + + + diff --git a/test/corpora/lkml/cur/1382298805.004636:2, b/test/corpora/lkml/cur/1382298805.004636:2, new file mode 100644 index 00000000..c14d42c9 --- /dev/null +++ b/test/corpora/lkml/cur/1382298805.004636:2, @@ -0,0 +1,93 @@ +From: Vasiliy Kulikov <segoon@openwall.com> +Subject: [PATCH] core: dev: don't call BUG() on bad input +Date: Mon, 14 Feb 2011 13:56:06 +0300 +Lines: 36 +Message-ID: <1297680967-11893-1-git-send-email-segoon@openwall.com> +Cc: "David S. Miller" <davem@davemloft.net>, + Eric Dumazet <eric.dumazet@gmail.com>, + Tom Herbert <therbert@google.com>, + Changli Gao <xiaosuo@gmail.com>, + Jesse Gross <jesse@nicira.com>, netdev@vger.kernel.org +To: linux-kernel@vger.kernel.org +X-From: netdev-owner@vger.kernel.org Mon Feb 14 11:56:26 2011 +Return-path: <netdev-owner@vger.kernel.org> +Envelope-to: linux-netdev-2@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <netdev-owner@vger.kernel.org>) + id 1Pow6Q-0007p5-UJ + for linux-netdev-2@lo.gmane.org; Mon, 14 Feb 2011 11:56:23 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1753243Ab1BNK4O (ORCPT <rfc822;linux-netdev-2@m.gmane.org>); + Mon, 14 Feb 2011 05:56:14 -0500 +Received: from mail-bw0-f46.google.com ([209.85.214.46]:60909 "EHLO + mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1752645Ab1BNK4M (ORCPT + <rfc822;netdev@vger.kernel.org>); Mon, 14 Feb 2011 05:56:12 -0500 +Received: by bwz15 with SMTP id 15so5332720bwz.19 + for <multiple recipients>; Mon, 14 Feb 2011 02:56:11 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=gmail.com; s=gamma; + h=domainkey-signature:sender:from:to:cc:subject:date:message-id + :x-mailer; + bh=YQn7OCqAZuXaSsRtgaQYckH74o43k6Rppt54AR6UzDo=; + b=CxfBmTAbcMf7ySl3szqU/hLEMbY7aJ+FjefneMcTm/AmBnyihy20JuV2k0yYJzcIBi + 9+2npC4H9oJn7/ocVARq88j9ZA/4firOi9ZddgGu6c8+o0tWoZylA1ehtHzzk+4I173l + H8guqK5rplkryj6+PStELYYt36SpAVfaL2EdY= +DomainKey-Signature: a=rsa-sha1; c=nofws; + d=gmail.com; s=gamma; + h=sender:from:to:cc:subject:date:message-id:x-mailer; + b=G0AqVbcip2oFA2IqAQa6TWwQydu/mJFzt98tGkR1fVNl3m+HaKY433gNCR+Dqdv0gA + SGL/R3HRiBBBku/GM4x3gQ8SoAFZiREw6PDtkU55l/mk+yS+v+8YTq7/InPxHoHeTWsv + pX0mWUI2HtTXKALBiM+nLsnBWtcC8yInYtyeQ= +Received: by 10.204.61.73 with SMTP id s9mr6247440bkh.185.1297680970948; + Mon, 14 Feb 2011 02:56:10 -0800 (PST) +Received: from localhost (ppp91-77-40-235.pppoe.mtu-net.ru [91.77.40.235]) + by mx.google.com with ESMTPS id u23sm1686152bkw.9.2011.02.14.02.56.09 + (version=TLSv1/SSLv3 cipher=OTHER); + Mon, 14 Feb 2011 02:56:10 -0800 (PST) +X-Mailer: git-send-email 1.7.0.4 +Sender: netdev-owner@vger.kernel.org +Precedence: bulk +List-ID: <netdev.vger.kernel.org> +X-Mailing-List: netdev@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1099668> + +alloc_netdev() may be called with too long name (more that IFNAMSIZ bytes). +Currently this leads to BUG(). Other insane inputs (bad txqs, rxqs) and +even OOM don't lead to BUG(). Made alloc_netdev() return NULL, like on +other errors. + +Signed-off-by: Vasiliy Kulikov <segoon@openwall.com> +--- + Compile tested. + + net/core/dev.c | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +diff --git a/net/core/dev.c b/net/core/dev.c +index 6392ea0..12ef4b0 100644 +--- a/net/core/dev.c ++++ b/net/core/dev.c +@@ -5761,7 +5761,10 @@ struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name, + size_t alloc_size; + struct net_device *p; + +- BUG_ON(strlen(name) >= sizeof(dev->name)); ++ if (strnlen(name, sizeof(dev->name)) >= sizeof(dev->name)) { ++ pr_err("alloc_netdev: Too long device name \n"); ++ return NULL; ++ } + + if (txqs < 1) { + pr_err("alloc_netdev: Unable to allocate device " +-- +1.7.0.4 + +-- +To unsubscribe from this list: send the line "unsubscribe netdev" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + + diff --git a/test/corpora/lkml/cur/1382298805.004638:2, b/test/corpora/lkml/cur/1382298805.004638:2, new file mode 100644 index 00000000..551ce5be --- /dev/null +++ b/test/corpora/lkml/cur/1382298805.004638:2, @@ -0,0 +1,88 @@ +From: Ingo Molnar <mingo@elte.hu> +Subject: Re: [PATCH 5/6] x86: ifdef ioapic related function out +Date: Mon, 14 Feb 2011 12:00:39 +0100 +Lines: 34 +Message-ID: <20110214110039.GA7140@elte.hu> +References: <1297677612-12405-1-git-send-email-henne@nachtwindheim.de> + <1297677612-12405-5-git-send-email-henne@nachtwindheim.de> +Mime-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Cc: mingo@readhat.com, tglx@linutronix.de, hpa@zytor.com, + x86@kernel.org, tj@kernel.org, yinghai@kernel.org, + ak@linux.intel.com, robert.richter@amd.com, + linux-kernel@vger.kernel.org +To: Henrik Kretzschmar <henne@nachtwindheim.de> +X-From: linux-kernel-owner@vger.kernel.org Mon Feb 14 12:01:04 2011 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PowAx-0001Lu-Lk + for glk-linux-kernel-3@lo.gmane.org; Mon, 14 Feb 2011 12:01:04 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1752962Ab1BNLA5 (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Mon, 14 Feb 2011 06:00:57 -0500 +Received: from mx3.mail.elte.hu ([157.181.1.138]:38470 "EHLO mx3.mail.elte.hu" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1752556Ab1BNLAz (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Mon, 14 Feb 2011 06:00:55 -0500 +Received: from elvis.elte.hu ([157.181.1.14]) + by mx3.mail.elte.hu with esmtp (Exim) + id 1PowAd-0003Lr-F7 + from <mingo@elte.hu>; Mon, 14 Feb 2011 12:00:48 +0100 +Received: by elvis.elte.hu (Postfix, from userid 1004) + id 7726F3E236B; Mon, 14 Feb 2011 12:00:41 +0100 (CET) +Content-Disposition: inline +In-Reply-To: <1297677612-12405-5-git-send-email-henne@nachtwindheim.de> +User-Agent: Mutt/1.5.20 (2009-08-17) +Received-SPF: neutral (mx3: 157.181.1.14 is neither permitted nor denied by domain of elte.hu) client-ip=157.181.1.14; envelope-from=mingo@elte.hu; helo=elvis.elte.hu; +X-ELTE-SpamScore: -2.0 +X-ELTE-SpamLevel: +X-ELTE-SpamCheck: no +X-ELTE-SpamVersion: ELTE 2.0 +X-ELTE-SpamCheck-Details: score=-2.0 required=5.9 tests=BAYES_00 autolearn=no SpamAssassin version=3.2.5 + -2.0 BAYES_00 BODY: Bayesian spam probability is 0 to 1% + [score: 0.0000] +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1099670> + + +* Henrik Kretzschmar <henne@nachtwindheim.de> wrote: + +> arch_disable_smp_config() is an IO-APIC related function on x86, +> and should only be needed if SMP is enabled. +> But the IO-APIC code calls it when the parameter "noapic" is given to +> the kernel, which doesn't mean SMP is enabled. +> +> Anyway this fixes compilation on x86_32 UP systems with APIC and no IO-APIC. +> +> Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de> +> --- +> arch/x86/kernel/apic/apic.c | 2 ++ +> 1 files changed, 2 insertions(+), 0 deletions(-) +> +> diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c +> index 999c531..4998f0a 100644 +> --- a/arch/x86/kernel/apic/apic.c +> +++ b/arch/x86/kernel/apic/apic.c +> @@ -1218,7 +1218,9 @@ void __cpuinit setup_local_APIC(void) +> rdtscll(tsc); +> +> if (disable_apic) { +> +#ifdef CONFIG_X86_IO_APIC +> arch_disable_smp_support(); +> +#endif + +Why not make the arch_disable_smp_support() call generic in the +arch/x86/include/asm/smp.h file (via an inline helper) and thus +avoid an ugly #ifdef in the .c file? + +Thanks, + + Ingo + + diff --git a/test/corpora/lkml/cur/1382298805.004639:2, b/test/corpora/lkml/cur/1382298805.004639:2, new file mode 100644 index 00000000..56118aa9 --- /dev/null +++ b/test/corpora/lkml/cur/1382298805.004639:2, @@ -0,0 +1,95 @@ +From: Ingo Molnar <mingo@elte.hu> +Subject: Re: [PATCH 3/6] x86: ifdef INTR_REMAP code out +Date: Mon, 14 Feb 2011 12:02:31 +0100 +Lines: 41 +Message-ID: <20110214110231.GB7140@elte.hu> +References: <1297677612-12405-1-git-send-email-henne@nachtwindheim.de> + <1297677612-12405-3-git-send-email-henne@nachtwindheim.de> +Mime-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Cc: mingo@readhat.com, tglx@linutronix.de, hpa@zytor.com, + x86@kernel.org, tj@kernel.org, yinghai@kernel.org, + ak@linux.intel.com, robert.richter@amd.com, + linux-kernel@vger.kernel.org +To: Henrik Kretzschmar <henne@nachtwindheim.de> +X-From: linux-kernel-owner@vger.kernel.org Mon Feb 14 12:02:52 2011 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PowCg-00022G-BR + for glk-linux-kernel-3@lo.gmane.org; Mon, 14 Feb 2011 12:02:50 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1752997Ab1BNLCn (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Mon, 14 Feb 2011 06:02:43 -0500 +Received: from mx3.mail.elte.hu ([157.181.1.138]:38974 "EHLO mx3.mail.elte.hu" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1751314Ab1BNLCl (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Mon, 14 Feb 2011 06:02:41 -0500 +Received: from elvis.elte.hu ([157.181.1.14]) + by mx3.mail.elte.hu with esmtp (Exim) + id 1PowCQ-0003df-Gk + from <mingo@elte.hu>; Mon, 14 Feb 2011 12:02:34 +0100 +Received: by elvis.elte.hu (Postfix, from userid 1004) + id 0D9343E2369; Mon, 14 Feb 2011 12:02:32 +0100 (CET) +Content-Disposition: inline +In-Reply-To: <1297677612-12405-3-git-send-email-henne@nachtwindheim.de> +User-Agent: Mutt/1.5.20 (2009-08-17) +Received-SPF: neutral (mx3: 157.181.1.14 is neither permitted nor denied by domain of elte.hu) client-ip=157.181.1.14; envelope-from=mingo@elte.hu; helo=elvis.elte.hu; +X-ELTE-SpamScore: -2.0 +X-ELTE-SpamLevel: +X-ELTE-SpamCheck: no +X-ELTE-SpamVersion: ELTE 2.0 +X-ELTE-SpamCheck-Details: score=-2.0 required=5.9 tests=BAYES_00 autolearn=no SpamAssassin version=3.2.5 + -2.0 BAYES_00 BODY: Bayesian spam probability is 0 to 1% + [score: 0.0000] +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1099671> + + +* Henrik Kretzschmar <henne@nachtwindheim.de> wrote: + +> +#ifdef CONFIG_INTR_REMAP +> + struct IO_APIC_route_entry **ioapic_entries = NULL; +> + +> if (intr_remapping_enabled) { +> ioapic_entries = alloc_ioapic_entries(); +> if (!ioapic_entries) { +> @@ -2133,6 +2136,7 @@ static int lapic_resume(struct sys_device *dev) +> mask_IO_APIC_setup(ioapic_entries); +> legacy_pic->mask_all(); +> } +> +#endif +> +> if (x2apic_mode) +> enable_x2apic(); +> @@ -2173,6 +2177,7 @@ static int lapic_resume(struct sys_device *dev) +> apic_write(APIC_ESR, 0); +> apic_read(APIC_ESR); +> +> +#ifdef CONFIG_INTR_REMAP +> if (intr_remapping_enabled) { +> reenable_intr_remapping(x2apic_mode); +> legacy_pic->restore_mask(); +> @@ -2180,6 +2185,7 @@ static int lapic_resume(struct sys_device *dev) +> free_ioapic_entries(ioapic_entries); +> } +> restore: +> +#endif + +Hm, these bits should be factored out in a cleaner fashion - by adding helper +functions, etc. The x2apic code's integration into the lapic code was done in a +pretty ugly fashion so it's not your fault - but if we want to reintroduce UP-IOAPIC +we need to do it cleanly. + +Do you still want to do it? :-) + +Thanks, + + Ingo + + diff --git a/test/corpora/lkml/cur/1382298805.004640:2, b/test/corpora/lkml/cur/1382298805.004640:2, new file mode 100644 index 00000000..af16a62a --- /dev/null +++ b/test/corpora/lkml/cur/1382298805.004640:2, @@ -0,0 +1,69 @@ +From: Ingo Molnar <mingo@elte.hu> +Subject: Re: [PATCH 2/6] x86: ifdef enable_IR_x2apic() out +Date: Mon, 14 Feb 2011 12:03:40 +0100 +Lines: 15 +Message-ID: <20110214110340.GC7140@elte.hu> +References: <1297677612-12405-1-git-send-email-henne@nachtwindheim.de> + <1297677612-12405-2-git-send-email-henne@nachtwindheim.de> +Mime-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Cc: mingo@readhat.com, tglx@linutronix.de, hpa@zytor.com, + x86@kernel.org, tj@kernel.org, yinghai@kernel.org, + ak@linux.intel.com, robert.richter@amd.com, + linux-kernel@vger.kernel.org +To: Henrik Kretzschmar <henne@nachtwindheim.de> +X-From: linux-kernel-owner@vger.kernel.org Mon Feb 14 12:04:03 2011 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PowDr-0002js-9K + for glk-linux-kernel-3@lo.gmane.org; Mon, 14 Feb 2011 12:04:03 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1753399Ab1BNLDz (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Mon, 14 Feb 2011 06:03:55 -0500 +Received: from mx2.mail.elte.hu ([157.181.151.9]:54341 "EHLO mx2.mail.elte.hu" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1753317Ab1BNLDx (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Mon, 14 Feb 2011 06:03:53 -0500 +Received: from elvis.elte.hu ([157.181.1.14]) + by mx2.mail.elte.hu with esmtp (Exim) + id 1PowDY-0002Mp-4N + from <mingo@elte.hu>; Mon, 14 Feb 2011 12:03:45 +0100 +Received: by elvis.elte.hu (Postfix, from userid 1004) + id 458B63E2369; Mon, 14 Feb 2011 12:03:40 +0100 (CET) +Content-Disposition: inline +In-Reply-To: <1297677612-12405-2-git-send-email-henne@nachtwindheim.de> +User-Agent: Mutt/1.5.20 (2009-08-17) +Received-SPF: neutral (mx2.mail.elte.hu: 157.181.1.14 is neither permitted nor denied by domain of elte.hu) client-ip=157.181.1.14; envelope-from=mingo@elte.hu; helo=elvis.elte.hu; +X-ELTE-SpamScore: -2.0 +X-ELTE-SpamLevel: +X-ELTE-SpamCheck: no +X-ELTE-SpamVersion: ELTE 2.0 +X-ELTE-SpamCheck-Details: score=-2.0 required=5.9 tests=BAYES_00 autolearn=no SpamAssassin version=3.2.5 + -2.0 BAYES_00 BODY: Bayesian spam probability is 0 to 1% + [score: 0.0000] +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1099672> + + + +* Henrik Kretzschmar <henne@nachtwindheim.de> wrote: + +> +#ifdef CONFIG_X86_64 +> extern void enable_IR_x2apic(void); +> +#endif + +Cannot we use the CONFIG_X86_X2APIC Kconfig switch here, instead of CONFIG_X86_64? + +enable_IR_x2apic() is not a 64-bit CPU feature. + +Thanks, + + Ingo + + diff --git a/test/corpora/lkml/cur/1382298805.004642:2, b/test/corpora/lkml/cur/1382298805.004642:2, new file mode 100644 index 00000000..ce8ac112 --- /dev/null +++ b/test/corpora/lkml/cur/1382298805.004642:2, @@ -0,0 +1,93 @@ +From: Ingo Molnar <mingo@elte.hu> +Subject: Re: [PATCH 1/6] x86: move ioapic_irq_destination_types +Date: Mon, 14 Feb 2011 12:05:28 +0100 +Lines: 40 +Message-ID: <20110214110528.GD7140@elte.hu> +References: <1297677612-12405-1-git-send-email-henne@nachtwindheim.de> +Mime-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Cc: mingo@readhat.com, tglx@linutronix.de, hpa@zytor.com, + x86@kernel.org, tj@kernel.org, yinghai@kernel.org, + ak@linux.intel.com, robert.richter@amd.com, + linux-kernel@vger.kernel.org +To: Henrik Kretzschmar <henne@nachtwindheim.de> +X-From: linux-kernel-owner@vger.kernel.org Mon Feb 14 12:06:00 2011 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PowFj-0003bW-W9 + for glk-linux-kernel-3@lo.gmane.org; Mon, 14 Feb 2011 12:06:00 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1753317Ab1BNLFq (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Mon, 14 Feb 2011 06:05:46 -0500 +Received: from mx3.mail.elte.hu ([157.181.1.138]:46158 "EHLO mx3.mail.elte.hu" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1752958Ab1BNLFn (ORCPT <rfc822;linux-kernel@vger.kernel.org>); + Mon, 14 Feb 2011 06:05:43 -0500 +Received: from elvis.elte.hu ([157.181.1.14]) + by mx3.mail.elte.hu with esmtp (Exim) + id 1PowFH-0003wc-2d + from <mingo@elte.hu>; Mon, 14 Feb 2011 12:05:36 +0100 +Received: by elvis.elte.hu (Postfix, from userid 1004) + id 30C323E2369; Mon, 14 Feb 2011 12:05:27 +0100 (CET) +Content-Disposition: inline +In-Reply-To: <1297677612-12405-1-git-send-email-henne@nachtwindheim.de> +User-Agent: Mutt/1.5.20 (2009-08-17) +Received-SPF: neutral (mx3: 157.181.1.14 is neither permitted nor denied by domain of elte.hu) client-ip=157.181.1.14; envelope-from=mingo@elte.hu; helo=elvis.elte.hu; +X-ELTE-SpamScore: -2.0 +X-ELTE-SpamLevel: +X-ELTE-SpamCheck: no +X-ELTE-SpamVersion: ELTE 2.0 +X-ELTE-SpamCheck-Details: score=-2.0 required=5.9 tests=BAYES_00 autolearn=no SpamAssassin version=3.2.5 + -2.0 BAYES_00 BODY: Bayesian spam probability is 0 to 1% + [score: 0.0000] +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1099674> + + +* Henrik Kretzschmar <henne@nachtwindheim.de> wrote: + +> +++ b/arch/x86/include/asm/apicdef.h +> @@ -426,4 +426,16 @@ struct local_apic { +> #else +> #define BAD_APICID 0xFFFFu +> #endif +> + +> +enum ioapic_irq_destination_types { +> + dest_Fixed = 0, +> + dest_LowestPrio = 1, +> + dest_SMI = 2, +> + dest__reserved_1 = 3, +> + dest_NMI = 4, +> + dest_INIT = 5, +> + dest__reserved_2 = 6, +> + dest_ExtINT = 7 +> +}; + +one very small request, while we are moving it could you please align the value +enumeration vertically? Something like: + +enum ioapic_irq_destination_types { + + dest_Fixed = 0, + dest_LowestPrio = 1, + dest_SMI = 2, + dest__reserved_1 = 3, + dest_NMI = 4, + dest_INIT = 5, + dest__reserved_2 = 6, + dest_ExtINT = 7 +}; + +... would be much more readable, right? + +Thanks, + + Ingo + + diff --git a/test/corpora/lkml/cur/1382298805.004653:2, b/test/corpora/lkml/cur/1382298805.004653:2, new file mode 100644 index 00000000..d6bd8d14 --- /dev/null +++ b/test/corpora/lkml/cur/1382298805.004653:2, @@ -0,0 +1,90 @@ +From: Catalin Marinas <catalin.marinas@arm.com> +Subject: Re: [PATCH] ARM: vfp: Always save VFP state in vfp_pm_suspend +Date: Mon, 14 Feb 2011 11:42:22 +0000 +Organization: ARM Limited +Lines: 43 +Message-ID: <1297683742.30092.11.camel@e102109-lin.cambridge.arm.com> +References: <1297638813-1315-1-git-send-email-ccross@android.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8BIT +Cc: linux-arm-kernel@lists.infradead.org, + Russell King <linux@arm.linux.org.uk>, + linux-kernel@vger.kernel.org +To: Colin Cross <ccross@android.com> +X-From: linux-kernel-owner@vger.kernel.org Mon Feb 14 12:42:45 2011 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1PowpJ-00069R-8c + for glk-linux-kernel-3@lo.gmane.org; Mon, 14 Feb 2011 12:42:45 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1753535Ab1BNLmi (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); + Mon, 14 Feb 2011 06:42:38 -0500 +Received: from service87.mimecast.com ([94.185.240.25]:56758 "HELO + service87.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with SMTP id S1752997Ab1BNLmg convert rfc822-to-8bit (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Mon, 14 Feb 2011 06:42:36 -0500 +Received: from cam-owa2.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) + by service87.mimecast.com; + Mon, 14 Feb 2011 11:42:31 +0000 +Received: from [10.1.77.95] ([10.1.255.212]) by cam-owa2.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); + Mon, 14 Feb 2011 11:42:28 +0000 +In-Reply-To: <1297638813-1315-1-git-send-email-ccross@android.com> +X-Mailer: Evolution 2.28.1 +X-OriginalArrivalTime: 14 Feb 2011 11:42:28.0658 (UTC) FILETIME=[41F09120:01CBCC3C] +X-MC-Unique: 111021411423105201 +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1099685> + +On Sun, 2011-02-13 at 23:13 +0000, Colin Cross wrote: +> vfp_pm_suspend should save the VFP state any time there is +> a last_VFP_context. If it only saves when the VFP is enabled, +> the state can get lost when, on a UP system: +> Thread 1 uses the VFP +> Context switch occurs to thread 2, VFP is disabled but the +> VFP context is not saved to allow lazy save and restore +> Thread 2 initiates suspend +> vfp_pm_suspend is called with the VFP disabled, but the +> context has not been saved. + +At this point is it guaranteed that the thread won't migrate to another +CPU? If not, we should use get/put_cpu. + +> --- a/arch/arm/vfp/vfpmodule.c +> +++ b/arch/arm/vfp/vfpmodule.c +> @@ -415,13 +415,12 @@ static int vfp_pm_suspend(struct sys_device *dev, pm_message_t state) +> struct thread_info *ti = current_thread_info(); +> u32 fpexc = fmrx(FPEXC); +> +> - /* if vfp is on, then save state for resumption */ +> - if (fpexc & FPEXC_EN) { +> + /* save state for resume */ +> + if (last_VFP_context[ti->cpu]) { +> printk(KERN_DEBUG "%s: saving vfp state\n", __func__); +> - vfp_save_state(&ti->vfpstate, fpexc); +> - +> - /* disable, just in case */ +> - fmxr(FPEXC, fmrx(FPEXC) & ~FPEXC_EN); +> + fmxr(FPEXC, fpexc | FPEXC_EN); +> + vfp_save_state(last_VFP_context[ti->cpu], fpexc); +> + fmxr(FPEXC, fpexc & ~FPEXC_EN); +> } + +We may want to set the last_VFP_context to NULL so that after resuming +(to the same thread) we force the VFP reload from the vfpstate +structure. The vfp_support_entry code ignores the reloading if the +last_VFP_context is the same as vfpstate. + +-- +Catalin + + + + diff --git a/test/corpora/lkml/cur/1382298805.004665:2, b/test/corpora/lkml/cur/1382298805.004665:2, new file mode 100644 index 00000000..bfba805a --- /dev/null +++ b/test/corpora/lkml/cur/1382298805.004665:2, @@ -0,0 +1,121 @@ +From: =?ISO-8859-1?Q?Nicolas_de_Peslo=FCan?= + <nicolas.2p.debian@gmail.com> +Subject: Re: [PATCH] core: dev: don't call BUG() on bad input +Date: Mon, 14 Feb 2011 13:16:04 +0100 +Lines: 54 +Message-ID: <4D591D04.4050000@gmail.com> +References: <1297680967-11893-1-git-send-email-segoon@openwall.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1; + format=flowed +Content-Transfer-Encoding: QUOTED-PRINTABLE +Cc: linux-kernel@vger.kernel.org, + "David S. Miller" <davem@davemloft.net>, + Eric Dumazet <eric.dumazet@gmail.com>, + Tom Herbert <therbert@google.com>, + Changli Gao <xiaosuo@gmail.com>, + Jesse Gross <jesse@nicira.com>, netdev@vger.kernel.org +To: Vasiliy Kulikov <segoon@openwall.com> +X-From: netdev-owner@vger.kernel.org Mon Feb 14 13:16:23 2011 +Return-path: <netdev-owner@vger.kernel.org> +Envelope-to: linux-netdev-2@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <netdev-owner@vger.kernel.org>) + id 1PoxLn-0007s8-Rx + for linux-netdev-2@lo.gmane.org; Mon, 14 Feb 2011 13:16:20 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1753819Ab1BNMQQ convert rfc822-to-quoted-printable (ORCPT + <rfc822;linux-netdev-2@m.gmane.org>); Mon, 14 Feb 2011 07:16:16 -0500 +Received: from mail-bw0-f46.google.com ([209.85.214.46]:53692 "EHLO + mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1753690Ab1BNMQO (ORCPT + <rfc822;netdev@vger.kernel.org>); Mon, 14 Feb 2011 07:16:14 -0500 +Received: by bwz15 with SMTP id 15so5395788bwz.19 + for <multiple recipients>; Mon, 14 Feb 2011 04:16:13 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=gmail.com; s=gamma; + h=domainkey-signature:message-id:date:from:user-agent:mime-version:to + :cc:subject:references:in-reply-to:content-type + :content-transfer-encoding; + bh=xx3YxuXgqhBANV8wzcWyUMECJelpRfdmoRSp1AKdYdc=; + b=N0KOUEiWNDJjbwFsNkzabK7eGUNcoUNkqBGVRMNJFQ1jIgKtMC9sXdcmSFkLf2G3W0 + zzRsPc9T6wnstCSnGFjIStR1GQK4bQ7o7SC+bmV0UqsBQAMW8sdDkT20PMZlBl2X7PkF + a2TGrPtJKfEcGFXay9Xo1ZMu1aYODhlRfsZKo= +DomainKey-Signature: a=rsa-sha1; c=nofws; + d=gmail.com; s=gamma; + h=message-id:date:from:user-agent:mime-version:to:cc:subject + :references:in-reply-to:content-type:content-transfer-encoding; + b=vyCGwBn8dYUhOjmcV0am255nAUilQntfBxUI4yId3MocKlSBfEE0jJCJIVDySIAYOj + 4g7FzXDeqZ5brwXgwA1derVfTXYvhKUC/60QA9/377l/PZ0vvRfqyPQcinMoOSCc+Kvv + vnBZtq/Kr+D4nUnefIwwjJ/dXS3dGjFBvis6w= +Received: by 10.204.98.65 with SMTP id p1mr25300616bkn.198.1297685772974; + Mon, 14 Feb 2011 04:16:12 -0800 (PST) +Received: from [192.168.0.101] (eab95-4-88-175-177-37.fbx.proxad.net [88.175.177.37]) + by mx.google.com with ESMTPS id a17sm1733557bku.23.2011.02.14.04.16.07 + (version=SSLv3 cipher=OTHER); + Mon, 14 Feb 2011 04:16:09 -0800 (PST) +User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.16) Gecko/20101226 Icedove/3.0.11 +In-Reply-To: <1297680967-11893-1-git-send-email-segoon@openwall.com> +Sender: netdev-owner@vger.kernel.org +Precedence: bulk +List-ID: <netdev.vger.kernel.org> +X-Mailing-List: netdev@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1099697> + +Le 14/02/2011 11:56, Vasiliy Kulikov a =E9crit : +> alloc_netdev() may be called with too long name (more that IFNAMSIZ b= +ytes). +> Currently this leads to BUG(). Other insane inputs (bad txqs, rxqs) = +and +> even OOM don't lead to BUG(). Made alloc_netdev() return NULL, like = +on +> other errors. +> +> Signed-off-by: Vasiliy Kulikov<segoon@openwall.com> +> --- +> Compile tested. +> +> net/core/dev.c | 5 ++++- +> 1 files changed, 4 insertions(+), 1 deletions(-) +> +> diff --git a/net/core/dev.c b/net/core/dev.c +> index 6392ea0..12ef4b0 100644 +> --- a/net/core/dev.c +> +++ b/net/core/dev.c +> @@ -5761,7 +5761,10 @@ struct net_device *alloc_netdev_mqs(int sizeof= +_priv, const char *name, +> size_t alloc_size; +> struct net_device *p; +> +> - BUG_ON(strlen(name)>=3D sizeof(dev->name)); +> + if (strnlen(name, sizeof(dev->name))>=3D sizeof(dev->name)) { + +"size_t strnlen(const char *s, size_t maxlen) : The strnlen() function = +returns strlen(s), if that is=20 +less than maxlen, or maxlen if there is no '\0' character among the fir= +st maxlen characters pointed=20 +to by s." + +How can strnlen(name, sizeof(dev->name)) be greater than sizeof(dev->na= +me)? + +Shouldn't it be "if (strnlen(name, sizeof(dev->name)) =3D=3D sizeof(dev= +->name))" instead? + + Nicolas. + +> + pr_err("alloc_netdev: Too long device name \n"); +> + return NULL; +> + } +> +> if (txqs< 1) { +> pr_err("alloc_netdev: Unable to allocate device " + +-- +To unsubscribe from this list: send the line "unsubscribe netdev" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + + diff --git a/test/corpora/lkml/cur/1382298805.004680:2, b/test/corpora/lkml/cur/1382298805.004680:2, new file mode 100644 index 00000000..e0e74ce2 --- /dev/null +++ b/test/corpora/lkml/cur/1382298805.004680:2, @@ -0,0 +1,103 @@ +From: Vasiliy Kulikov <segoon@openwall.com> +Subject: Re: [PATCH] core: dev: don't call BUG() on bad input +Date: Mon, 14 Feb 2011 15:23:13 +0300 +Lines: 34 +Message-ID: <20110214122313.GA10062@albatros> +References: <1297680967-11893-1-git-send-email-segoon@openwall.com> + <4D591D04.4050000@gmail.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=iso-8859-1 +Content-Transfer-Encoding: QUOTED-PRINTABLE +Cc: linux-kernel@vger.kernel.org, + "David S. Miller" <davem@davemloft.net>, + Eric Dumazet <eric.dumazet@gmail.com>, + Tom Herbert <therbert@google.com>, + Changli Gao <xiaosuo@gmail.com>, + Jesse Gross <jesse@nicira.com>, netdev@vger.kernel.org +To: Nicolas de =?iso-8859-1?Q?Peslo=FCan?= + <nicolas.2p.debian@gmail.com> +X-From: netdev-owner@vger.kernel.org Mon Feb 14 13:24:40 2011 +Return-path: <netdev-owner@vger.kernel.org> +Envelope-to: linux-netdev-2@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <netdev-owner@vger.kernel.org>) + id 1PoxTr-00046W-DE + for linux-netdev-2@lo.gmane.org; Mon, 14 Feb 2011 13:24:39 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1754719Ab1BNMXX convert rfc822-to-quoted-printable (ORCPT + <rfc822;linux-netdev-2@m.gmane.org>); Mon, 14 Feb 2011 07:23:23 -0500 +Received: from mail-bw0-f46.google.com ([209.85.214.46]:64487 "EHLO + mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1754086Ab1BNMXU (ORCPT + <rfc822;netdev@vger.kernel.org>); Mon, 14 Feb 2011 07:23:20 -0500 +Received: by bwz15 with SMTP id 15so5401470bwz.19 + for <multiple recipients>; Mon, 14 Feb 2011 04:23:18 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=gmail.com; s=gamma; + h=domainkey-signature:sender:date:from:to:cc:subject:message-id + :references:mime-version:content-type:content-disposition + :content-transfer-encoding:in-reply-to:user-agent; + bh=4cv3J11meWILtVQ6Drgqk74suEYFVRQKnvtS62ZKPMU=; + b=oson8MDOPhFFO5h9lGEmq3EcDJ7bfOy60AsJ8ka5Q45h/Fg5LvGyVGBWB48YesHBg+ + 51Kdb4VrtCWazj2/c1Eauv2jvrGXUjj1hZdo3Rq0jZb5eU+Nvf+7Gl8nWE1S47XmT8YW + ed9CdFnNDgvkVUw+Rg48e2nG79kDRNUGWlpKI= +DomainKey-Signature: a=rsa-sha1; c=nofws; + d=gmail.com; s=gamma; + h=sender:date:from:to:cc:subject:message-id:references:mime-version + :content-type:content-disposition:content-transfer-encoding + :in-reply-to:user-agent; + b=lEIU6CLzqKxhpDXukIqjR49CQZ370NKAkb0Aah7A1uyEdLZ9ctYpgg1oPjsQX/V9IR + TqyIP0zocVjBhUgCi32M9DPe/qjiqe+YS+EXNGLMMrF1oEUY+yFfq1jChaHkk2xuf/EM + MaGyK3svEz1q2iV1bgkTLcXCLWyK+A/M1WFlg= +Received: by 10.204.80.161 with SMTP id t33mr15020786bkk.121.1297686197182; + Mon, 14 Feb 2011 04:23:17 -0800 (PST) +Received: from localhost (ppp91-77-40-235.pppoe.mtu-net.ru [91.77.40.235]) + by mx.google.com with ESMTPS id w3sm1684029bkt.5.2011.02.14.04.23.14 + (version=TLSv1/SSLv3 cipher=OTHER); + Mon, 14 Feb 2011 04:23:16 -0800 (PST) +Content-Disposition: inline +In-Reply-To: <4D591D04.4050000@gmail.com> +User-Agent: Mutt/1.5.20 (2009-06-14) +Sender: netdev-owner@vger.kernel.org +Precedence: bulk +List-ID: <netdev.vger.kernel.org> +X-Mailing-List: netdev@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1099712> + +Hi Nicolas, + +On Mon, Feb 14, 2011 at 13:16 +0100, Nicolas de Peslo=FCan wrote: +> >- BUG_ON(strlen(name)>=3D sizeof(dev->name)); +> >+ if (strnlen(name, sizeof(dev->name))>=3D sizeof(dev->name)) { + +Ehh... Space after ")" is needed :) + +> "size_t strnlen(const char *s, size_t maxlen) : The strnlen() +> function returns strlen(s), if that is less than maxlen, or maxlen +> if there is no '\0' character among the first maxlen characters +> pointed to by s." +>=20 +> How can strnlen(name, sizeof(dev->name)) be greater than sizeof(dev->= +name)? +>=20 +> Shouldn't it be "if (strnlen(name, sizeof(dev->name)) =3D=3D sizeof(d= +ev->name))" instead? + +Not a big deal, but MO it's better to guard from everything that +is not a good input by negating the check. strnlen() < sizeof() is OK, +strnlen() >=3D sizeof() is bad. Is "=3D=3D" more preferable for net/ c= +oding style? + + +--=20 +Vasiliy Kulikov +http://www.openwall.com - bringing security into open computing environ= +ments +-- +To unsubscribe from this list: send the line "unsubscribe netdev" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + + diff --git a/test/corpora/lkml/cur/1382298805.004688:2, b/test/corpora/lkml/cur/1382298805.004688:2, new file mode 100644 index 00000000..dd935b6b --- /dev/null +++ b/test/corpora/lkml/cur/1382298805.004688:2, @@ -0,0 +1,107 @@ +From: =?ISO-8859-1?Q?Nicolas_de_Peslo=FCan?= + <nicolas.2p.debian@gmail.com> +Subject: Re: [PATCH] core: dev: don't call BUG() on bad input +Date: Mon, 14 Feb 2011 14:01:44 +0100 +Lines: 40 +Message-ID: <4D5927B8.2070704@gmail.com> +References: <1297680967-11893-1-git-send-email-segoon@openwall.com> <4D591D04.4050000@gmail.com> <20110214122313.GA10062@albatros> +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1; + format=flowed +Content-Transfer-Encoding: QUOTED-PRINTABLE +Cc: linux-kernel@vger.kernel.org, + "David S. Miller" <davem@davemloft.net>, + Eric Dumazet <eric.dumazet@gmail.com>, + Tom Herbert <therbert@google.com>, + Changli Gao <xiaosuo@gmail.com>, + Jesse Gross <jesse@nicira.com>, netdev@vger.kernel.org +To: Vasiliy Kulikov <segoon@openwall.com> +X-From: netdev-owner@vger.kernel.org Mon Feb 14 14:02:23 2011 +Return-path: <netdev-owner@vger.kernel.org> +Envelope-to: linux-netdev-2@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <netdev-owner@vger.kernel.org>) + id 1Poy4M-0006df-J5 + for linux-netdev-2@lo.gmane.org; Mon, 14 Feb 2011 14:02:22 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1754233Ab1BNNBu convert rfc822-to-quoted-printable (ORCPT + <rfc822;linux-netdev-2@m.gmane.org>); Mon, 14 Feb 2011 08:01:50 -0500 +Received: from mail-fx0-f46.google.com ([209.85.161.46]:54545 "EHLO + mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1753647Ab1BNNBs (ORCPT + <rfc822;netdev@vger.kernel.org>); Mon, 14 Feb 2011 08:01:48 -0500 +Received: by fxm20 with SMTP id 20so5178314fxm.19 + for <multiple recipients>; Mon, 14 Feb 2011 05:01:47 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=gmail.com; s=gamma; + h=domainkey-signature:message-id:date:from:user-agent:mime-version:to + :cc:subject:references:in-reply-to:content-type + :content-transfer-encoding; + bh=AbxlHNh3L+hBj6Vij/+GRK5xyYUXmvKoB1QZLa2ZBj0=; + b=b/GQO7FpiFoh6WrR9d9qEW2Q1ZOK0YtYzl/fLoXZS49QbuYiuExhWkohPnHsdH/n7s + liu8crpx1n3Ajna/7GX1mHBP6V4lfhH+NyF0Rmw3w+fx154lFiY9dbyPX7H9MZNdW60a + 8TmPRR356gmV+7bijgKwyMN1FRVMPNV0Zg0i8= +DomainKey-Signature: a=rsa-sha1; c=nofws; + d=gmail.com; s=gamma; + h=message-id:date:from:user-agent:mime-version:to:cc:subject + :references:in-reply-to:content-type:content-transfer-encoding; + b=C+hWB2Aof37xOLi8SWuN+D3QsDtf/f4yCxcLrNGhRYytyr/7CUmq/rS7PpgnfvBVBr + yaKwVZXs7QRxIWbPnzmV38e1K+eUwZ+dd9XuEFN1dnXd5KJVv4CjWr2N84NIHx/NvOBL + 7QYK5+DuuRaccybcS4xWMNK8mujh9ebSBXTgM= +Received: by 10.223.87.1 with SMTP id u1mr4464553fal.112.1297688507260; + Mon, 14 Feb 2011 05:01:47 -0800 (PST) +Received: from [192.168.0.101] (eab95-4-88-175-177-37.fbx.proxad.net [88.175.177.37]) + by mx.google.com with ESMTPS id y3sm1031898fai.38.2011.02.14.05.01.45 + (version=SSLv3 cipher=OTHER); + Mon, 14 Feb 2011 05:01:46 -0800 (PST) +User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.16) Gecko/20101226 Icedove/3.0.11 +In-Reply-To: <20110214122313.GA10062@albatros> +Sender: netdev-owner@vger.kernel.org +Precedence: bulk +List-ID: <netdev.vger.kernel.org> +X-Mailing-List: netdev@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1099723> + +Le 14/02/2011 13:23, Vasiliy Kulikov a =E9crit : +> Hi Nicolas, + +Hi Vasiliy, + +> On Mon, Feb 14, 2011 at 13:16 +0100, Nicolas de Peslo=FCan wrote: +>>> - BUG_ON(strlen(name)>=3D sizeof(dev->name)); +>>> + if (strnlen(name, sizeof(dev->name))>=3D sizeof(dev->name)) { +> +> Ehh... Space after ")" is needed :) + +:-D + +>> "size_t strnlen(const char *s, size_t maxlen) : The strnlen() +>> function returns strlen(s), if that is less than maxlen, or maxlen +>> if there is no '\0' character among the first maxlen characters +>> pointed to by s." +>> +>> How can strnlen(name, sizeof(dev->name)) be greater than sizeof(dev-= +>name)? +>> +>> Shouldn't it be "if (strnlen(name, sizeof(dev->name)) =3D=3D sizeof(= +dev->name))" instead? +> +> Not a big deal, but MO it's better to guard from everything that +> is not a good input by negating the check. strnlen()< sizeof() is O= +K, +> strnlen()>=3D sizeof() is bad. Is "=3D=3D" more preferable for net/ = +coding style? + +Agreed, both cannot cause any troubles. =3D=3D is supposed to be better= + from the API point of view, but=20 + >=3D is probably more readable. + + Nicolas. +-- +To unsubscribe from this list: send the line "unsubscribe netdev" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + + + diff --git a/test/corpora/lkml/cur/1382298805.004906:2, b/test/corpora/lkml/cur/1382298805.004906:2, new file mode 100644 index 00000000..fb3510a2 --- /dev/null +++ b/test/corpora/lkml/cur/1382298805.004906:2, @@ -0,0 +1,125 @@ +From: Colin Cross <ccross@android.com> +Subject: Re: [PATCH] ARM: vfp: Always save VFP state in vfp_pm_suspend +Date: Mon, 14 Feb 2011 10:35:37 -0800 +Lines: 50 +Message-ID: <AANLkTik_Jey_PtRmr530FVckA6RXHESeX+CyoJC=ZTkR@mail.gmail.com> +References: <1297638813-1315-1-git-send-email-ccross@android.com> + <1297683742.30092.11.camel@e102109-lin.cambridge.arm.com> +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: QUOTED-PRINTABLE +Cc: linux-arm-kernel@lists.infradead.org, + Russell King <linux@arm.linux.org.uk>, + linux-kernel@vger.kernel.org +To: Catalin Marinas <catalin.marinas@arm.com> +X-From: linux-kernel-owner@vger.kernel.org Mon Feb 14 19:36:14 2011 +Return-path: <linux-kernel-owner@vger.kernel.org> +Envelope-to: glk-linux-kernel-3@lo.gmane.org +Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from <linux-kernel-owner@vger.kernel.org>) + id 1Pp3HR-0002ph-ME + for glk-linux-kernel-3@lo.gmane.org; Mon, 14 Feb 2011 19:36:14 +0100 +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1751716Ab1BNSf7 convert rfc822-to-quoted-printable (ORCPT + <rfc822;glk-linux-kernel-3@m.gmane.org>); + Mon, 14 Feb 2011 13:35:59 -0500 +Received: from smtp-out.google.com ([74.125.121.67]:16138 "EHLO + smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1751472Ab1BNSf5 convert rfc822-to-8bit (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Mon, 14 Feb 2011 13:35:57 -0500 +Received: from kpbe14.cbf.corp.google.com (kpbe14.cbf.corp.google.com [172.25.105.78]) + by smtp-out.google.com with ESMTP id p1EIZtnZ010066 + for <linux-kernel@vger.kernel.org>; Mon, 14 Feb 2011 10:35:55 -0800 +DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=google.com; s=beta; + t=1297708556; bh=zHQvHco6EycqYjYMR9YZftpchts=; + h=MIME-Version:Sender:In-Reply-To:References:Date:Message-ID: + Subject:From:To:Cc:Content-Type:Content-Transfer-Encoding; + b=vMdLxEMc5VUxTbXeXOfO9iAKtgTlVwOwZrVZEhG7GNUReOYWZKzblAuPHuJUWHr5q + 8s7bNLIdGKiRH4q28mv9w== +Received: from vws17 (vws17.prod.google.com [10.241.21.145]) + by kpbe14.cbf.corp.google.com with ESMTP id p1EIYaTC004311 + (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT) + for <linux-kernel@vger.kernel.org>; Mon, 14 Feb 2011 10:35:54 -0800 +Received: by vws17 with SMTP id 17so3300387vws.2 + for <linux-kernel@vger.kernel.org>; Mon, 14 Feb 2011 10:35:54 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=google.com; s=beta; + h=domainkey-signature:mime-version:sender:in-reply-to:references:date + :x-google-sender-auth:message-id:subject:from:to:cc:content-type + :content-transfer-encoding; + bh=FyW95sl8WRQv1ev+TqjP0gzPcCabtWdW1//GAc6oFnY=; + b=MNkyYY1htITiUX23N5enGCjsYq2mGBCW4BadxXMha/29ZeIyVP6jrUHlViT88u79RG + SxLMzz7lijwW38xTiBfw== +DomainKey-Signature: a=rsa-sha1; c=nofws; + d=google.com; s=beta; + h=mime-version:sender:in-reply-to:references:date + :x-google-sender-auth:message-id:subject:from:to:cc:content-type + :content-transfer-encoding; + b=Lio4jom4+RruCzH/a6zheXvUcTpZvSX7eMk6Ld1+PQQybP02I0+Cv4+PgGac2GoAYX + tXciu0c/KOGts2phbyMg== +Received: by 10.220.94.201 with SMTP id a9mr1430388vcn.56.1297708537386; Mon, + 14 Feb 2011 10:35:37 -0800 (PST) +Received: by 10.220.43.142 with HTTP; Mon, 14 Feb 2011 10:35:37 -0800 (PST) +In-Reply-To: <1297683742.30092.11.camel@e102109-lin.cambridge.arm.com> +X-Google-Sender-Auth: 47_39DbBbWrnAh28bpWvfpwmbLw +X-System-Of-Record: true +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org +Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1099943> + +On Mon, Feb 14, 2011 at 3:42 AM, Catalin Marinas +<catalin.marinas@arm.com> wrote: +> On Sun, 2011-02-13 at 23:13 +0000, Colin Cross wrote: +>> vfp_pm_suspend should save the VFP state any time there is +>> a last_VFP_context. =A0If it only saves when the VFP is enabled, +>> the state can get lost when, on a UP system: +>> =A0 =A0Thread 1 uses the VFP +>> =A0 =A0Context switch occurs to thread 2, VFP is disabled but the +>> =A0 =A0 =A0 VFP context is not saved to allow lazy save and restore +>> =A0 =A0Thread 2 initiates suspend +>> =A0 =A0vfp_pm_suspend is called with the VFP disabled, but the +>> =A0 =A0 =A0 context has not been saved. +> +> At this point is it guaranteed that the thread won't migrate to anoth= +er +> CPU? If not, we should use get/put_cpu. + +Yes, VFP suspend is implemented with a sysdev, which is suspended +after disable_nonboot_cpus. + +>> --- a/arch/arm/vfp/vfpmodule.c +>> +++ b/arch/arm/vfp/vfpmodule.c +>> @@ -415,13 +415,12 @@ static int vfp_pm_suspend(struct sys_device *d= +ev, pm_message_t state) +>> =A0 =A0 =A0 =A0 struct thread_info *ti =3D current_thread_info(); +>> =A0 =A0 =A0 =A0 u32 fpexc =3D fmrx(FPEXC); +>> +>> - =A0 =A0 =A0 /* if vfp is on, then save state for resumption */ +>> - =A0 =A0 =A0 if (fpexc & FPEXC_EN) { +>> + =A0 =A0 =A0 /* save state for resume */ +>> + =A0 =A0 =A0 if (last_VFP_context[ti->cpu]) { +>> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 printk(KERN_DEBUG "%s: saving vfp st= +ate\n", __func__); +>> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 vfp_save_state(&ti->vfpstate, fpexc); +>> - +>> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* disable, just in case */ +>> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 fmxr(FPEXC, fmrx(FPEXC) & ~FPEXC_EN); +>> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 fmxr(FPEXC, fpexc | FPEXC_EN); +>> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 vfp_save_state(last_VFP_context[ti->cp= +u], fpexc); +>> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 fmxr(FPEXC, fpexc & ~FPEXC_EN); +>> =A0 =A0 =A0 =A0 } +> +> We may want to set the last_VFP_context to NULL so that after resumin= +g +> (to the same thread) we force the VFP reload from the vfpstate +> structure. The vfp_support_entry code ignores the reloading if the +> last_VFP_context is the same as vfpstate. + +Right, will fix. + + diff --git a/test/corpora/mangling/mixed-up.eml b/test/corpora/mangling/mixed-up.eml new file mode 100644 index 00000000..d4702798 --- /dev/null +++ b/test/corpora/mangling/mixed-up.eml @@ -0,0 +1,29 @@ +From: test_suite@notmuchmail.org +To: test_suite@notmuchmail.org +Subject: Here is the password +Date: Sat, 01 Jan 2000 12:00:00 +0000 +Message-ID: <mixed-up@mangling.notmuchmail.org> +MIME-Version: 1.0 +Content-Type: multipart/mixed; boundary="=-=-=" + +--=-=-= +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: quoted-printable + + +--=-=-= +Content-Type: application/pgp-encrypted +Content-Transfer-Encoding: base64 + +VmVyc2lvbjogMQ0K + +--=-=-= +Content-Type: application/octet-stream +Content-Transfer-Encoding: base64 + +wV4DHXHP849rSK8SAQdA4L/4ntrLU9OGEHy0JIryOhNPoVCN1MgZieW5E+1wDjMw +GZL3EGlGTYWPhAm6wmDXsMHWMtuBVawUN0lZDuUoQtWzXYZrn3HiKQZn2ahfIrrs +0oMBLz48JurPlrHCIHfsVa/YbfZOTun/TPa5zcjX/Vi0+FgOHEFCmHzK/VqlqsdW +PYgQPvn4rQL25GACLzzJGrDvvJKS4fEo2p3pf6SGDFtBeyKb0AdyXoBWfXelS+ST +rMTVqEDTT+71MToOcmYPX2QJRIMEVix8tCmvMkUXni8AjurehQ== +--=-=-=-- diff --git a/test/corpora/pkcs7/smime-onepart-signed.eml b/test/corpora/pkcs7/smime-onepart-signed.eml new file mode 100644 index 00000000..070303b7 --- /dev/null +++ b/test/corpora/pkcs7/smime-onepart-signed.eml @@ -0,0 +1,51 @@ +Received: from localhost (localhost [127.0.0.1]); Tue, 26 Nov 2019 + 20:11:46 -0400 (UTC-04:00) +Content-Transfer-Encoding: base64 +Content-Type: application/pkcs7-mime; name="smime.p7m"; + smime-type="signed-data" +MIME-Version: 1.0 +From: Alice Lovelace <alice@smime.example> +To: Bob Babbage <bob@smime.example> +Date: Tue, 26 Nov 2019 20:11:29 -0400 +Subject: The FooCorp contract +Message-ID: <smime-onepart-signed@protected-headers.example> + +MIIHRQYJKoZIhvcNAQcCoIIHNjCCBzICAQExDTALBglghkgBZQMEAgEwggHJBgkq +hkiG9w0BBwGgggG6BIIBtkNvbnRlbnQtVHlwZTogdGV4dC9wbGFpbjsgY2hhcnNl +dD0idXMtYXNjaWkiDQpGcm9tOiBBbGljZSBMb3ZlbGFjZSA8YWxpY2VAc21pbWUu +ZXhhbXBsZT4NClRvOiBCb2IgQmFiYmFnZSA8Ym9iQHNtaW1lLmV4YW1wbGU+DQpE +YXRlOiBUdWUsIDI2IE5vdiAyMDE5IDIwOjExOjI5IC0wNDAwDQpTdWJqZWN0OiBU +aGUgRm9vQ29ycCBjb250cmFjdA0KTWVzc2FnZS1JRDogPHNtaW1lLW9uZXBhcnQt +c2lnbmVkQHByb3RlY3RlZC1oZWFkZXJzLmV4YW1wbGU+DQoNCkJvYiwgd2UgbmVl +ZCB0byBjYW5jZWwgdGhpcyBjb250cmFjdC4NCg0KUGxlYXNlIHN0YXJ0IHRoZSBu +ZWNlc3NhcnkgcHJvY2Vzc2VzIHRvIG1ha2UgdGhhdCBoYXBwZW4gdG9kYXkuDQoN +ClRoYW5rcywgQWxpY2UNCi0tIA0KQWxpY2UgTG92ZWxhY2UNClByZXNpZGVudA0K +T3BlblBHUCBFeGFtcGxlIENvcnANCqCCA3IwggNuMIICVqADAgECAhRngrRZc1JL +wfRxRxlq8P0RiqpMCzANBgkqhkiG9w0BAQ0FADAtMSswKQYDVQQDEyJTYW1wbGUg +TEFNUFMgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MCAXDTE5MTEyMDA2NTQxOFoYDzIw +NTIwOTI3MDY1NDE4WjAZMRcwFQYDVQQDEw5BbGljZSBMb3ZlbGFjZTCCASIwDQYJ +KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMPurfll0bYkDPMkY1kNn2xXsAqHSGVF ++gWNNk3mbhF6BABhLJqDjei5aLXFE3Rq9/RRNivCMrTipF1XsbMIAKgQqr/GI1Q6 +yN8lfNsK5uU3d9kw5cOyEooGpOGUrvlKMD0LPGDt6MaiJj+KJ2TR73Wd4rfRIIJo +FMmV9HZkOs+Tvcg8x6SzGhNq18X2HD10MD78eLXKm039obRD+z2JwWvGvrLbNBey +O5A+aMxmCPXRoP1xrNZWBFgKB+WGYDRXW5CXXChthTwMBXFWf4aBpurKMZAyjK2E +grQafn6h/DFddQz/NtT6Dr7UhJ2hfFFEW2rYbNsiqQAdllCb4FucWuECAwEAAaOB +lzCBlDAMBgNVHRMBAf8EAjAAMB4GA1UdEQQXMBWBE2FsaWNlQHNtaW1lLmV4YW1w +bGUwEwYDVR0lBAwwCgYIKwYBBQUHAwQwDwYDVR0PAQH/BAUDAwegADAdBgNVHQ4E +FgQUrC5UWqT9VRivLuhmRDjRJdHXAHkwHwYDVR0jBBgwFoAUt1JNc8CIPbLDeloM +85T394Cid9swDQYJKoZIhvcNAQENBQADggEBAHvqjhjPvKtVIVyleoutwa10jir3 +dooJcQIILM1AunjJ6yHpuuppkc0m3BhwnlOptTKb2EnvSIkTiMY037IBlHWW217Q +cUpggEozgQm6Yb77aGptRovPi2XToEdpA8K//02I1jur1H1z8HqzVjMeHCqRaG3Z +r4C2AngGSkb6D4yZkxBX8CjtHAsUon06UxYsGYRcVykgk3Qek9qxPScSX8yai1K7 +7xGcKUCLfIV/JMpv7ysPtXG7Jd62oNnp1T/3+KoP9JlLs5AiPLC13fjeYALPcHVG +UXEwdIDp1AB/Zu0a6apHQqICncqRhEB4+hompiQHtlp3TqeAWXQbQUc437sxggHZ +MIIB1QIBATBFMC0xKzApBgNVBAMTIlNhbXBsZSBMQU1QUyBDZXJ0aWZpY2F0ZSBB +dXRob3JpdHkCFGeCtFlzUkvB9HFHGWrw/RGKqkwLMAsGCWCGSAFlAwQCAaBpMBgG +CSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTE5MTEyNzAw +MTEyOVowLwYJKoZIhvcNAQkEMSIEILsI9kL3zfZiVOEDjAUWrbjHjGMLoGUwEqYH +pOA9XZ+QMA0GCSqGSIb3DQEBAQUABIIBAGDat8UYN9MShlKEw3hYVVUk6HKO6Xjp +rdgCBKpoyoWJy0VJis0xHxaT2gn/+TPu8a5l6RslgeALjMyflzyzAmrqnknQQG8K +bvbt/MwpU/TxnmxT+2oP9TVmAx/IQOq4pQ35uK7peSPck2CcTvZjHTeVBWcsLVEk +hELoSD8XFRBo34qdinBzW0/sMlyK1XnlN7khKry1g7uaXcurVqptRA1rWOvCOt72 +aElKG/Q7OoVgHxbUpdzV3Hqe9/UeTRDUqCs++on2pLlA0TA0Pq8RQ0hDHD/p0t41 +1RAT1/RbnGQiVfRilMan+VGT4shokb1RoANy/1rOO9ZKlyWToYdRl9E= diff --git a/test/corpora/protected-headers/double-wrapped-with-phony-protected-header.eml b/test/corpora/protected-headers/double-wrapped-with-phony-protected-header.eml new file mode 100644 index 00000000..115019b0 --- /dev/null +++ b/test/corpora/protected-headers/double-wrapped-with-phony-protected-header.eml @@ -0,0 +1,41 @@ +From: test_suite@notmuchmail.org +To: test_suite@notmuchmail.org +Subject: Subject Unavailable +Date: Sat, 01 Jan 2000 12:00:00 +0000 +Message-ID: <double-wrapped-with-phony-protected-header@crypto.notmuchmail.org> +MIME-Version: 1.0 +Content-Type: multipart/encrypted; boundary="=-=-="; + protocol="application/pgp-encrypted" + +--=-=-= +Content-Type: application/pgp-encrypted + +Version: 1 + +--=-=-= +Content-Type: application/octet-stream + +-----BEGIN PGP MESSAGE----- + +hF4DHXHP849rSK8SAQdAhuTX3AYQs007gCtcGsYQmtZg5DrD3ev6Dm+1Fq9vfjQw +bHP9+UKDAmWL5XW2+zlFQVb1CcWn8QUXwjJBZvHEpwyxRWJNYqNlhsnXsX+5woGs +0ukB6Jq0OJydXSKubEnI5Bxs7UC7rekUfxUH2ij6ZXmz5Xyc/h5rF2rJO1uaPVVx +LuVOF+ZX0muBzegGMiUtunHmY0Akis7m3xDl2ZRVViRdW+LPoxb4oAGoPq5LHfHp +5adDtrno13K6oO0NriVEPsSl6xFCLXOqTj600F8658o16yA8fiZj4kY8G8NunmMD +lN4UNw/EQuWIe343dKaQo+iH52atihw90OG4ahmjvkhBC/iIiXZ3J5m10VoJ7Sxy +G6O84UW06pCAqvPmkjnkgpflGdpM3Qv66Uu9ss6jAnRLP2LVv+IVWrwle/Yp6B8V +1adoFUMphkp534vTR4v0xJ/6WaI1YzIwlT2zd2zCMoqwT5weuX509pTbae0iGLRG +Q+l0ImN4AxsUdgWIW+GtMn3GVWCXk2BDLcr1xkl5lJVlOIbIvbpTwqYFMVAfnDGc +s6JZS3Bwg9bfmxSkM4GhZlDiCdZE7f0IUBSnRRHPcMkaox0g7ibF8aG0himZRqhD +3z6gtPmWO+c5i1iV6pQbntB7MY80vprz7gzmvmadbGFS+A4uCaH2afWr1eBb6nGx +W6deJxHaCQrrxujz20y5osSMhdAk47WPkZhphU/8ERncZ1F8aYJhUprAbKFxNjt6 +I4p8lrfAe7iM4UxqtSfVx2rPV9/Nqm8rFVH5l4f/0P93qsBNdF7rVQl9Ry2kVqkk +86ct9ZK2QrOtsnuSYFzhlaDo9pOHkhlMOmQXAgSb12VP87z65NTYRGbElypmQl8F +MXMxrljqnCbPaQaPq/37GEHTRJ7rrUvCQ2L6Ljp+F0m555eYHNiZRaxYA17uABOf +RIr5gfB5ICmnH2EGIYiEkSeX3k8+8xHffrzTpOAqv/5oJBDlRcu6qyVSAumNMPYX +fKqlNDhKh9xmK7K88vWwTgeOBm/sOXcfuAkr9nXqDqdLHb+duLiH+xjvBdl+ewTx +gpzIkoTSsd0fgmNqmmfwmmU4oIQu4QX3/zh5HiQS70xogRxxU3przSFrrtNkiSkI +Oe5fIqQ3tlUSzutTEoaSxeU= +=4vL7 +-----END PGP MESSAGE----- +--=-=-=-- diff --git a/test/corpora/protected-headers/encrypted-message-with-forwarded-attachment.eml b/test/corpora/protected-headers/encrypted-message-with-forwarded-attachment.eml new file mode 100644 index 00000000..d43331bd --- /dev/null +++ b/test/corpora/protected-headers/encrypted-message-with-forwarded-attachment.eml @@ -0,0 +1,38 @@ +From: test_suite@notmuchmail.org +To: test_suite@notmuchmail.org +Date: Sat, 01 Jan 2000 12:00:00 +0000 +Message-ID: <encrypted-message-with-forwarded-attachment@crypto.notmuchmail.org> +Subject: Subject Unavailable +MIME-Version: 1.0 +Content-Type: multipart/encrypted; boundary="=-=-="; + protocol="application/pgp-encrypted" + +--=-=-= +Content-Type: application/pgp-encrypted + +Version: 1 + +--=-=-= +Content-Type: application/octet-stream + +-----BEGIN PGP MESSAGE----- + +hF4DHXHP849rSK8SAQdACh9CzQl7cqCVO0bpHfyqL0Kr/V2TtUO68yhOYuMMWXEw +v+aH1aLYervLMNDSC8Fj6XY9myqaybbOfHnLZIQg0XkR3JIKhWR3LpZtfpFGSr/H +0ukBgdihDN26YqD+UETkBN0lg/fd4+cvVyOJSwuU5DQFdsOk1znvEercz1UVpKxz +gg1lniZzRYCyPSl9NcZVtNXggz6z9XqxT0cVE3WCH2IsVrJPfgnFu/P63pAhp43X +IxJe5mB6y5eaX5Dcvj48Z2E+3tVVn1gKGwLzPH40WIy98KM4dv59I0ZghM8h1dVr +LUUgdiz17fo5oWphzdgn57ERk9B/pApkzujrB4Sum9qy9y/Q2DWFKdOARNJSZ/Li +KZVXZLVEyp1WeAU262blQRtqWXq30wU9PazFo3wsUUVoLCu5SWsRpircSIWrh3gH +iBE/YdPYQNJ6kJoz17AdIq0a4jH3ae881P6eBW22zMxdqD4zfkT43iVQAtuki4JS +iBJ2vHoMU3z+rJ59ea+P595QHCGNyfkgl50e0E8rh9j+9/CExyD6F4GwAZe9VA6o +hYFQ3U089Cp/Cd5jVojUWIAOWqwb6nB7w3SabPZIbhhJSBdQEGe4Xh3TN3k5cpLr +TxDJz4zf220EQ2pt0BJwDu8fdskMXC6ytQettvR46+UtFOOG9eClnAFkgeuqwKmv +k1YyYMFWQ3Bv/IHOFrcu3negBQpP4ln5px6zggNoeNLzaZ9PN9Y2lHnoQTkw/93L +qyjLD+xEnzgdPYZvVsNA1iI6LMrCandDwKySQyfZadj/G3/nLFcoThvn03NNUyCK +Sh0Vy2gJhxD04HF8nkR/E5MLFCQ3x0qpGbOoanctgs/glxCpnzWRcSZERlilQ+3Y +0r5UkO5XJU3Z3CP4uJnjykgB8Qjq/WzERgOtOQ/bVaWBWkKzxS/Pj1sJ47kKMtBJ +3r5LXymlkA70RA0cJIv1F/At +=vLN3 +-----END PGP MESSAGE----- +--=-=-=-- diff --git a/test/corpora/protected-headers/encrypted-signed-not-masked.eml b/test/corpora/protected-headers/encrypted-signed-not-masked.eml new file mode 100644 index 00000000..9f0e51b9 --- /dev/null +++ b/test/corpora/protected-headers/encrypted-signed-not-masked.eml @@ -0,0 +1,33 @@ +From: test_suite@notmuchmail.org +To: test_suite@notmuchmail.org +Subject: Rhinoceros dinner +Date: Sat, 01 Jan 2000 12:00:00 +0000 +Message-ID: <encrypted-signed-not-masked@crypto.notmuchmail.org> +MIME-Version: 1.0 +Content-Type: multipart/encrypted; boundary="=-=-="; + protocol="application/pgp-encrypted" + +--=-=-= +Content-Type: application/pgp-encrypted + +Version: 1 + +--=-=-= +Content-Type: application/octet-stream + +-----BEGIN PGP MESSAGE----- + +hF4DHXHP849rSK8SAQdAhRhcdC3r33MMW+D1PgLAoIhstxnEWOjI0s5wyH2gKTIw +ceJ7nVvmnqLNWbEaoLp2tVH1+cI4guvgqzV60BoxNU5G5YMGqzMS4VQ47N4BENmn +0sDEAWcBT1+PGFlXAeotmryF5ErMXesEVJJHru/KHZxsP3wwRp3qZjrwIWVgVlVo +SpJJ+hwIRqCTbdsw0ejKY0+BJwQ/z+GPmYkWE+ARxkzwMzfA47PW+iNudrQNEJuu +ALnsbyVX0/JA6E8jhvIA2OHb6G2yqFA499I6kWiSkT3m2SikuyKGybwWbaUDZVJW +Y+JN2L8snDUHJKfl5JMhAgu2+fx/joE9PxM6fdx8rJJbpmTrPqrYf6vYyuq5BGYV +snGJozwiN/cqR+PruMT7i5/Dhs/EDl3Z9D8iH7FEDtIzpSJNvGFIHetXC4JXgO7d +C48g+0uuUL3SSuZviz+OgLJbyDu1Pc3tCrtBUs0zYJGio5ghJljU5tUnCNhbBwd7 +oWgYxOmSzbZrs73E5Lpvnq+juZpXSGNoYzaZHacp2FTpo0LlZ2k6o8kx6eYfOlHs +JN+43CnzTnR6eZYkfjIaBbjYKi0rMH2DRJjMXyeYRLjEi9ET2fFX3WWn487snIjw +om8EPhsOxQ== +=wKPm +-----END PGP MESSAGE----- +--=-=-=-- diff --git a/test/corpora/protected-headers/encrypted-signed.eml b/test/corpora/protected-headers/encrypted-signed.eml new file mode 100644 index 00000000..f64b99bf --- /dev/null +++ b/test/corpora/protected-headers/encrypted-signed.eml @@ -0,0 +1,33 @@ +From: test_suite@notmuchmail.org +To: test_suite@notmuchmail.org +Subject: Subject Unavailable +Date: Sat, 01 Jan 2000 12:00:00 +0000 +Message-ID: <encrypted-signed@crypto.notmuchmail.org> +MIME-Version: 1.0 +Content-Type: multipart/encrypted; boundary="=-=-="; + protocol="application/pgp-encrypted" + +--=-=-= +Content-Type: application/pgp-encrypted + +Version: 1 + +--=-=-= +Content-Type: application/octet-stream + +-----BEGIN PGP MESSAGE----- + +hF4DHXHP849rSK8SAQdAliiUK1XTMeUUmjJ6n4yEEBGVPmQuVTD4wdJZx4r2J3Mw +uSVIq8qBJ7NrZfvDa63807usyKpk0Io3tdH83hn3wIKKmUMTroaRZMP1BdJ3aVdh +0sDEAf18AhE5POknHzzolNbTXmQkPNspdNpu0ANdKkukvUZjfWvssZ1WN3jB08Fc +Wr2Byez+UyLggj1bm+HuzbcZGPfyMOpoajFG0+yK4Ccqpf3XapNJn7v1ic2QhR/B +pmWpJR0cXDigNLYQ/RoNEiSur2+0hzeVkDiYQtDYD02Cv4rnhyJdCalyriRaLOZr +4Tau4xfK9PdOydahZZHEFllDU+yfEb9xtBZ+DEGh5AyR1/sG8ORnJc+5m/z54zmJ +W3MmZ7M+4O1q5l5MbDwHq1TrQF5R9JSXyeGTW2XscsIPdvY5bExMwyMoW/XY4E8+ +GJ12UVpC/EWt2Nisfx2LhIoxtwaZm2r0Xkt6hY5DSMkpHLZtGPOOe1QxtXF1qXH2 +owTZynRxlmaWslOXdhtFRHyfGiFK4pNoV6fVB0e2khKKfXynN9Zx99GJ+DoJsOFT +AYOadP1WlbIbSaimv/xSpaijE2XReKTLfN6aK1vSe90r96nCWr31fcd6x9ax0nVx +jDReMRJrHA== +=8mRD +-----END PGP MESSAGE----- +--=-=-=-- diff --git a/test/corpora/protected-headers/misplaced-protected-header.eml b/test/corpora/protected-headers/misplaced-protected-header.eml new file mode 100644 index 00000000..c93ce0f7 --- /dev/null +++ b/test/corpora/protected-headers/misplaced-protected-header.eml @@ -0,0 +1,43 @@ +From: test_suite@notmuchmail.org +To: test_suite@notmuchmail.org +Subject: Subject Unavailable +Date: Sat, 01 Jan 2000 12:00:00 +0000 +Message-ID: <misplaced-protected-header@crypto.notmuchmail.org> +MIME-Version: 1.0 +Content-Type: multipart/encrypted; boundary="=-=-="; + protocol="application/pgp-encrypted" + +--=-=-= +Content-Type: application/pgp-encrypted + +Version: 1 + +--=-=-= +Content-Type: application/octet-stream + +-----BEGIN PGP MESSAGE----- + +hF4DHXHP849rSK8SAQdAlqPAqdaaB751ZhN8drQheW77zbyPrbofTZgTa/32UFow +ShGDg7SQxQD+LssHmGT0g4pUPo8JGor8BIvnvcZa4qRiZJI1i/VWUVoLc+TBT442 +0ukBxtUeKC0V35/zRgS1ZXrbkiBh8TGy0lee/eM9yvfT5FmFhotzoQkexDSEPxjb +g8Qr/IcH0v2XOEmHux3hQpngY/LRYoCv1c8Niu2Zfan1p7zefOZjAxRraeihHi6I +KyyA8WIdiIac97vO1CRyXXATJabjeijH/BaUDlPvQ39c9Mdie+HeaVYcaC3e9oW3 +sjn8fN+KjkjLXwPWhgMDpvP9f3ZD8oCHkN7Utq4OTwz8gb0IbUIkElF4G6O3AckV +UXwrASodKBL58IWYz6VWhyjYxoV2R2hLNtnQWWvKgYzru2Mdb/ONZBM/JMXMjFUt +oxDJs2pb2sun2q6n1sWKTrS9MXbxeFEcp2v3hMXrmP8nLeNiPJ+HlerFCSZasDOm +c/3X97zIneJUosm3ltqLunSSE4vp+FAGIRaibMjyE2u2niDReINxX58E7o9cfJL0 +9Af6olZA1gQ/8t5qMei5qTN3wi4a1ieqTN4yD4v7r8yZE5PmlQfyY0joXVepm8Tx +9/rDLM/gU/zogoo17enlU3ipvLZKsVDkLIlv2SdT1AF0ROnjLBGJ2iWzKst9Rg7/ +mXzEqv9CSVM2lXd3qUqra7reeaVD3vd00zmLq3yM/2sHeuLAc40R0MkIOSa89eRP +iXu4k9+/m4WU4bNPugaH8Szm7OuLQNoB7mAB6t9GJGq7Y8DKxMn5FSUwLtKkGkUQ +YdGCw2/salvqoQIDJVMteKpM4pWi9sFoVbxAU+djinJejSjSmY+iKHcMYeQwOpja +33+W2RM40JOUZ7yc+LzgWy/ahyD27cdS1TPaghlQxPeSjcEfekrjgGW+2wIMmCxy +xyMPWeN+Mf7e/fNh6YDbld9BKk6zY4fNVWlC+gR/aMVapomNgW1/FS7F7vk5qY0Q +pAf1GS1YR4pKpo3sSEaLHw5rhpI0pT5ZvB09+GYRhsBQzP3LvnBCsxcVvi7yERY2 +QVlHejpTWwuRcTQCXP9UXa7z9UhEOieHwy6xNRTi4HVWHbXMxVunvlUnBCnQdFIr +s4bcOjY94Q29FeRjaweYIZBUSabXDLJhLZNH1u6Z9Z8dBZ6Th1+ou77m0rEN6B3d +mf83pKPrOR8ASw88rRGq8O9yVpFR4mD7HiE7YNofsPBtk0Cz178WLCi/D8b9A80h +R/jVyxLmrCPHQUFfu46JgytBta+VBYwnYFHDynnYczuB0gydvuPJ4cJvfn3vPA== +=DmA/ +-----END PGP MESSAGE----- +--=-=-=-- diff --git a/test/corpora/protected-headers/nested-rfc822-message.eml b/test/corpora/protected-headers/nested-rfc822-message.eml new file mode 100644 index 00000000..4d5073bb --- /dev/null +++ b/test/corpora/protected-headers/nested-rfc822-message.eml @@ -0,0 +1,33 @@ +From: test_suite@notmuchmail.org +To: test_suite@notmuchmail.org +Subject: Subject Unavailable +Date: Sat, 01 Jan 2000 12:00:00 +0000 +Message-ID: <nested-rfc822-message@crypto.notmuchmail.org> +MIME-Version: 1.0 +Content-Type: multipart/encrypted; boundary="=-=-="; + protocol="application/pgp-encrypted" + +--=-=-= +Content-Type: application/pgp-encrypted + +Version: 1 + +--=-=-= +Content-Type: application/octet-stream + +-----BEGIN PGP MESSAGE----- + +hF4DHXHP849rSK8SAQdAc+vNxgvGe1T23qYt8zZ2dtmU4+DzCiMlKBFrI64sICMw +foE2ym+RPLXzL2SbgDaUqgYbkiKmo6HrFSURtlDae0lFHrmLYZHToVWXF14DGsyu +0sDgAcsIt7i8j6XWpAI9slRqjDAEPBp+4EFJKL+BdIuEYa6z1ULrv5BUimUi6D1o +UE+k49xE6iFOpgSEghF1+ZneE3bj8rqJJwA+sAjth/Kp8vNccA42mCyn3Avxvk9q +aMw7GWvTRJ5oc+RGo6BZukQtApQTbLzOeI92w68XNmQaSq4+LKUA4+CTZpasR/WA +CR2/MWfwW3vmZilPbW2249Nj8CAawaDxTsIY9i5bHE0HjbfJhBBNffDPoNCh/+Pb +6wIZ9/6xLHAzxFtY+qvDhVO/nWOLrdd9ACZudoD/x4qITc9IFo4F8bWF5iKPs67q +wtw1qFTT8ODc2WWhOizDByOkk/D+Z3mrlsOC/x7ioho0IIeWldkfaET2ucc9FI9S +SPX+huu6vnPAGO21T4EMqevwDLNGWMQBolHSlU3SRnNyU1bqUNDF+/9RiOk/NFj9 +FTwMj8FAI6/q0kZLQUF34h4BPF8/v1TmVZKniaVXqQIE78MvFWXV4FXYvP4w+IdK +q634Ah+cC9NVEB+U6H4aSB9IojUurd+RvD+4x7rd+EtLFdc= +=HmgM +-----END PGP MESSAGE----- +--=-=-=-- diff --git a/test/corpora/protected-headers/no-protected-header-attribute.eml b/test/corpora/protected-headers/no-protected-header-attribute.eml new file mode 100644 index 00000000..cf786c02 --- /dev/null +++ b/test/corpora/protected-headers/no-protected-header-attribute.eml @@ -0,0 +1,29 @@ +From: test_suite@notmuchmail.org +To: test_suite@notmuchmail.org +Subject: Subject Unavailable +Date: Sat, 01 Jan 2000 12:00:00 +0000 +Message-ID: <no-protected-header-attribute@crypto.notmuchmail.org> +MIME-Version: 1.0 +Content-Type: multipart/encrypted; boundary="=-=-="; + protocol="application/pgp-encrypted" + +--=-=-= +Content-Type: application/pgp-encrypted + +Version: 1 + +--=-=-= +Content-Type: application/octet-stream + +-----BEGIN PGP MESSAGE----- + +hF4DHXHP849rSK8SAQdAQd0btUvfUMmCgmDv3mG8d2tfmr3MYsOdE4TeSqk6sFsw +8Wsp5J4s2t9ua6ScvqCVtlUVUL4Z6BsACArwy0/XwGQ8JQ6BUuYH7JSWb6O6tzed +0r8BYDEY7/8+QCgXneo6k3wvPHrzTsvg9fxmCSTbvA+8JCrEzbvM5l/wQmSDf18x +difPsrCT75x3eYgOy7NNYIAg97teybVWZ4raPQ/SdJ9J0TmPTjQF07HPndrsYGQC +rEKvu6oq2/HL4NWOWMNNixs0u6ALRpPuUUXKgwSaZUG8+juOZ3yFe56bd1IvwkWK +ZkKwa9gBn7WA+eNpcJauux/ta6LuXiNvNHUGUnd9puVepi9GO3XAxYcOzqF6ly1V +iw== +=c3OU +-----END PGP MESSAGE----- +--=-=-=-- diff --git a/test/corpora/protected-headers/phony-protected-header-bad-encryption.eml b/test/corpora/protected-headers/phony-protected-header-bad-encryption.eml new file mode 100644 index 00000000..d0e11a10 --- /dev/null +++ b/test/corpora/protected-headers/phony-protected-header-bad-encryption.eml @@ -0,0 +1,27 @@ +From: test_suite@notmuchmail.org +To: test_suite@notmuchmail.org +Subject: Subject Unavailable +Date: Sat, 01 Jan 2000 12:00:00 +0000 +Message-ID: <phony-protected-header-bad-encryption@crypto.notmuchmail.org> +MIME-Version: 1.0 +Content-Type: multipart/encrypted; boundary="=-=-="; + protocol="application/pgp-encrypted" + +--=-=-= +Content-Type: application/pgp-encrypted + +Version: 1 + +--=-=-= +Content-Type: application/octet-stream +Subject: this should not show up as a protected header + +-----BEGIN PGP MESSAGE----- + +BADBADBAD49rSK8SAQdAeybb8KrIaEFV5+Ks5loaz651PudVdzS8ombK8EW7Mnsw +kEppTiE4jo6ZocHvhjSzPdEK4MPh0qmKvu1RrHa23dc1n7Cutg1FjOb6ZRloTisz +0jEB3YxBhFDBZyWSGeAeZx93JaNcV6CBjOfZ6GJhzkqmSs73VdwFUWQxcoV4q5sL +GYCW +=BADC +-----END PGP MESSAGE----- +--=-=-=-- diff --git a/test/corpora/protected-headers/protected-header.eml b/test/corpora/protected-headers/protected-header.eml new file mode 100644 index 00000000..a10612f9 --- /dev/null +++ b/test/corpora/protected-headers/protected-header.eml @@ -0,0 +1,29 @@ +From: test_suite@notmuchmail.org +To: test_suite@notmuchmail.org +Subject: Subject Unavailable +Date: Sat, 01 Jan 2000 12:00:00 +0000 +Message-ID: <protected-header@crypto.notmuchmail.org> +MIME-Version: 1.0 +Content-Type: multipart/encrypted; boundary="=-=-="; + protocol="application/pgp-encrypted" + +--=-=-= +Content-Type: application/pgp-encrypted + +Version: 1 + +--=-=-= +Content-Type: application/octet-stream +Subject: this should not show up as a protected header + +-----BEGIN PGP MESSAGE----- + +hF4DHXHP849rSK8SAQdA3xy46BwN9R4tHbyAqwTMeOSfrrNzqsvCT9hqcVfRIzQw +ThEINU6n9x5QgU2L/mtSaAMkw7ikOmzrJkvjEEE913dvUsw80+Q3QDYODETYzXBN +0qIBrEpD0pYlXiQECDAYqox9JBkOPi3K6c4TLdACG2q7oOtHzbApzHC636oOFAXB +uhARzvr/TN5/Fr4KDM2j4LqdsxSwE2mOJn4lM8EfPAm0jxbDmHKOpjpk/QnKR7ry +BbctXwYIwlkp6voRsAJ/zG3XcLpbO/w+a5U14P6qCp2RM+bNWKtZTT4Gl0yCBk3A +CYGvWb797ZA+5BhraXCWAQcscec= +=WKBy +-----END PGP MESSAGE----- +--=-=-=-- diff --git a/test/corpora/protected-headers/protected-with-legacy-display.eml b/test/corpora/protected-headers/protected-with-legacy-display.eml new file mode 100644 index 00000000..9a3c7644 --- /dev/null +++ b/test/corpora/protected-headers/protected-with-legacy-display.eml @@ -0,0 +1,42 @@ +From: test_suite@notmuchmail.org +To: test_suite@notmuchmail.org +Subject: Subject Unavailable +Date: Sat, 01 Jan 2000 12:00:00 +0000 +Message-Id: <protected-with-legacy-display@crypto.notmuchmail.org> +MIME-Version: 1.0 +Content-Type: multipart/encrypted; boundary="=-=-="; + protocol="application/pgp-encrypted" + +--=-=-= +Content-Type: application/pgp-encrypted + +Version: 1 + +--=-=-= +Content-Type: application/octet-stream + +-----BEGIN PGP MESSAGE----- + +hF4DHXHP849rSK8SAQdAGiLZx0/sI1uoQ27OPpwunlzzlY7ba4E2YNU+AErRA1gw +YYKlhgfzSgO0LpbxHJfithVAkrGYvj5HNWGxriXEsOyfy+Ax0FtAJuzYr6DGKGx1 +0ukBxLoRfWuoo2C9gXwojieSI9lTh7V+FaVUoVmTXhd/WFjWLtHbkIVmvXI1WVyi +wM5NfDi3Ho995P+DMZxTKkdqtbdeYgUK7oCw3FHsYsNSTf3XFazjEvHg/TvOWd5u +m9SbZAKfOBrEGGCzNHfgyluaBKdzVX04GPfZ2GblHlnU9AnGSWys1i8kxmuQYAKp +UrXDlMcVB4V5bcGd1KMvGyhnKzICXWhXiJhEiNOc+uhl97jxXRujflfT6S1+8thv +o86332XixGu8o5svVAEWobN8LUXpHZZlnK9a0Zftf4v8ATHEzQLAa5vdx+BYN8ua +e4dmCtxA4XCfRD58FJ6EwjDqhv45KYnJP2W5eZujQ7Pl1m3HJXGwFQmtnOSB/9dw +M+y1Aif07VBYE3LmUUqmS0HLZoqmOEoh6rKldzyxFmtfZyn73n/zcUoQblEWTE7z +lxIqpCmo8jHPcs1tm9QD3sUmqQ/YXwmqZbD3pOn0PIXZKVY8/DaeggMWKQ/UhCWa +7Z8g2GVq17AjHsS9n3ShDhf6B/8qI+jjaZQqH0W6KLmDQixjf1BoPnTrXNjcloJk +uf0YAuol05fXNAiyPbFNO9zoFPxm8ZVEZG9nbcnNOz7ac/Aea6hqhxHnzNFPU09K +J92FZ08XXDlrt0jw11Z/i606U/7kX6Zy4vCtZjGB4h04msBiLQwI0POIcY28SJ0U +W1AqcReye6lQTz47AkOKAfVQl9hQP++G7nZXlxUQ+z0VRqBEqd/QJdHgoe6X4ctd +r8093odiz6/DXJNwDTHPkaV5IseghzSLYyjmbLR5DUjnfuxKw5zpG+mK3X2PDx1B +LtUNfBGmnLN3jBa8Q/i2WYxYpAuMZzJcCcocxW0H+yBf8+rZNpIvi/RsTklKkaap +EOgP9sZXlgJePUbBmdd4Wwx7WTsjna6ckNp/9WE8CuDy6x9Zkc97Rkd+Oxc/KKtF +1mQ/VdRZj3trlABnHmF0H/H4Qlrt//P/PCl3qRZpE5v34OHDlTT6UjLh5ahWZ3hf +pj3cSKy9uajnWPFf9tnI0/9cWYbllaCMhIMbDZXRM3F4H03bi2k= +=VKCz +-----END PGP MESSAGE----- + +--=-=-=-- diff --git a/test/corpora/protected-headers/signed-protected-header.eml b/test/corpora/protected-headers/signed-protected-header.eml new file mode 100644 index 00000000..f5efaff0 --- /dev/null +++ b/test/corpora/protected-headers/signed-protected-header.eml @@ -0,0 +1,28 @@ +From: test_suite@notmuchmail.org +To: test_suite@notmuchmail.org +Subject: This is a signed message +Date: Sat, 01 Jan 2000 12:00:00 +0000 +Message-ID: <signed-protected-header@crypto.notmuchmail.org> +MIME-Version: 1.0 +Content-Type: multipart/signed; boundary="=-=-="; + protocol="application/pgp-signature"; + micalg=pgp-sha256 + +--=-=-= +Content-Type: text/plain; protected-headers="v1" +Subject: This is a signed message + +Here is the signed message body. + +--=-=-= +Content-Disposition: attachment; filename=signature.asc +Content-Type: application/pgp-signature + +-----BEGIN PGP SIGNATURE----- + +iHUEARYIAB0WIQSaOv5sYAZaFI/UtYp+ar6SRkXMYAUCYxiQlwAKCRB+ar6SRkXM +YIm6AP0UlyfUbhd7bG4Azs0rby3qPUXOC1DtbSpQegSuR7nGgAEAub3WeYgEVVOS +fsnuNE9Q/LnPTS5m85eMa1s1bS8fcAE= +=O+fm +-----END PGP SIGNATURE----- +--=-=-=-- diff --git a/test/corpora/protected-headers/simple-signed-mail.eml b/test/corpora/protected-headers/simple-signed-mail.eml new file mode 100644 index 00000000..cd1e9fc3 --- /dev/null +++ b/test/corpora/protected-headers/simple-signed-mail.eml @@ -0,0 +1,27 @@ +From: test_suite@notmuchmail.org +To: test_suite@notmuchmail.org +Subject: This is a signed message +Date: Sat, 01 Jan 2000 12:00:00 +0000 +Message-ID: <simple-signed-mail@crypto.notmuchmail.org> +MIME-Version: 1.0 +Content-Type: multipart/signed; boundary="=-=-="; + protocol="application/pgp-signature"; + micalg=pgp-sha256 + +--=-=-= +Content-Type: text/plain + +Here is the signed message body. + +--=-=-= +Content-Disposition: attachment; filename=signature.asc +Content-Type: application/pgp-signature + +-----BEGIN PGP SIGNATURE----- + +iHUEARYIAB0WIQSaOv5sYAZaFI/UtYp+ar6SRkXMYAUCYxiQYgAKCRB+ar6SRkXM +YJkmAP9TEGDYF4GZcHaxWDZYf6EKHmNqu1RPYuwEN8QdVbUIxAEA7IiFYPQtKXgr +wyEYNcJ8aD1CYCGhR8pTA9oT/Vp16Qk= +=a+TS +-----END PGP SIGNATURE----- +--=-=-=-- diff --git a/test/corpora/protected-headers/smime-enc+legacy-disp.eml b/test/corpora/protected-headers/smime-enc+legacy-disp.eml new file mode 100644 index 00000000..6f5c9417 --- /dev/null +++ b/test/corpora/protected-headers/smime-enc+legacy-disp.eml @@ -0,0 +1,50 @@ +Received: from localhost (localhost [127.0.0.1]); Wed, 27 Nov 2019 + 01:27:28 -0700 (UTC-07:00) +MIME-Version: 1.0 +Content-Transfer-Encoding: base64 +Content-Type: application/pkcs7-mime; name="smime.p7m"; + smime-type="enveloped-data" +From: Alice Lovelace <alice@smime.example> +To: Bob Babbage <bob@smime.example> +Date: Wed, 27 Nov 2019 01:27:00 -0700 +Message-ID: <smime-enc+legacy-disp@protected-headers.example> +Subject: ... + +MIIG5QYJKoZIhvcNAQcDoIIG1jCCBtICAQAxggLCMIIBXQIBADBFMC0xKzApBgNV +BAMTIlNhbXBsZSBMQU1QUyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkCFCJT7jBtAgsf +As31ycE+Ot95phvCMA0GCSqGSIb3DQEBAQUABIIBADEhlzhFzYj6tUAdsRCrSiLl +d9cgKtlAesJ4cDY4szFWAbnwrCmEcFxjFDUOjbfQCYCG80Sxd+xntni73I7PI2rR +QLjk3w9VhLwFRyzy7qyJi2CavjKTxysX9f36+FXA+THfVQRM5ypiyYJg91X51PNX +hJj3DHrnxqKeSl/z1hdt9r+s6XAUCBSvL99BGnODWhNIZtPDzt8fMNcgarfw+D5F +IZJb6+wX30tkztHkpHHKrrDPveyfnlS/p06Gi3ekrrhBtMQMRb9PA/E+ivDPktsm +aKg0Oauw4oZSKW3f4ukYhbnndbbagNsnTfs/QFy/p+hhKTrfCd0h1N8mTzedVX0w +ggFdAgEAMEUwLTErMCkGA1UEAxMiU2FtcGxlIExBTVBTIENlcnRpZmljYXRlIEF1 +dGhvcml0eQIUZ4K0WXNSS8H0cUcZavD9EYqqTAswDQYJKoZIhvcNAQEBBQAEggEA +FaK5QaPXJ133D2uybQt//oeDm6PkCAFW9YVOgjnLLz6FD54Dt2i1KCQu1Xlg9W3P +1zJdYXOftDgilylNfmt/muEsvbRfFtMWUq0VGirHz//BWmY2cW/ocinFO514iviL +MLE1umsXRNwVIVIk/uh7AmqXjPkRZgRgIMUbSbtmW4DDja+ZM0vmqFQ1iUIlApth +FpjFfPDHHD8isLTbGi2iK6dEN3DIJFGbg5o3nK6yAhVZ7x3LfFNSNVDDSY5mPFG9 +Vm6uRgEE3Y5P6DbXXo6MHTgg0XY2f4y6MEWhOg37NT9aFAfzBBxJ1oSBWpOOfZnV +K1DvAwPaemSRz9oWDcBM8DCCBAUGCSqGSIb3DQEHATAUBggqhkiG9w0DBwQIsFkN +8DEx8muAggPgWGF2WsPq3/a9jUa5GA0YFPiINuETCGTNaEXiVxnT0h0CF+EhZ0T2 +HFCiZEM0dzO05zt9WdVvAREaCSh7ZWG9D9wJF9x+tqQbzMuJ2AdKuoOH73kClvkx +pHxANLhkY7hzIqRb/eLG5D7Xh8iCDiFecXDh7EHqD/R+sfLN9aHKOcKyY36kesBQ +R8aHZbbFnnD+oXSDNIPcntGG3BSGMxsWuOp+rpTKeIHWFIungDNKsLIy3kWleENw +FVIcjUF6QhI1HYW6BeXuVq40GV2OOkmB24rYEW1Jg0hAtY+5rn2mRoyxvUC87bjQ +hLu6xgPmhun9J324eM5aYVwkmVBnRW9hyxClZ7Sv0zlL7lGQ0VQG+zWHeJ+h/M2j +mQpLgAUEGxxNCm5ASHuXPIN6pSvrOVplrT8kKLPpmMYEwmTX2/rBO4P8I8uNrqYD +AyX8p0/l2ArczkWzGTz2luBahrD+cTZPApe5SeyXOxWBl1Lmb0G8o4twBeeBLiHP +XwYvttx0JYG/hc/lmMpEemJqwj9uZ3wGD03dIhhDX2Oj4ek/7jT6yqJh8C1H+PqA ++HNfNXsFQDrRORoqJS8YVEiYRDQNyePy2ugzLTh88nPtJp92hY7bk9zl3AYaiVFH ++szlLoyzfM9D+geZemR8XfI2ijGnrWMlnyPah/zA6J6RwemhuiMklZGYG85hMU9H +K4CFVM+m7xYxKpwFVnmkVZjzWInirJhehElhtCXpx/IFGxH9CPbCyEZV1WVStrl/ +0fWTGicMXez6hVQCadWCXy96/eLIXOrC54gSoIJX2TD6jdVEu1YptutyGI6KdQ2p +yXwhs98Uj7DM3nmFeAcjjN3e8pPoX7aG8eP+MfmHlWN6jA44jMaJmIdp9J20g74J +MdjvnHa/cGibW/RamPiFObN0F94A83vcpUfU/zZ8cFHi/3/lN6Rm9+3/giGRZa9E +Y6e2/CEq1cUbPQ09fPwRJmjZCfDce71DKe+ZFGdYtFR7JwDEeZ6BB4Ff4rXctcWD +PgUJqUGv/SXBcFn4cNUK9MYYqVu1ovd/T7FMf+i3c5MH6BRCvft/i5aeBR+A26Gk +2awtBPYdHW6+AslrFjncBbtPDlU6vX9AWuC0k0MQYnNkTWS8gTvsriXJZ6Zu5iFE +ExNuFz7YcnMKnguOn2ph5azzeMm83AYzWXzZPu3mdr5Siuu/Ke38oADKP+BZ08Za +XVvKvvfnRPXO9kG9hgvEMRU9KOcxn82XoGPNZib+9SPa2zYx5P6HX1Bqe/cmKAen +FKEiJLSTP2/pc6AWAICqJl978HaUHfMFiN7jEUppAifpAWqNcIGSW5w= + diff --git a/test/corpora/protected-headers/smime-multipart-signed.eml b/test/corpora/protected-headers/smime-multipart-signed.eml new file mode 100644 index 00000000..f05d2d98 --- /dev/null +++ b/test/corpora/protected-headers/smime-multipart-signed.eml @@ -0,0 +1,68 @@ +Received: from localhost (localhost [127.0.0.1]); Tue, 26 Nov 2019 + 20:03:17 -0400 (UTC-04:00) +MIME-Version: 1.0 +Content-Type: multipart/signed; boundary="179"; + protocol="application/pkcs7-signature"; micalg="sha-256" +From: Alice Lovelace <alice@smime.example> +To: Bob Babbage <bob@smime.example> +Date: Tue, 26 Nov 2019 20:03:00 -0400 +Subject: The FooCorp contract +Message-ID: <smime-multipart-signed@protected-headers.example> + +--179 +Content-Type: text/plain; charset="us-ascii"; protected-headers="v1" +From: Alice Lovelace <alice@smime.example> +To: Bob Babbage <bob@smime.example> +Date: Tue, 26 Nov 2019 20:03:00 -0400 +Subject: The FooCorp contract +Message-ID: <smime-multipart-signed@protected-headers.example> + +Bob, we need to cancel this contract. + +Please start the necessary processes to make that happen today. + +(this is the 'smime-multipart-signed' message) + +Thanks, Alice +-- +Alice Lovelace +President +Example Corp + +--179 +Content-Transfer-Encoding: base64 +Content-Type: application/pkcs7-signature; name="smime.p7s" + +MIIFhQYJKoZIhvcNAQcCoIIFdjCCBXICAQExDTALBglghkgBZQMEAgEwCwYJKoZI +hvcNAQcBoIIDcjCCA24wggJWoAMCAQICFGeCtFlzUkvB9HFHGWrw/RGKqkwLMA0G +CSqGSIb3DQEBDQUAMC0xKzApBgNVBAMTIlNhbXBsZSBMQU1QUyBDZXJ0aWZpY2F0 +ZSBBdXRob3JpdHkwIBcNMTkxMTIwMDY1NDE4WhgPMjA1MjA5MjcwNjU0MThaMBkx +FzAVBgNVBAMTDkFsaWNlIExvdmVsYWNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEAw+6t+WXRtiQM8yRjWQ2fbFewCodIZUX6BY02TeZuEXoEAGEsmoON +6LlotcUTdGr39FE2K8IytOKkXVexswgAqBCqv8YjVDrI3yV82wrm5Td32TDlw7IS +igak4ZSu+UowPQs8YO3oxqImP4onZNHvdZ3it9EggmgUyZX0dmQ6z5O9yDzHpLMa +E2rXxfYcPXQwPvx4tcqbTf2htEP7PYnBa8a+sts0F7I7kD5ozGYI9dGg/XGs1lYE +WAoH5YZgNFdbkJdcKG2FPAwFcVZ/hoGm6soxkDKMrYSCtBp+fqH8MV11DP821PoO +vtSEnaF8UURbaths2yKpAB2WUJvgW5xa4QIDAQABo4GXMIGUMAwGA1UdEwEB/wQC +MAAwHgYDVR0RBBcwFYETYWxpY2VAc21pbWUuZXhhbXBsZTATBgNVHSUEDDAKBggr +BgEFBQcDBDAPBgNVHQ8BAf8EBQMDB6AAMB0GA1UdDgQWBBSsLlRapP1VGK8u6GZE +ONEl0dcAeTAfBgNVHSMEGDAWgBS3Uk1zwIg9ssN6WgzzlPf3gKJ32zANBgkqhkiG +9w0BAQ0FAAOCAQEAe+qOGM+8q1UhXKV6i63BrXSOKvd2iglxAggszUC6eMnrIem6 +6mmRzSbcGHCeU6m1MpvYSe9IiROIxjTfsgGUdZbbXtBxSmCASjOBCbphvvtoam1G +i8+LZdOgR2kDwr//TYjWO6vUfXPwerNWMx4cKpFobdmvgLYCeAZKRvoPjJmTEFfw +KO0cCxSifTpTFiwZhFxXKSCTdB6T2rE9JxJfzJqLUrvvEZwpQIt8hX8kym/vKw+1 +cbsl3rag2enVP/f4qg/0mUuzkCI8sLXd+N5gAs9wdUZRcTB0gOnUAH9m7RrpqkdC +ogKdypGEQHj6GiamJAe2WndOp4BZdBtBRzjfuzGCAdkwggHVAgEBMEUwLTErMCkG +A1UEAxMiU2FtcGxlIExBTVBTIENlcnRpZmljYXRlIEF1dGhvcml0eQIUZ4K0WXNS +S8H0cUcZavD9EYqqTAswCwYJYIZIAWUDBAIBoGkwGAYJKoZIhvcNAQkDMQsGCSqG +SIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMTkxMTI3MDAwMzAwWjAvBgkqhkiG9w0B +CQQxIgQgGeoQw8WDmjB606EKGR5n1oMuV7Te1VjfA2oB2ebW390wDQYJKoZIhvcN +AQEBBQAEggEABblYEWSnYyzL3jTS3AoPr93YKksIZr5q/b8Y5/1rMxdYxPm+iReO +RHRgpbFQeiqZXzRXtMohfoIkh7RmdQoSV4OpwiUmNU+f0ZEAu8cMVJM6gdyUD+1D +JwDNr+YNLV/1UUGhqx0FExOa/4O92KYBD4eRQw4KDWrkfh9dlSj0Bsl4thrZYGLz +e7ut3FN5TBruZfmqMy50xZ9yUW91YyQUBLiIcuF185y5ZW/aQCxBKBbrNNGXLJbo +8yKFJqSPiWZvwUmVQvfgL182hg823OJTtP4VImcUakTF0+k+BM//qqKXYrlX/tZn +QzG+4ZH/XM1vgHl7ShjHS6TSOHz2ODqD6Q== + +--179-- + diff --git a/test/corpora/protected-headers/smime-onepart-signed.eml b/test/corpora/protected-headers/smime-onepart-signed.eml new file mode 100644 index 00000000..028e02c8 --- /dev/null +++ b/test/corpora/protected-headers/smime-onepart-signed.eml @@ -0,0 +1,54 @@ +Received: from localhost (localhost [127.0.0.1]); Tue, 26 Nov 2019 + 20:06:17 -0400 (UTC-04:00) +Content-Transfer-Encoding: base64 +Content-Type: application/pkcs7-mime; name="smime.p7m"; + smime-type="signed-data" +MIME-Version: 1.0 +From: Alice Lovelace <alice@smime.example> +To: Bob Babbage <bob@smime.example> +Date: Tue, 26 Nov 2019 20:06:00 -0400 +Subject: The FooCorp contract +Message-ID: <smime-onepart-signed@protected-headers.example> + +MIIHhQYJKoZIhvcNAQcCoIIHdjCCB3ICAQExDTALBglghkgBZQMEAgEwggIJBgkq +hkiG9w0BBwGgggH6BIIB9kNvbnRlbnQtVHlwZTogdGV4dC9wbGFpbjsgY2hhcnNl +dD0idXMtYXNjaWkiOyBwcm90ZWN0ZWQtaGVhZGVycz0idjEiDQpGcm9tOiBBbGlj +ZSBMb3ZlbGFjZSA8YWxpY2VAc21pbWUuZXhhbXBsZT4NClRvOiBCb2IgQmFiYmFn +ZSA8Ym9iQHNtaW1lLmV4YW1wbGU+DQpEYXRlOiBUdWUsIDI2IE5vdiAyMDE5IDIw +OjA2OjAwIC0wNDAwDQpTdWJqZWN0OiBUaGUgRm9vQ29ycCBjb250cmFjdA0KTWVz +c2FnZS1JRDogPHNtaW1lLW9uZXBhcnQtc2lnbmVkQHByb3RlY3RlZC1oZWFkZXJz +LmV4YW1wbGU+DQoNCkJvYiwgd2UgbmVlZCB0byBjYW5jZWwgdGhpcyBjb250cmFj +dC4NCg0KUGxlYXNlIHN0YXJ0IHRoZSBuZWNlc3NhcnkgcHJvY2Vzc2VzIHRvIG1h +a2UgdGhhdCBoYXBwZW4gdG9kYXkuDQoNCih0aGlzIGlzIHRoZSAnc21pbWUtb25l +cGFydC1zaWduZWQnIG1lc3NhZ2UpDQoNClRoYW5rcywgQWxpY2UNCi0tIA0KQWxp +Y2UgTG92ZWxhY2UNClByZXNpZGVudA0KRXhhbXBsZSBDb3JwDQqgggNyMIIDbjCC +AlagAwIBAgIUZ4K0WXNSS8H0cUcZavD9EYqqTAswDQYJKoZIhvcNAQENBQAwLTEr +MCkGA1UEAxMiU2FtcGxlIExBTVBTIENlcnRpZmljYXRlIEF1dGhvcml0eTAgFw0x +OTExMjAwNjU0MThaGA8yMDUyMDkyNzA2NTQxOFowGTEXMBUGA1UEAxMOQWxpY2Ug +TG92ZWxhY2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDD7q35ZdG2 +JAzzJGNZDZ9sV7AKh0hlRfoFjTZN5m4RegQAYSyag43ouWi1xRN0avf0UTYrwjK0 +4qRdV7GzCACoEKq/xiNUOsjfJXzbCublN3fZMOXDshKKBqThlK75SjA9Czxg7ejG +oiY/iidk0e91neK30SCCaBTJlfR2ZDrPk73IPMeksxoTatfF9hw9dDA+/Hi1yptN +/aG0Q/s9icFrxr6y2zQXsjuQPmjMZgj10aD9cazWVgRYCgflhmA0V1uQl1wobYU8 +DAVxVn+GgabqyjGQMoythIK0Gn5+ofwxXXUM/zbU+g6+1ISdoXxRRFtq2GzbIqkA +HZZQm+BbnFrhAgMBAAGjgZcwgZQwDAYDVR0TAQH/BAIwADAeBgNVHREEFzAVgRNh +bGljZUBzbWltZS5leGFtcGxlMBMGA1UdJQQMMAoGCCsGAQUFBwMEMA8GA1UdDwEB +/wQFAwMHoAAwHQYDVR0OBBYEFKwuVFqk/VUYry7oZkQ40SXR1wB5MB8GA1UdIwQY +MBaAFLdSTXPAiD2yw3paDPOU9/eAonfbMA0GCSqGSIb3DQEBDQUAA4IBAQB76o4Y +z7yrVSFcpXqLrcGtdI4q93aKCXECCCzNQLp4yesh6brqaZHNJtwYcJ5TqbUym9hJ +70iJE4jGNN+yAZR1ltte0HFKYIBKM4EJumG++2hqbUaLz4tl06BHaQPCv/9NiNY7 +q9R9c/B6s1YzHhwqkWht2a+AtgJ4BkpG+g+MmZMQV/Ao7RwLFKJ9OlMWLBmEXFcp +IJN0HpPasT0nEl/MmotSu+8RnClAi3yFfyTKb+8rD7VxuyXetqDZ6dU/9/iqD/SZ +S7OQIjywtd343mACz3B1RlFxMHSA6dQAf2btGumqR0KiAp3KkYRAePoaJqYkB7Za +d06ngFl0G0FHON+7MYIB2TCCAdUCAQEwRTAtMSswKQYDVQQDEyJTYW1wbGUgTEFN +UFMgQ2VydGlmaWNhdGUgQXV0aG9yaXR5AhRngrRZc1JLwfRxRxlq8P0RiqpMCzAL +BglghkgBZQMEAgGgaTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3 +DQEJBTEPFw0xOTExMjcwMDA2MDBaMC8GCSqGSIb3DQEJBDEiBCAKDM98nuDl98sK +i4SDvP2xlxr2SdV/xNVYs6SeGCBRuTANBgkqhkiG9w0BAQEFAASCAQAcryWkSIbG +rrc/aDF1Z4KRnoRpr+fOutQSLV7k0Tgezt+X/kJCIiuLvjUxLrTux1yUWCKUPb6T +KLYASPJpwDXrNzqmGs1pJmWHTZwUhbFVXt16FaQZkDSATtvhQU39Rsot2j1pP/UV +J7+5FPQwNc4dt7MFW7jU4TBHo2VrzjZ2K8ioELPxsixOCAp3ytkhf1Umw6bC5M/u +oWjsa6xzAl4fw5+pxZw0JdbrYn5kmPiekSsYy2/+yOwzrtIYtHW5dY7DoWWXDXtD +cmCGHkO8qry+MnMy3PwvXiX0warQo1fnhXB5tlk2K9YdiDcOtnAshEBXAudnxlPK +JGzeJVUfbfM0 + diff --git a/test/corpora/protected-headers/smime-sign+enc+legacy-disp.eml b/test/corpora/protected-headers/smime-sign+enc+legacy-disp.eml new file mode 100644 index 00000000..7ec33968 --- /dev/null +++ b/test/corpora/protected-headers/smime-sign+enc+legacy-disp.eml @@ -0,0 +1,102 @@ +Received: from localhost (localhost [127.0.0.1]); Wed, 27 Nov 2019 + 01:24:28 -0700 (UTC-07:00) +MIME-Version: 1.0 +Content-Transfer-Encoding: base64 +Content-Type: application/pkcs7-mime; name="smime.p7m"; + smime-type="enveloped-data" +From: Alice Lovelace <alice@smime.example> +To: Bob Babbage <bob@smime.example> +Date: Wed, 27 Nov 2019 01:24:00 -0700 +Message-ID: <smime-sign+enc+legacy-disp@protected-headers.example> +Subject: ... + +MIIQjQYJKoZIhvcNAQcDoIIQfjCCEHoCAQAxggLCMIIBXQIBADBFMC0xKzApBgNV +BAMTIlNhbXBsZSBMQU1QUyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkCFCJT7jBtAgsf +As31ycE+Ot95phvCMA0GCSqGSIb3DQEBAQUABIIBAFbDR6j4ZB/Mo9BQygYItwFc +P+4rO4d1ak51hc1DpSqyhiMcGahA3yxDRbZ4W1rbmC/s3d5+OWXKYgs1nNMQJ48F +f45BtNTNslPZ1+NZVbkoVJO8Bxv1rjB8/qWuSUsroqzn9enS8DUBxxPL5aSWKQQN +G2IaH9BUkMXLPUYA46GATly94IS4fZqwBtNNBP5eiIIPc9Ogjy+7At5GG7rVMN0M +G5FL0oq52SYUe1167jp378JI+2dkA1q5+Cru/ZE2Rdw3DrMDAFO5GwC7fWKg4zPm +IHZj92caVj1IyfTmGogT2o5tLMqn61BkptqxZwHDr3FI/aYo4vcHgmlKR/TdbHww +ggFdAgEAMEUwLTErMCkGA1UEAxMiU2FtcGxlIExBTVBTIENlcnRpZmljYXRlIEF1 +dGhvcml0eQIUZ4K0WXNSS8H0cUcZavD9EYqqTAswDQYJKoZIhvcNAQEBBQAEggEA +hXeYVSUsT1EBZ/+AjwyEcnlM0kuFMaNvGlBMhAZzAsy012rrZTWbqWkcA3abgm/M +CuZX7mQL0I79KZdmClGpLx6gQFjLemHaClQV0ZNdX4DxakWuME/kCMqbo4MZXStT +a0MHlKUdoMt72Rz4YBzNQCL7ePaii5w6Nd2KD7yJAirLYUMJEjVweVaMI9y9LmbO +vb0g0iuoUe0vp9B20LRcIX37nN5D1GG4tHLPjBD43gC8iqxZQf0uah2cWD1mAG5R +oBgIDKXPy2eVbcMdSaOirDKYZ49WFe9Lad9q3mHHbFs6K6/yuBm/thMEdCJKZTHo +jiPvYdYF8IJfEd368I+DujCCDa0GCSqGSIb3DQEHATAUBggqhkiG9w0DBwQIsb1a +JX/RU9aAgg2I0VXWfs5fc/Yad2qvawUVNX+LObjA6/+t9WxuV2emOeBYzQGjo7q+ +xaIXQwbbF1ej27efGhxUYDwBNS56c0uI0Ta7jxv5OFZhzQGLRzoFp0bbZ+uVC4eP +bFHarRQiPzlg900XASO0RW+UOtqN5raZ3Ry2lKwXxuStZ0pX666Rz4c8PrmMb4/B +aQYn6iKcT6fDU2TpSbWY9iph6kZczSeewK+pIj9nXfjDKXScs8D2Raezev2ciq/V +ZRpRH8JxieimI2yeBmEzTCq11TDYycDfMHB6reGaiCGX//8kAWtskzRyNlV61unY +ZKSNhVKLwKmCQh1V1Nd3oLApT41EeM2oWedUqNBYqB+XGCD4DUYdm1e+4h73d4dn +JTkCdadxEn+9RRvZ4YMlw3mvT997Dy3rTXT29dj14TstZZf2O63pY0TpYy0HZy6Z +Jug1qoe/vdcJ9SPOSfJE6VWCeVjxB+eGgheFLKqzK8Hs/Bm0/wDKpSFgEpOPnkJ4 +HJ2Uzgn1Emo6gBDJt+qn3s2UnowcMsTgellhKvgzVq59LTyRyWL5U8XMBsXT4qjm +0LkRvDkOIjMQH7kqvWbpPlnWpLKo/VVoxifldEegWAqFVrP7f5Y+nNQttAYV79uk +MXvR+5YFkvmQAerfllPqXBJdbB65ovikSVsy/kAboGpRG1oAZ4ODdwdGyiGIzyyc +lE0x/8+gY8BqWzRtWX4GySKyZ50/+xkJe5ss0IXPCgq/09bdihsRn57v4V4SpdDO +k3g/Dce+LzCRL8uTbUhrhZnjKSjRc3fFaD/BpLYjEDbnGF0ICslN3vb2xWUK1u4M +uUH9r7lH/DCb0+TxIBtxOnP7W02bz8gGJAxEVEqk6pjxxOYqfS9/uBrrAY8P21Y9 +PFLdeHzEdYemq3il+4S7OU3uNUuAYijxmCRs7JQxZ9puA0iaTME9gK1yikzsLtVZ +f+9osk2nYgfXvlL0AiYabd5cU2GNW33TkdDMNBsB7lx77J9erVLZpPKNo4vgHA7b +owrDaYe0AgcZm79fvmR0RdtIZI91MouEhkdhaPiXmypmszjR/M0Ot3Y+oU/ks+yV +Sle0S0h4V8wJRJYG/9VVurm8012ke2U3EGFlVnSv/IYtpssC+U4McRCmakKCrGU7 +OhL5JKBQN/DFTu4pV39IQlLLhg3wzA2FSkyIL5gEbS6sP9GTPo5LlNm2nYfJQX9A +sHKSrfh68dvjSNExxi/8hdmFnnRwbAnUCI/WObGOkKdheOfdQ1AAHtLO7G65X1Cx +RctbAJWa93M+iRUN6qnB+vIbPPnI1Mc7i6mPYzgtPrM9bYqEZz69pQtHcGTfxOrU +tm+/h36CRzJBfXodBZbwQ9mZAzfkKdlArlZYIeBUw3ORQnQ7UlJgG8KsZpUhTxCc +gvMoExtlvkXcYLRUBFfZWyOi6FePzQjuCK1w58OdweJgXprEAWSvyxhmVdg4jUpX +MYKE0tZI9xwujyWjACO0myYqTdmsqyds+BgfBn96XiA9OFUH2C0/GAomhNs8uPSO +T3Gt7Ld/FByxEVrtl9A37X6bAwZO01j5tHmdXFPmMVep0R8zsWtPn3RyGAjcgcq6 +50wJRwhvofdI7wilZ0KUBsAaPj3MK52cRyD19VXKNNwt2bLDV6gcWQ8+QEMusxfp +1Dc9N9DSs+w3lGsFfpoeQ53/fXcVNJm6Bv89bH9anLGYdCdRGvZsvw+xRuglykqb +xLtL2lB6wzlRFREJoWTzCVsdpIZ8znPmk1cB0wDlbMeu6sddHmv+6fpyuvQfQmdj +D8WLRTuyxax94TmBlhJCFYxmO/y4Ivlx5C60GIRTkHpBYL/M0RjrbIszXEqcogzU +bdwjLIhdEnpJ5vy0uXwhltce8BDpenmHE7y1kHvPBiUG3vB7AIXqhohFsJU3AYUj +d1TvFKS2AsizUTLuq0Ydbnz3AxMfmnZe8qYkNu2zRygL2xTa58f/MwsHKakk3OmS +9JFZLrkkVWZKXoARctuahYtWBAsykaWVNnB6zGcdX1MGVccl930Z6QWHyydtZpQc +ivNdEGdGv9B0K7/ngNdVgD5Wd29AMMFnS8+55mLfRZDCjUmshSySaf6Ein4HD9Hr +vk6dJvBPjnI5UjeUPjmH+wcZKIjLHW/aV/6/zoxzBh61rWFlr/daec+CFZE/+epr +LRRYSmv8oY47fF4duDDhoexcvP/CH+A2Hr40OfciL4vKy3nuUDCNa59xO9JWv4NL +n3MQypC9bcaVPkXa7TK3ECq1Jgv8gwfdh5/ovG5OdZA4uIcO+aqcskt/PD252c63 +0Znww3RXXf46KT4GdKO5A377ixkUMkznnCMvottmkPxjnhQjAsQg3bJeQk8EoX8f +Pq0If4i7SRBSDtb2OH1pPmk0RVPtxlRDTVj3vS3Lci4xADFgC09n9nIvPO/55aau +O6StbJtLmpubS5giuDH3uftwuyRiLqm3gtbSKPdoTk+dJhHXbbpBknL4XYTPxSsR +IIaRds6w30vf7/IscyunMcquJlsO929SSa93UevKEIZbqbV9oGIqwkiUMdVZK09g +rW0F//Ts4a5nYdEQth/fq3JnwqeHvvUfKdasK4TtrTnUBX7qZk/K3Y1fZwjKdd/8 +t9t1z7Kb2d9hWwtY7xP8liDluVFTsq8NM54ZC2218X5ViWz1yFmF2LXvRixsmYJv +Tz8lUUnC2B/Etm1kkU4zrYK0/L77EikKVl+B7BXfEqx6ow41j7e1YZYaqmZ9mph+ +UieSdzqVYxhPwT25DrkU3r74iS28gKsbFhUaNklaFOO5iDWsKgBXT+wdZqlYQ6Fo +oPe66025iJMwK8t+d53jEduHezHO2sTMAuf2hpdaZo7+rP/hRTReAR6CmI7nkWhP +z5Kno9S+XhiSP+WTSpsoA4ubx0T94mL8NOVvSZA76TZ3ObVAP5VI/bwv6Grighor +Kpsjt7dhSJRv+RHv95sAWBeW1Fgv8XOPSAZOmpJV2qc3x3Qmj0MXIR+7+3GlUr8+ +Dit3CE1hwtxgOW0tc8kuBTfQD+wNSa9r0eUyFscEBBljpEVbLjgjVdNv4Hc+fsbT +g1JzZuUIDQZoEO2xLjxD+I7vLZKQa0J1JeZ7O+NqmSxsvSnwCWtJEWNMMxYNfwsP +rdj1zPLqn3rzSBqhroNbaDGn86BTwIqfhr+AKbvevxS6bI8IbyKm9u3BFr9cuawx +Sp1QM3NtqNStV67qR4A6U/ZyPUJdO1bxo8F3oRmJqOt7Jc93rFgkhBJ2+eMtrA75 +Om5tB9LBVSl5U5yLP0COO1QE5pqk5yuhJLT9Dyss8bWDRbSWKj83e4YXhPnq71Bm +001czylLVNUlDc69Tf7FXjtIxh2yjvOT3zeLBPXOjU0it+gAma4vgrh8/mMXnNiq +OLsVow8aKqm+Ofd6m13K5riDFgXgNI9lbvPKUSWlEqDMEqXk1oAqD4Nb5NTGSFpQ +Q4G+cHAxJCu7vcXBaZnP8uMP5IAkdg5jIPvvMRwg/aqkl/KbL98oYZ5+1xrOMuKA +LT1uCJ4MMB0lWsa1He4jPe8LneSupw7vAXlbo2VzcOI6oCSY5hV+cGQRY+LjW81q +Cu5nLq8bwgnZMSlPmwr0YrKmvh8YKyGOrmTadxykC5IC+XbrLDsw2Jd9mLIjUQ/V +4ibjeb+e0QGob22WOplCLnHGW/SnYei8KG1dxs/ahS+8vQdrI880ZJx2QJnrz0Ej +ux6tKv4mvUkqYA5hlTFeT3PTr54yA+YLcCLMfBDx4ykPQnYUBj7ONHuNSUYt1CJy +faZ7cWAbhgH+wlTFdVBVeW5D4FRbM8dMTPXyfC5ygwTJOiDu3vQKyyDkmiX7sEaC +P1JN2V55uacyR8ZAG5+Mlc4ZMx83kAIZZXTCdqa1EX8yda31FI2rDHmvW/82bmjL +pvI4Nnn9+zzJtDVCJ0B2VAZ3Edov5GzPikm3un4+mvyhUZpH4sbT0+VhPCsr1+zn +bDJyNw4AswxaaJKh2+7wBiU6h+9TP/lI8SAJHtZL7zHBH8tD10ptksLRWDs9vYqp +/3T86S2vxJL5DvLFJSAZrYOE3InS+keGmTMCdAl9I8zIworC/8uQp0N8ESebEVjA +aHotBk59lj/OW4JZ3tQkcdQWkpnUfW/x9xE2wthacHlRzYDDsFByjEqkQr0MU8VF +EGij9RCC97zyFrhv0xJm1C6wX0pcuEcuPTNBf38WyBTIfmVHHz/I5YKk5cdWG7Hq +fmccV5GKrs2BseR683HM+/u50sq0km9UrqjgFR1DjfDoRKp0guP9PqkJAnwG2nv1 +hmNtXumzkF0otP5LDKLJ84MGP8Wnb006iEdD48Lra+clRAIIuLX4A0wRQjViDp7n +OByI6ZcQd4DTMHnFPRvMkNMLYn13LghD6P9TTjQZ0KCOCwmc2TMCIhJlvzOYX6Cc +wJZYLO1ltgfnHEuh8ijv0u3d/BUpsknYKBSJGUyMEZ9iUtbFPVfXBGSTi3gcWHtl +IrM7wjswJwHWSvZKWUs+YWWJTwj0apG6ViGllwOAqR9C48uLKgFWPbMoTpolnp69 +eiij5ZHxB0i7SI80D+r65b+fqaFzVIJXVEI0zu/mIilbYBnGkhLI/Naw1m2e1qVJ +mi1JBjXLAT3pEJDh8b3Lpgw= + diff --git a/test/corpora/protected-headers/smime-sign+enc.eml b/test/corpora/protected-headers/smime-sign+enc.eml new file mode 100644 index 00000000..aa09d19f --- /dev/null +++ b/test/corpora/protected-headers/smime-sign+enc.eml @@ -0,0 +1,95 @@ +Received: from localhost (localhost [127.0.0.1]); Wed, 27 Nov 2019 + 01:15:28 -0700 (UTC-07:00) +MIME-Version: 1.0 +Content-Transfer-Encoding: base64 +Content-Type: application/pkcs7-mime; name="smime.p7m"; + smime-type="enveloped-data" +From: Alice Lovelace <alice@smime.example> +To: Bob Babbage <bob@smime.example> +Date: Wed, 27 Nov 2019 01:15:00 -0700 +Message-ID: <smime-sign+enc@protected-headers.example> +Subject: ... + +MIIPVQYJKoZIhvcNAQcDoIIPRjCCD0ICAQAxggLCMIIBXQIBADBFMC0xKzApBgNV +BAMTIlNhbXBsZSBMQU1QUyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkCFCJT7jBtAgsf +As31ycE+Ot95phvCMA0GCSqGSIb3DQEBAQUABIIBAKswTlBs+STeesZIYAf7Gqsj +Za0rdUeDTSxt8RCa010EHb2lqKzHRwwPJkClLm6Glb09nYnQiFrEl6jbWTG3hMRD +OSt9kyqeg+MxXr2g4LoXAT+8hg/qBoF//tX+bzxhx0gx8wjxBc3bvp4esCJro7Aq +tx56BtVsIO6TA0NT0CaOcnMhIo09raR6JQX+DoPynKeXihny6TFDP7eopCgorCfR +o59O3ZMvaui6Q9KixZy3Yae8fa0ZdJu3FahIZTPdBHzbmirLxcYgp+cbTpW+Yno2 +X5GJ8eq8Y0qcc/8r6Xd3REarUxO2YbO2D6cgDj+aNnnsoG1/9psaYl8W1MSc2/Qw +ggFdAgEAMEUwLTErMCkGA1UEAxMiU2FtcGxlIExBTVBTIENlcnRpZmljYXRlIEF1 +dGhvcml0eQIUZ4K0WXNSS8H0cUcZavD9EYqqTAswDQYJKoZIhvcNAQEBBQAEggEA +RHhTarDqNLzXSaBokp2L3EwDv11KiGtMSMUQuPelNoC2nNYU1yzAF4jd+1UUo4Uu +quiHg5Hn44a9MejrVmQRLd5IEJiZGD8m5JguuOjn0ooyA6EEWUpMn6hOAKlaCiXd +kwTivKfhQFJe9Eb6TKqtvT2IEu3kXFfJKi+VyQw49+RXBmajDKJoHtumMJs8k4Ll +kJah+wD+snwHg2LCiJeSVHmpf4RvSiIJSvk206IeTxN3JecNbBpKLtIoy/CjWEZv +G3Pj/zkBbb+XhHbXo+Zk/e3aLToVG/cldx6Ti8zArOYNAzgt1G7dmJ3mnNPitEwN +O4qIozhT2Qn8P95AEV5PsDCCDHUGCSqGSIb3DQEHATAUBggqhkiG9w0DBwQIUzdf +vwulBs+AggxQMK121v6lO7W1r96RW0rsOHzsIvGyfyRTT1UuZRxVL09BQZstI5ss +5Zv8BogoKA0mLaNBKM755joUbzF5f/jMYhkW3q0Het9/HRH0mOnCSnoT4i2yzNdi +0tj8ixPT4sgPe9FOTkke9CzoJ967kj9D8u7Ik2goojttt3ViJkv3a1qrWDMiJRIJ +gOTTA6ZaQep5L92vtCobhD+i7iaktEpmbYucXs8jjMmwyxCFxHXGD/fwDk3UDgeu +8a5f66YepZdbLKB61A3rBwJMvQubuXEIEb04tG0Fgwx3Ao2NshN+XRk/y+uhQKdC +5ZduTxk5sokA+H4nzVv0IUkAAI+8FwY5ZWFGlncKUM/wvrGHQq3R/utChFauOHxD +7vZQLM91TcQzVWdHfJGPtp+ekjRlu9UqatQgc1ogObw3PGYlJc90Gl7AZHAsYncU +jsMbdsweuFuYNHJ8lR5VMo6L4bCNMy+tQBOfYTF1el+i9S3r3SWdBP+uLiKgDQ52 +/o4shxoi+YOf9k8wRR0iDKqwzcJuABplpgA9qjsQNqBKF5t5p3l3ihH1mfh8FaPL +ab0aDC7uunY5g44qXcG9YS+j5wUFuxgYyGkVcJq3xIit9YbEy8uPxJFz4g0vNC+r +uUSsztbLyHkhv7vnCTAlmjgG9eDpW/tEC/85pLOV1HUooD05eRfkjU+1XsccX8DG +iCax2C6W3cc1SC/d3a1+27OcgvPdDcb7zuL3v6qgqbN+7GDrcQHQRFMd2vd6+xGk +NWZQMBZVHmdCcKGl9YaH0RgkGH5beTRKEV1wBafuVOwTEwl/FuZzD4oHrOaP3GLO +cLxi44her/hNxtxDc2Lw0VQcxD8A55OkCt9+u9M5/YPj41FWyH6kdh86p958gzF5 +EpwCnQDe+s7OrwFVV00DEJhqtEcxRCSSW8dS4hVEhVxQJ56liJP+VZ+LTUJBelt4 +mfSpSqxeJnmyY0nmhEbZKVbK95a1WYMJCEpk2n1g/bQGqJKRryGwbEF9WqqHuvPo +Bv/BfinoUL3Kd3g+hgSCR4mCg5EhEsCx21jEqEggzb2XMcA+knGUYxSWj322pZfW +LDh50gkL3GQSmm9fOvjdK40GwZv8HUdLXuAQ/J19PafMaDkd4jzRi37VBqdDgLY3 +u6K+oFKhG4oqQYa/er+ZGAqqldTmu8HGCsjm6kGZvSAocJg0UnLPBNI0/iB0BYGf +KJk302jy8kfAXGSiWrYDNbTuDzFMD0zsbHbM07AOOROGwKv5TxAF1EHHTxGb3IKI +jRkVBL7QdRtDH03zlxv0lnFwiuCrzLrQdUuEG/0wt8RaNr+p8hAo0YEGbB9jmbax +CSLLWeNbMOo8eIi3Mft4qmDXp3TEuHHru8kbvA36vQ8+dunSf2BcecyM6UAYBqaw +SCcxQmEcyMuyjSLVerVfMl5lwlmM+qabxHq0hpJHnCR3Vl2qX3CiRWpVlNaBVyTf +793bAm7DU7G+Tzt5gdgE4s41aZt8fFXyclhH1QLPNSnctxJjuW1gJJ0h51iCQJp2 +TgzDw35oqvBxbN3yqCFjScsQXPXYErGWkLrAkUurff4x/ZAizFkmjjdpyaIK9JBw +QRyrYYQ8pJhXJe9BrP3OS6evFlsWZW1MaoQcOUMWsuVucE0e4AQRGlPixDjJWW7L +I6AQ3KUW6ggzDJksaYHDiuEoBa7vcYoTar+/AhNjYMjkQX/3kptQryqy+xke0t8O +EPQER0Wur2IpvM6YsvI/SoeFwxMb4Zm5AFvvibiCCmmoJc4A9E1tZ/sMstHyZ5iu +tJqu1M5B0DIoFdB5pzbZYCkgN2n7EY23JS7E/ozOrzYuOIVUJVtB5awqmuSLmI+N +R91g4FMEfLYC1HYKYlaknX2zmrx8+Z8MEJNM2K0q8wPBnm86OpGeJmlZhFwT2x0R +eJpKcfLGroXYh2Gb6BxwIfKjOOTXCoIFP02JbTJ7clc/2ei0BN6JxywPkH4renaP +SkuNBgbexfZGBhMTlR+CtKLEUmw5bxBTDwjjcvzWDPhy/VurLQxhOqYnbhZW21SV +4qMrJ4uGXEhylnP0FD+HR4mB2epYcW3dFj4cGN3B2Y5NnOTw0Z7fi4S0BPdvYjP9 +LL5WZ6p90mII9wcunGCRnLUUYumRnIbhVHIBTTIRI5PUSVFfEuotrDZ9oZcwYkO7 +fQX21gJCzvJyp8ft01HX4Kc4mN/FMPgGcmq70N335yQ4mQ/eSvTNn7E+35ZGn9f8 +PI7QPJRhdUkBZCnwyv+OwK2VzySxnqNfPaZk168foGRd9eFCw80L4U+SuLDQH6ZT +o++VKk4Ce2jx1khoig16wic0dVFwt4bmybNz4u/qdobYr5fs7dKPHHO02SBvAl60 +16foheiBtV2VA8mEBA1BhcNmKYegu+RGhmGfNDuZB8XdbPQ6M+N+ilEj/6rr+wgD +gcmEyAGNwJkmWpbyrm9M4lDtzemv5N5V32ppGizEt6c0xlkiULllwGdWey3+YRez +7b+Kl/uIpDuRbp5Tf43dyPsy/cx4DNm5kAB4CcyyVlXPaqXm0llEPYBmaMW3O+D2 +5v4Wj1qwIRO5qgI8FyVnX6sm/oucfg5l172edaCG8f42gIMNfQBgWVMsSG7Nt00x +dJo/OGtACwnY47ohMFG0BejWueAksdnqVWCIto989iBHgegNx5jUCycB/YOm0xh0 +pfeNjA9PwZMUpjlqrjDFIan/UFYAZH5ISSV7G30oRKJ3TTEshShXP2K3cn7Fa9W+ +H/jyTEQGfCiTq7Xx5FrOIJBmKjylkF7oGlIBxJgKKRm0iD/sGNTaSJ6Pl8/K6dEz +zsMwEFTawnWVq32Xn3d6/+FADZ9lGhC5WwVgaQHRb/9Ejt1mBdptmXjEj5w0YOib +xFer54LrQgvBWEYRqDneh3bI53BudbTl7YitqULVGETe+k1T0NbcyElrr2Y/NKHk +rPMarAfByookkJrDtVh3VrAm2ows7OwvKGyoNybjlyczjt7xosatZ1xkgb9mtR5i +E2l9ajSR4SzQjHoboRyOCwl5ZgLV/+yp3jTkNcUkFDRtkVbGfascBIMe0ifUGfvP +mJ9AQHZxdfm99KlQjCZzR8CBUvR+zsT43jr91CQKSSEvPMl6vVRV2thiWw3VGgP+ +c8i5zj6+zCnlEdSWiIeFwOJ9/ewKSdU9pGrA0OQtXbYQlDCKuGK1Vgy6jJCeglDH +T6gVNy5ip593wWWfOVxVEWUygi6JCdS27b5+P/wlNjTrzpZ4yWDCpyogyrT1gf1/ +GgvdGuWWinKSLOyh1fJ1p9WoDWcqH98QhJXLV+X3OC+tmMofytmHgXN8jjVsWSRa +VWrFUarMs2hZDWf6e6ncwvMC8QliiszrKXQNckxvBuh5hug9WKurVj4CIWnoqXFh +OqlO+VbqZSj+TT5pCN//370vsIZIn5UbrpDmUP0rUvdTGz9iWQRUl6R2g2h286s6 +pAGHv9luXCoPJ5uPTwcbBSl/js6J+K5McyqRl4fucacfVFnMuDpET/tT1eAROP3F +DOBKqV5YOO0rWMexzMLJUEQ/eGSwfp7wv8on7jeGxAexMqyWCrhRk9G2ZwiT4L7Q +rX4NIDj6oujCCkeFUATs0pGKwEFGmpbEUfDOsioWoVYJZPsO9kAGq6bhbKACOkeZ +v95ha/3CleYXGUUNtzLsCx+c9Zp/Wl+0PcT3ZSWhmRbXiIvz+ntHVe47PHxbvH6a +ZG7YGc/9u3jTvJJyYtQO54uGET/eFWSxCUo5/VfsheOuLdXN7JnVi6ooF+c7WUZd +61FwfDwNf8z0GWs3EotozrWyBgKS5VFP99vZM64nSqu9v5PSzmb0AY/Zc5KhVXVY +zQqmO3keXq92Fejtgyd/O9ITZf5GkMQVU7+IT52JxFRQplkbTHJj4HRGtGHtIyPW +Rmf9qSZz8QgVyAUKK1k+kLBJTHN3CWIB6S9hO42HWEFvLVl8wPWW5aLYTsVMGnMU +aZ35M35odjrvY9B0INMpL53Hm7qH1w/h9QCv+xsFmanYsoylwbuKW2TcSnWB74C7 +Wy0NmCkaM+JweOgygffWicLGJ3jKWccykTUZtodz1ectNHh24puZICnvfzwjte+n +eSQqJfHMsra6V8BcshpwmvPylHnkU+2KyhQ8430OR/qaXAYJ7EWRBEFe4EIpxzfL +zQF0LwbhpAstpcjOlJfEHmQiWx8ASzE1LMSfZo148sXYEWsJL7t5tWs= + diff --git a/test/corpora/protected-headers/subjectless-protected-header.eml b/test/corpora/protected-headers/subjectless-protected-header.eml new file mode 100644 index 00000000..8c7fb3eb --- /dev/null +++ b/test/corpora/protected-headers/subjectless-protected-header.eml @@ -0,0 +1,28 @@ +From: test_suite@notmuchmail.org +To: test_suite@notmuchmail.org +Date: Sat, 01 Jan 2000 12:00:00 +0000 +Message-ID: <subjectless-protected-header@crypto.notmuchmail.org> +MIME-Version: 1.0 +Content-Type: multipart/encrypted; boundary="=-=-="; + protocol="application/pgp-encrypted" + +--=-=-= +Content-Type: application/pgp-encrypted + +Version: 1 + +--=-=-= +Content-Type: application/octet-stream +Subject: this should not show up as a protected header + +-----BEGIN PGP MESSAGE----- + +hF4DHXHP849rSK8SAQdAxAZy4nBUDdm2u4sgr1inLki0LMCVcsVlax6Pd0AiZAow +iYz940UtZwQNRRb640w1bB2pAvg5Nn8hJK5ye3qtyUWNW1VEvAa+GXndI/Qt0+7x +0qIBOXRBCrkOxB10iCvSDVoOMZPj8GgvQwpsnslATJbsp9jV74fU7eFCKE5VWKUw +FTos+VX1YFZyf2RsznHXdi0CrL2rkUNoLby4SEUa/urd6GKb3xuOjJlIYN4Fh9xz +e33+Dl3NHohNooytxoJuTNiXbNWe7kidfOwMGzvdYsegk/WMqMLg8DmZPvl0BcYI +o+4ZU3kuhbk5Pup5nOV6OLrs7A0= +=BF8X +-----END PGP MESSAGE----- +--=-=-=-- diff --git a/test/corpora/protected-headers/wrapped-protected-header.eml b/test/corpora/protected-headers/wrapped-protected-header.eml new file mode 100644 index 00000000..87f3f8da --- /dev/null +++ b/test/corpora/protected-headers/wrapped-protected-header.eml @@ -0,0 +1,38 @@ +From: test_suite@notmuchmail.org +To: test_suite@notmuchmail.org +Subject: [mailing-list] Subject Unavailable +Date: Sat, 01 Jan 2000 12:00:00 +0000 +Message-ID: <wrapped-protected-header@crypto.notmuchmail.org> +MIME-Version: 1.0 +Content-Type: multipart/mixed; boundary="zzzz" + +--zzzz +Content-Type: multipart/encrypted; boundary="=-=-="; + protocol="application/pgp-encrypted" + +--=-=-= +Content-Type: application/pgp-encrypted + +Version: 1 + +--=-=-= +Content-Type: application/octet-stream + +-----BEGIN PGP MESSAGE----- + +hF4DHXHP849rSK8SAQdAbnAG8Oxige+8PXg1B/Ex8Nc/IcBW7R4Cmnq3rArI3g0w +rb1P2LngDMpqMxRGAkucBU/omYHuyDyLIoQZc84XYQy9N+M/u4HK187tyXaKx970 +0qIBnZhdiVm9RFn8CvQLG1hhw8E6UFm/YlURkMoaP66HIU9WLFAlmHrZPOnXJBr5 +2qOWnqSttuD/1Bjt1R2dguoltYqv1iBkwDlE2mWubSTkDp3Pf3QeJGz3Q727+bHV +MI3k/5sNfJyyx9lIB3nyjwa/+Ap5orrPBwe+Y8tRdLO9xtvIFO+U9l9L6yPTYPyz +4P+LVzDS+6tnWxPiLeEz/sRGmtA= +=pPju +-----END PGP MESSAGE----- +--=-=-=-- + +--zzzz +Content-Type: text/plain + +This message body was re-wrapped by a mailing list +which is why the protected headers no longer work. +--zzzz-- diff --git a/test/corpora/threading/ghost-root/1529425589.M615261P21663.len:2,S b/test/corpora/threading/ghost-root/1529425589.M615261P21663.len:2,S new file mode 100644 index 00000000..62bf98db --- /dev/null +++ b/test/corpora/threading/ghost-root/1529425589.M615261P21663.len:2,S @@ -0,0 +1,9 @@ +From: Gregor Zattler <g.zattler@xxxxxxx-xxxxxxxxx.de> +To: xxx request tracker <rt-xxx@xxxxxxx-xxxxxxxxxxxxxxxxx-xxxxxxxxx-xxxxxxxxx.de> +Subject: FYI: xxxx xxxxxxx xxxxxxxxxxxx xxx +Date: Tue, 19 Jun 2016 18:26:26 +0200 +Message-ID: <87bmc6lp3h.fsf@len.workgroup> +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: quoted-printable + diff --git a/test/corpora/threading/ghost-root/1532672447.R3166642290392477575.len:2,S b/test/corpora/threading/ghost-root/1532672447.R3166642290392477575.len:2,S new file mode 100644 index 00000000..b79eaf7a --- /dev/null +++ b/test/corpora/threading/ghost-root/1532672447.R3166642290392477575.len:2,S @@ -0,0 +1,17 @@ +Return-Path: <prvs=701fd58e1=www-data@support.xxxxxxxxxxx-xxxxxxxxx-xxxxxxxxx.de> +Subject: [support.xxxxxxxxxxx-xxxxxxxxx-xxxxxxxxx.de #33575] AutoReply: FYI: xxxx xxxxxxx xxxxxxxxxxxx xxx +From: " via RT" <rt-xxx@xxxxxxx-xxxxxxxxxxxxxxxxx-xxxxxxxxx-xxxxxxxxx.de> +Reply-To: rt-xxx@xxxxxxx-xxxxxxxxxxxxxxxxx-xxxxxxxxx-xxxxxxxxx.de +In-Reply-To: <87bmc6lp3h.fsf@len.workgroup> +References: <RT-Ticket-33575@xxxxxxx-xxxxxxxxxxxxxxxxx-xxxxxxxxx-xxxxxxxxx.de> + <87bmc6lp3h.fsf@len.workgroup> +Message-ID: <rt-4.2.8-22046-1529425595-591.33575-211-0@xxxxxxx-xxxxxxxxxxxxxxxxx-xxxxxxxxx-xxxxxxxxx.de> +To: g.zattler@xxxxxxx-xxxxxxxxx.de +Content-Type: text/plain; charset="utf-8" +Date: Tue, 19 Jun 2016 18:26:36 +0200 +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit + + + + diff --git a/test/corpora/threading/ghost-root/1532672447.R6968667928580738175.len:2,S b/test/corpora/threading/ghost-root/1532672447.R6968667928580738175.len:2,S new file mode 100644 index 00000000..343a855e --- /dev/null +++ b/test/corpora/threading/ghost-root/1532672447.R6968667928580738175.len:2,S @@ -0,0 +1,18 @@ +Return-Path: <prvs=708ebe06b=www-data@support.xxxxxxxxxxx-xxxxxxxxx-xxxxxxxxx.de> +Subject: [support.xxxxxxxxxxx-xxxxxxxxx-xxxxxxxxx.de #33575] Resolved: FYI: xxxx xxxxxxx xxxxxxxxxxxx xxx +From: " via RT" <rt-xxx@xxxxxxx-xxxxxxxxxxxxxxxxx-xxxxxxxxx-xxxxxxxxx.de> +Reply-To: rt-xxx@xxxxxxx-xxxxxxxxxxxxxxxxx-xxxxxxxxx-xxxxxxxxx.de +References: <RT-Ticket-33575@xxxxxxx-xxxxxxxxxxxxxxxxx-xxxxxxxxx-xxxxxxxxx.de> +Message-ID: <rt-4.2.8-6644-1530017064-1465.33575-215-0@xxxxxxx-xxxxxxxxxxxxxxxxx-xxxxxxxxx-xxxxxxxxx.de> +To: g.zattler@xxxxxxx-xxxxxxxxx.de +Content-Type: text/plain; charset="utf-8" +Date: Tue, 26 Jun 2016 14:44:24 +0200 +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit + + + + +According to our records, your request has been resolved. If you have any +further questions or concerns, please respond to this message. + diff --git a/test/corpora/threading/ghost-root/child b/test/corpora/threading/ghost-root/child new file mode 100644 index 00000000..4c36af95 --- /dev/null +++ b/test/corpora/threading/ghost-root/child @@ -0,0 +1,9 @@ +From: Alice <alice@example.org> +To: Daniel <daniel@example.org> +Subject: child message +Message-ID: <001-child@example.org> +In-Reply-To: <000-real-root@example.org> +References: <000-real-root@example.org> +Date: Fri, 17 Jun 2016 22:14:41 -0400 + + diff --git a/test/corpora/threading/ghost-root/fake-root b/test/corpora/threading/ghost-root/fake-root new file mode 100644 index 00000000..a698185d --- /dev/null +++ b/test/corpora/threading/ghost-root/fake-root @@ -0,0 +1,9 @@ +From: Mallory <mallory@example.org> +To: Daniel <daniel@example.org> +Subject: fake root message +Message-ID: <001-fake-message-root@example.org> +In-Reply-to: <nonexistent-message@example.org> +References: <000-real-root@example.org> <001-child@example.org> <nonexistent-message@example.org> +Date: Thu, 16 Jun 2016 22:14:41 -0400 + +This message has an in-reply-to pointing to a non-existent message diff --git a/test/corpora/threading/ghost-root/grand-child b/test/corpora/threading/ghost-root/grand-child new file mode 100644 index 00000000..5f77ac36 --- /dev/null +++ b/test/corpora/threading/ghost-root/grand-child @@ -0,0 +1,9 @@ +From: Alice <alice@example.org> +To: Daniel <daniel@example.org> +Subject: grand-child message +Message-ID: <001-grand-child@example.org> +In-Reply-To: <001-child@example.org> +References: <000-real-root@example.org> <001-child@example.org> +Date: Fri, 17 Jun 2016 22:24:41 -0400 + + diff --git a/test/corpora/threading/ghost-root/grand-child2 b/test/corpora/threading/ghost-root/grand-child2 new file mode 100644 index 00000000..59682a95 --- /dev/null +++ b/test/corpora/threading/ghost-root/grand-child2 @@ -0,0 +1,9 @@ +From: Daniel <daniel@example.org> +To: Alice <alice@example.org> +Subject: grand-child message 2 +Message-ID: <001-grand-child2@example.org> +In-Reply-To: <001-child@example.org> +References: <000-real-root@example.org> <001-child@example.org> +Date: Fri, 17 Jun 2016 22:34:41 -0400 + + diff --git a/test/corpora/threading/ghost-root/great-grand-child b/test/corpora/threading/ghost-root/great-grand-child new file mode 100644 index 00000000..287a8954 --- /dev/null +++ b/test/corpora/threading/ghost-root/great-grand-child @@ -0,0 +1,9 @@ +From: Alice <alice@example.org> +To: Daniel <daniel@example.org> +Subject: great grand-child message +Message-ID: <001-great-grand-child@example.org> +In-Reply-To: <001-grand-child@example.org> +References: <000-real-root@example.org> <001-grand-child@example.org> +Date: Fri, 17 Jun 2016 22:44:41 -0400 + + diff --git a/test/corpora/threading/ghost-root/real-root b/test/corpora/threading/ghost-root/real-root new file mode 100644 index 00000000..f1b16a0c --- /dev/null +++ b/test/corpora/threading/ghost-root/real-root @@ -0,0 +1,7 @@ +From: Alice <alice@example.org> +To: Daniel <daniel@example.org> +Subject: root message +Message-ID: <000-real-root@example.org> +Date: Thu, 16 Jun 2016 22:14:41 -0400 + +This message has no in-reply-to diff --git a/test/corpora/threading/parent-priority/cur/child b/test/corpora/threading/parent-priority/cur/child new file mode 100644 index 00000000..23ee6495 --- /dev/null +++ b/test/corpora/threading/parent-priority/cur/child @@ -0,0 +1,11 @@ +From: Alice <alice@example.org> +To: Daniel <daniel@example.org> +Subject: child message +Message-ID: <B01-child@example.org> +In-Reply-To: <B00-root@example.org> +References: <B00--root@example.org> +Date: Fri, 17 Jun 2016 22:14:41 -0400 + +This is a normal-ish reply, and has both a references header and an +in-reply-to header. + diff --git a/test/corpora/threading/parent-priority/cur/grand-child b/test/corpora/threading/parent-priority/cur/grand-child new file mode 100644 index 00000000..028371d4 --- /dev/null +++ b/test/corpora/threading/parent-priority/cur/grand-child @@ -0,0 +1,10 @@ +From: Alice <alice@example.org> +To: Daniel <daniel@example.org> +Subject: grand-child message +Message-ID: <B01-grand-child@example.org> +In-Reply-To: <B01-child@example.org> +References: <B01-child@example.org> <B00-root@example.org> +Date: Fri, 17 Jun 2016 22:24:41 -0400 + +This has the references headers in the wrong order, with oldest first. +Debbugs does this. diff --git a/test/corpora/threading/parent-priority/cur/root b/test/corpora/threading/parent-priority/cur/root new file mode 100644 index 00000000..3990843d --- /dev/null +++ b/test/corpora/threading/parent-priority/cur/root @@ -0,0 +1,7 @@ +From: Alice <alice@example.org> +To: Daniel <daniel@example.org> +Subject: root message +Message-ID: <B00-root@example.org> +Date: Thu, 16 Jun 2016 22:14:41 -0400 + +This message has no reply-to |