From owner-svn-src-projects@FreeBSD.ORG  Thu Oct 14 01:45:49 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F32841065673;
	Thu, 14 Oct 2010 01:45:49 +0000 (UTC)
	(envelope-from jeff@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E2D2A8FC17;
	Thu, 14 Oct 2010 01:45:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9E1jnVA008327;
	Thu, 14 Oct 2010 01:45:49 GMT (envelope-from jeff@svn.freebsd.org)
Received: (from jeff@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9E1jnhf008325;
	Thu, 14 Oct 2010 01:45:49 GMT (envelope-from jeff@svn.freebsd.org)
Message-Id: <201010140145.o9E1jnhf008325@svn.freebsd.org>
From: Jeff Roberson <jeff@FreeBSD.org>
Date: Thu, 14 Oct 2010 01:45:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213818 - projects/ofed/head/sys/ofed/include/linux
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Oct 2010 01:45:50 -0000

Author: jeff
Date: Thu Oct 14 01:45:49 2010
New Revision: 213818
URL: http://svn.freebsd.org/changeset/base/213818

Log:
   - Add an implementation of rb_replace_node()
  
  Sponsored by:	Isilon Systems, iX Systems, and Panasas.

Modified:
  projects/ofed/head/sys/ofed/include/linux/rbtree.h

Modified: projects/ofed/head/sys/ofed/include/linux/rbtree.h
==============================================================================
--- projects/ofed/head/sys/ofed/include/linux/rbtree.h	Thu Oct 14 01:21:44 2010	(r213817)
+++ projects/ofed/head/sys/ofed/include/linux/rbtree.h	Thu Oct 14 01:45:49 2010	(r213818)
@@ -84,6 +84,27 @@ rb_link_node(struct rb_node *node, struc
 	*rb_link = node;
 }
 
+static inline void
+rb_replace_node(struct rb_node *victim, struct rb_node *new,
+    struct rb_root *root)
+{
+	struct rb_node *p;
+
+	p = rb_parent(victim);
+	if (p) {
+		if (p->rb_left == victim)
+			p->rb_left = new;
+		else
+			p->rb_right = new;
+	} else
+		root->rb_node = new;
+	if (victim->rb_left)
+		rb_set_parent(victim->rb_left, new);
+	if (victim->rb_right)
+		rb_set_parent(victim->rb_right, new);
+	*new = *victim;
+}
+
 #undef RB_ROOT
 #define RB_ROOT		(struct rb_root) { NULL }