linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "J. Bruce Fields" <bfields@fieldses.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-nfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
	linux-kernel@vger.kernel.org, Al Viro <viro@zeniv.linux.org.uk>
Subject: Re: nfsd changes for 3.5
Date: Thu, 31 May 2012 20:56:03 -0400	[thread overview]
Message-ID: <20120601005603.GA28542@fieldses.org> (raw)
In-Reply-To: <CA+55aFxY+WJmMu=1Wvdh24kK0JWEuQ1vwcqZdaNDbp1_wUsZ4A@mail.gmail.com>

On Thu, May 31, 2012 at 03:14:57PM -0700, Linus Torvalds wrote:
> On Thu, May 31, 2012 at 1:53 PM, J. Bruce Fields <bfields@fieldses.org> wrote:
> > On Thu, May 31, 2012 at 01:17:26PM -0700, Linus Torvalds wrote:
> >
> > Uh, that means ditching some work in my public git tree.  Which I
> > haven't rebased in years.  So, a stupid process question; would you
> > rather I:
> >
> >        - continue to be strict about rebasing and apply a bunch of
> >          reverts?
> >        - ditch it and start over?
> 
> I think in this case rebasing is the right thing to do.
> 
> I hate rebasing, but what I hate about it is how people who use it as
> a development model cause problems for anybody else. I don't think it
> will cause problems in this particular case, but if somebody hollers,
> let me know.

OK, will do.

For now, would you mind pulling this?:

	git://linux-nfs.org/~bfields/linux.git for-3.5-take-2

It's literally just the previous tree cut off before the delegation
stuff--so it's been in -next for a month, etc.

--b.

Jeff Layton (3):
      nfsd: trivial: remove unused variable from nfsd4_lock
      nfsd: don't use locks_in_grace to determine whether to call nfs4_grace_end
      nfsd: trivial: use SEEK_SET instead of 0 in vfs_llseek

Simo Sorce (2):
      svcauth: remove unused define
      SUNRPC: split upcall function to extract reusable parts

Stanislav Kinsbursky (18):
      nfsd: use passed cache_detail pointer expkey_parse()
      nfsd: add link to owner cache detail to svc_export structure
      nfsd: use cache detail pointer from svc_export structure on cache put
      nfsd: use exp_put() for svc_export_cache put
      nfsd: pass svc_export_cache pointer as private data to "exports" seq file ops
      nfsd: use hash table from cache detail in nfsd export seq ops
      nfsd: pass pointer to expkey cache down to stack wherever possible.
      NFSd: remove hard-coded dereferences to name-to-id and id-to-name caches
      Lockd: pass network namespace to creation and destruction routines
      nfsd: pass network context to export caches init/shutdown routines
      nfsd: pass pointer to export cache down to stack wherever possible.
      nfsd: make export cache allocated per network namespace context
      nfsd: make expkey cache allocated per network namespace context
      nfsd: allocate export and expkey caches in per-net operations.
      nfsd: pass network context to idmap init/exit functions
      nfsd: make id-to-name cache allocated per network namespace context
      nfsd: make name-to-id cache allocated per network namespace context
      nfsd: allocate id-to-name and name-to-id caches in per-net operations.

 fs/lockd/clntlock.c               |   13 +--
 fs/lockd/svc.c                    |    7 +-
 fs/nfsd/export.c                  |  175 ++++++++++++++++++++++---------------
 fs/nfsd/idmap.h                   |    8 +-
 fs/nfsd/netns.h                   |    6 ++
 fs/nfsd/nfs4idmap.c               |  109 +++++++++++++----------
 fs/nfsd/nfs4state.c               |   13 ++-
 fs/nfsd/nfsctl.c                  |   55 ++++++++----
 fs/nfsd/nfsfh.c                   |    2 +-
 fs/nfsd/nfssvc.c                  |    8 +-
 fs/nfsd/vfs.c                     |    2 +-
 include/linux/lockd/bind.h        |    4 +-
 include/linux/nfsd/export.h       |   13 ++-
 include/linux/sunrpc/svcauth.h    |    3 +-
 net/sunrpc/auth_gss/svcauth_gss.c |  100 +++++++++++++--------
 net/sunrpc/svcauth_unix.c         |   13 +--
 16 files changed, 322 insertions(+), 209 deletions(-)

  reply	other threads:[~2012-06-01  0:56 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-31 18:24 nfsd changes for 3.5 J. Bruce Fields
     [not found] ` <20120531182457.GB25955-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
2012-05-31 18:58   ` Linus Torvalds
     [not found]     ` <CA+55aFwGpVM2Dbe02gL5=cGJZ_t3b4PTAhqwrs5MHjsb5R6BaA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-05-31 20:01       ` J. Bruce Fields
     [not found]         ` <20120531200138.GD25955-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
2012-05-31 20:17           ` Linus Torvalds
2012-05-31 20:53             ` J. Bruce Fields
2012-05-31 22:14               ` Linus Torvalds
2012-06-01  0:56                 ` J. Bruce Fields [this message]
2012-06-01 11:17                   ` J. Bruce Fields

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120601005603.GA28542@fieldses.org \
    --to=bfields@fieldses.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nfs@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    --cc=viro@zeniv.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).