[GIT PULL] Please pull NFS client bugfixes for Linux 3.4...

[GIT PULL] Please pull NFS client bugfixes for Linux 3.4...

[Myklebust, Trond]

[-- Attachment #1: Type: text/plain, Size: 3724 bytes --]

Hi Linus,

Please pull from the signed tag "nfs-for-3.4-2" in the repository at

   git pull git://git.linux-nfs.org/projects/trondmy/linux-nfs.git tag nfs-for-3.4-2

This will update the following files through the appended changesets.

  Cheers,
    Trond

----
 fs/nfs/nfs4filelayout.c |    1 -
 fs/nfs/nfs4proc.c       |   43 +++++++++++++++++++++++--------------------
 net/sunrpc/rpcb_clnt.c  |    2 +-
 3 files changed, 24 insertions(+), 22 deletions(-)

commit 14977489ffdb80d4caf5a184ba41b23b02fbacd9
Author: Trond Myklebust <Trond.Myklebust@netapp.com>
Date:   Tue Mar 27 18:31:25 2012 -0400

    NFSv4: Minor cleanups for nfs4_handle_exception and nfs4_async_handle_error
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit e59d27e05a6435f8c04d5ad843f37fa795f2eaaa
Author: Trond Myklebust <Trond.Myklebust@netapp.com>
Date:   Tue Mar 27 18:22:19 2012 -0400

    NFSv4.1: Fix layoutcommit error handling
    
    Firstly, task->tk_status will always return negative error values,
    so the current tests for 'NFS4ERR_DELEG_REVOKED' etc. are all being
    ignored.
    Secondly, clean up the code so that we only need to test
    task->tk_status once!
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Cc: stable@vger.kernel.org

commit 05e9cfb408b24debb3a85fd98edbfd09dd148881
Author: Trond Myklebust <Trond.Myklebust@netapp.com>
Date:   Tue Mar 27 18:13:02 2012 -0400

    NFSv4: Fix two infinite loops in the mount code
    
    We can currently loop forever in nfs4_lookup_root() and in
    nfs41_proc_secinfo_no_name(), if the first iteration returns a
    NFS4ERR_DELAY or something else that causes exception.retry to get
    set.
    
    Reported-by: Weston Andros Adamson <dros@netapp.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Cc: stable@vger.kernel.org

commit 864cf9bf99f62d2095c8e6cc3a87af80b263984e
Author: Bryan Schumaker <bjschuma@netapp.com>
Date:   Tue Mar 27 13:46:32 2012 -0400

    SUNRPC: Use the already looked-up xprt in rpcb_getport_async()
    
    rbcb_getport_async() was looking up the rpc_xprt (reference++) and then
    later looking it up again (reference++) to pass through the
    rpcbind_args.  The xprt would only be dereferenced once, when we were
    done with the rpcbind_args (reference--).  This leaves an extra
    reference to the transport that would never go away.
    
    Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit d44fc387997c0750125cfb0c2c803a3171b649f4
Author: Fred Isaman <iisaman@netapp.com>
Date:   Thu Mar 22 01:39:34 2012 -0400

    NFS4.1: remove duplicate variable declaration in filelayout_clear_request_commit
    
    inode is declared twice for no good reason
    
    Signed-off-by: Fred Isaman <iisaman@netapp.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit 20e0fa98b751facf9a1101edaefbc19c82616a68
Author: Sachin Prabhu <sprabhu@redhat.com>
Date:   Thu Mar 22 16:46:28 2012 +0000

    Fix length of buffer copied in __nfs4_get_acl_uncached
    
    _copy_from_pages() used to copy data from the temporary buffer to the
    user passed buffer is passed the wrong size parameter when copying
    data. res.acl_len contains both the bitmap and acl lenghts while
    acl_len contains the acl length after adjusting for the bitmap size.
    
    Signed-off-by: Sachin Prabhu <sprabhu@redhat.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>


-- 
Trond Myklebust
Linux NFS client maintainer

NetApp
Trond.Myklebust@netapp.com
www.netapp.com


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [GIT PULL] Please pull NFS client bugfixes for Linux 3.4...

[Linus Torvalds]

On Wed, Mar 28, 2012 at 6:59 PM, Myklebust, Trond
<Trond.Myklebust@netapp.com> wrote:
>
> Please pull from the signed tag "nfs-for-3.4-2" in the repository at
>
>   git pull git://git.linux-nfs.org/projects/trondmy/linux-nfs.git tag nfs-for-3.4-2

Btw, please change your pull request to say "tag/nfs-for-3.4-2"
instead of "tag nfs-for-3.4-2".

Both work, but there's a subtle difference: the "pull tag xyz" is
basically asking me to not just pull, but also add the tag to my set
of tags, which I'm not interested in. In contrast "pull tag/xyz" asks
me to just pull the tag contents.

Anyway, pulled.

                    Linus

Re: [GIT PULL] Please pull NFS client bugfixes for Linux 3.4...

[Myklebust, Trond]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 1034 bytes --]

On Wed, 2012-03-28 at 19:06 -0700, Linus Torvalds wrote:
> On Wed, Mar 28, 2012 at 6:59 PM, Myklebust, Trond
> <Trond.Myklebust@netapp.com> wrote:
> >
> > Please pull from the signed tag "nfs-for-3.4-2" in the repository at
> >
> >   git pull git://git.linux-nfs.org/projects/trondmy/linux-nfs.git tag nfs-for-3.4-2
> 
> Btw, please change your pull request to say "tag/nfs-for-3.4-2"
> instead of "tag nfs-for-3.4-2".
> 
> Both work, but there's a subtle difference: the "pull tag xyz" is
> basically asking me to not just pull, but also add the tag to my set
> of tags, which I'm not interested in. In contrast "pull tag/xyz" asks
> me to just pull the tag contents.

Sure thing... I wasn't aware of that semantic difference, but I'm quite
happy to add it to my script...

-- 
Trond Myklebust
Linux NFS client maintainer

NetApp
Trond.Myklebust@netapp.com
www.netapp.com

ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥

Re: [GIT PULL] Please pull NFS client bugfixes for Linux 3.4...

[Linus Torvalds]

On Wed, Mar 28, 2012 at 7:08 PM, Myklebust, Trond
<Trond.Myklebust@netapp.com> wrote:
>
> Sure thing... I wasn't aware of that semantic difference, but I'm quite
> happy to add it to my script...

Thanks. And I noticed that it's supposed to be "tags/xyz" with a "s".

Of course, you might as well just say "xyz" without mentioning the
tag[s] part at all, unless you have a branch with the same name and
want to explicitly disambiguate.

                   Linus

Re: [GIT PULL] Please pull NFS client bugfixes for Linux 3.4...

[Myklebust, Trond]

[-- Attachment #1: Type: text/plain, Size: 1006 bytes --]

On Wed, 2012-03-28 at 19:20 -0700, Linus Torvalds wrote:
> On Wed, Mar 28, 2012 at 7:08 PM, Myklebust, Trond
> <Trond.Myklebust@netapp.com> wrote:
> >
> > Sure thing... I wasn't aware of that semantic difference, but I'm quite
> > happy to add it to my script...
> 
> Thanks. And I noticed that it's supposed to be "tags/xyz" with a "s".
> 
> Of course, you might as well just say "xyz" without mentioning the
> tag[s] part at all, unless you have a branch with the same name and
> want to explicitly disambiguate.
> 
>                    Linus

The reason for adding the 'tags' label originally was precisely because
I had an identically named branch, and I wanted to be able to send you
the signed tag instead.

I've attached the script that I use to generate pull requests just in
case someone else doesn't have their own version. It should be fairly
obvious to modify...

-- 
Trond Myklebust
Linux NFS client maintainer

NetApp
Trond.Myklebust@netapp.com
www.netapp.com


[-- Attachment #2: git_make_linus_mail.sh --]
[-- Type: application/x-shellscript, Size: 2687 bytes --]

Re: [GIT PULL] Please pull NFS client bugfixes for Linux 3.4...

[Boaz Harrosh]

On 03/28/2012 07:28 PM, Myklebust, Trond wrote:

> On Wed, 2012-03-28 at 19:20 -0700, Linus Torvalds wrote:
>> On Wed, Mar 28, 2012 at 7:08 PM, Myklebust, Trond
>> <Trond.Myklebust@netapp.com> wrote:
>>>
>>> Sure thing... I wasn't aware of that semantic difference, but I'm quite
>>> happy to add it to my script...
>>
>> Thanks. And I noticed that it's supposed to be "tags/xyz" with a "s".
>>
>> Of course, you might as well just say "xyz" without mentioning the
>> tag[s] part at all, unless you have a branch with the same name and
>> want to explicitly disambiguate.
>>
>>                    Linus
> 
> The reason for adding the 'tags' label originally was precisely because
> I had an identically named branch, and I wanted to be able to send you
> the signed tag instead.
> 
> I've attached the script that I use to generate pull requests just in
> case someone else doesn't have their own version. It should be fairly
> obvious to modify...
> 



That's funny after my 20th time of running the command by hand and
doing a "man git-request-pull" because I can never remember the order
of things, and I always get the URL wrong 3 times, I decided I should write
a script, boom here it is sent on the mailing list.

Thank you Trond for sharing, here is a new user
Boaz

Re: [GIT PULL] Please pull NFS client bugfixes for Linux 3.4...

[Linus Torvalds]

On Wed, Mar 28, 2012 at 8:17 PM, Boaz Harrosh <bharrosh@panasas.com> wrote:
>
> Thank you Trond for sharing, here is a new user

Oh, *please* use git pull-request instead. It does a lot of things
much better, including the diffstat/shortlog and the tag message, none
of which Trond's does.

                      Linus

Re: [GIT PULL] Please pull NFS client bugfixes for Linux 3.4...

[Myklebust, Trond]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 1920 bytes --]

On Wed, 2012-03-28 at 20:44 -0700, Linus Torvalds wrote:
> On Wed, Mar 28, 2012 at 8:17 PM, Boaz Harrosh <bharrosh@panasas.com> wrote:
> >
> > Thank you Trond for sharing, here is a new user
> 
> Oh, *please* use git pull-request instead. It does a lot of things
> much better, including the diffstat/shortlog and the tag message, none
> of which Trond's does.
> 
>                       Linus

Maybe I'm running an older version of git (Fedora 16 latest update), but
when I do

git request-pull v3.3 git://git.linux-nfs.org/projects/trondmy/linux-nfs.git nfs-for-3.4-1

I get:

                The following changes since commit c16fa4f2ad19908a47c63d8fa436a1178438c7e7:
                
                  Linux 3.3 (2012-03-18 16:15:34 -0700)
                
                are available in the git repository at:
                  git://git.linux-nfs.org/projects/trondmy/linux-nfs.git ..BRANCH.NOT.VERIFIED..
                
                Andy Adamson (4):
                      SUNRPC: add sending,pending queue and max slot to xprt stats
                      NFSv4.1 set highest_used_slotid to NFS4_NO_SLOT
                      NFSv4.1 handle DS stateid errors
                      NFSv4.1 cleanup DS stateid error handling
                
                ....
                lots of shortlog stuff followed by the diffstat.
                ....

and that's all...


I'm pretty sure that a request to pull from "..BRANCH.NOT.VERIFIED.."
would piss you off, which is why I'll stick to my script for now. It
already has a '-s' option to give you the shortlog, and it will give you
the diffstat by default. All it is missing is the tag message...

-- 
Trond Myklebust
Linux NFS client maintainer

NetApp
Trond.Myklebust@netapp.com
www.netapp.com

ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥

Re: [GIT PULL] Please pull NFS client bugfixes for Linux 3.4...

[Linus Torvalds]

On Wed, Mar 28, 2012 at 9:08 PM, Myklebust, Trond
<Trond.Myklebust@netapp.com> wrote:
>
> Maybe I'm running an older version of git (Fedora 16 latest update), but
> when I do

Yeah, you need git 1.7.9 to get the tag content support.

With older git versions, spell out "tags/xyz" instead of just "xyz",
and it will all work, but it still won't actually show the tag
content.

                        Linus

Re: [GIT PULL] Please pull NFS client bugfixes for Linux 3.4...

[Myklebust, Trond]

On Mar 29, 2012, at 12:20 AM, Linus Torvalds wrote:

> On Wed, Mar 28, 2012 at 9:08 PM, Myklebust, Trond
> <Trond.Myklebust@netapp.com> wrote:
>> 
>> Maybe I'm running an older version of git (Fedora 16 latest update), but
>> when I do
> 
> Yeah, you need git 1.7.9 to get the tag content support.
> 
> With older git versions, spell out "tags/xyz" instead of just "xyz",
> and it will all work, but it still won't actually show the tag
> content.

When I do the tags/nfs-for-3.4-1, it still gives me that ..BRANCH.NOT.VERIFIED.. crap in the pull message.
Furthermore, it fails to actually push the tag to my upstream repository, meaning that I'm still prone to the 'Linus tried to pull, and the commit wasn't there" syndrome.

Could we perhaps set up a best practices webpage/wiki for this sort of thing with a pointer to that webpage in Documentations/SubmittingPatches? That way maintainers would have a source of information for which versions of 'git' that they need to use in order to provide you with the information that you want.

Cheers
  Trond

Re: [GIT PULL] Please pull NFS client bugfixes for Linux 3.4...

[Linus Torvalds]

On Wed, Mar 28, 2012 at 9:38 PM, Myklebust, Trond
<Trond.Myklebust@netapp.com> wrote:
>
> When I do the tags/nfs-for-3.4-1, it still gives me that ..BRANCH.NOT.VERIFIED.. crap in the pull message.

Hmm. Maybe it does end up only working for a branch in the pre-1.7.9
days. I haven't tested - I don't use old git versions.

> Furthermore, it fails to actually push the tag to my upstream repository, meaning that I'm still prone to the 'Linus tried to pull, and the commit wasn't there" syndrome.

Well, that's a separate issue. Yes, you obviously need to push first.

I would not object to you scripting the "push before pull request". I
just object to people using a script that is *worse* than what git
actually contains natively to actually generate the pull request.

> Could we perhaps set up a best practices webpage/wiki for this sort of thing with a pointer to that webpage in Documentations/SubmittingPatches? That way maintainers would have a source of information for which versions of 'git' that they need to use in order to provide you with the information that you want.

The nice signed tag understanding came in 1.7.9. But I actually
seriously suggest that all kernel developers use something even more
recent than that, since what changes in 1.7.10 (not released yet, but
the git 'master' branch is at rc3 now) is the extremely nice "make
people actually explain their merges" change.

There have been kernel developers that apparently never even noticed
that they were creating extraneous merges, so I really encourage
everybody to upgrade to current pre-1.7.10 git just so that you are
asked to write a nice merge message when you create a merge. That's
totally independent of the signed tag issue and the nice pull-request
format, though.

And it really is *trivial* to use a modern git instead of whatever
distro version you have. It's literally:

   git clone git://github.com/gitster/git
   cd git
   make
   make install

all as a *regular*user* (do not 'sudo make install'!). That installs
git in your own ~/bin directory, there's no fighting with whatever
distro git versions. No need to uninstall things or worry about
/usr/local or anything like that.

The git master branch is extremely stable, it's not very scary at all
to be up-to-date. And it's almost always better than whatever distro
version you have, and as seen above it really isn't hard to do. You
may need to install a few libraries, but git doesn't really even have
very complex dependencies. The two that might bite some people is the
need for the curl-devel and expat-devel packages.

(If you don't have any development environment at *all*, you need to
install gcc, make, zlib-devel, openssl-devel, and gettext, but those
tend to be in the development base, so you almost certainly already
have them)

Obviously you then need to have something like

    PATH="$(HOME)/bin:$PATH"

in your .bashrc to make sure that your own private binaries override
the system ones, but hey, that's just a good idea regardless if you
are a developer and ever want to use your own programs.

                      Linus