public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Steve Dickson <SteveD@redhat.com>
To: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
	linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org,
	Trond Myklebust <Trond.Myklebust@netapp.com>
Subject: Re: [git pull] vfs part 3 (write_inode mess)
Date: Mon, 08 Mar 2010 15:22:37 -0500	[thread overview]
Message-ID: <4B955C8D.6030907@RedHat.com> (raw)
In-Reply-To: <20100305174017.GX30031@ZenIV.linux.org.uk>

On 03/05/2010 12:40 PM, Al Viro wrote:
> On Fri, Mar 05, 2010 at 03:48:23PM +0000, Al Viro wrote:
>> I'm going to push the next VFS pile in about half an hour and get to the
>> write_inode situation.  I'm not sure what's the best course here.  Note
>> that since you've pulled it, you also have conflicts with what's in the
>> mainline.  I can do *another* backmerge (already had one due to gfs2 trivial
>> conflicts) and push the result.  Which will suck, since XFS conflicts
>> are not entirely trivial and we'll get a really ugly merge node, with
>> conflict resolution both hidden and not quite obvious.
> 
> OK, a backmerge it is.  Linus, could you please pull
> git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git/ write_inode
> or suggest a saner way to do that?
> 
> I've done backmerges of two points in mainline (trees that got merged
> into mainline, actually) that created conflicts.  So at that point it's
> (a) descendent of what's been pulled into NFS tree and (b) merges clean
> with mainline.  All for two patches (at commit 716c28c..) ;-/
> 
> It's independent from the previous VFS pull; there's more stuff, hopefully
> for later today, but the worst of the mess should be gone with that one.
Has there been any kind of testing that show this approach does indeed
improve performance? Any hardcore number? 

Just curious....

steved.


  reply	other threads:[~2010-03-08 20:22 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-05 15:26 Merge of the 'write_inode' branch from the VFS tree Trond Myklebust
2010-03-05 15:48 ` Al Viro
2010-03-05 17:40   ` [git pull] vfs part 3 (write_inode mess) Al Viro
2010-03-08 20:22     ` Steve Dickson [this message]
2010-03-09  8:52       ` Dave Chinner
2010-03-10 23:07       ` Trond Myklebust
2010-03-05 18:02   ` Merge of the 'write_inode' branch from the VFS tree Trond Myklebust
2010-03-05 18:29     ` Al Viro

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=4B955C8D.6030907@RedHat.com \
    --to=steved@redhat.com \
    --cc=Trond.Myklebust@netapp.com \
    --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