From owner-svn-src-head@FreeBSD.ORG  Mon Jun  9 09:10:32 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5C481B31;
 Mon,  9 Jun 2014 09:10:32 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4A3212EAF;
 Mon,  9 Jun 2014 09:10:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s599AWIj092761;
 Mon, 9 Jun 2014 09:10:32 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s599AW6A092760;
 Mon, 9 Jun 2014 09:10:32 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201406090910.s599AW6A092760@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Mon, 9 Jun 2014 09:10:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r267264 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Jun 2014 09:10:32 -0000

Author: kib
Date: Mon Jun  9 09:10:31 2014
New Revision: 267264
URL: http://svnweb.freebsd.org/changeset/base/267264

Log:
  Devolatile as needed.
  
  Sponsored by:	The FreeBSD Foundation
  MFC after:	13 days

Modified:
  head/sys/kern/vfs_bio.c

Modified: head/sys/kern/vfs_bio.c
==============================================================================
--- head/sys/kern/vfs_bio.c	Mon Jun  9 07:21:42 2014	(r267263)
+++ head/sys/kern/vfs_bio.c	Mon Jun  9 09:10:31 2014	(r267264)
@@ -476,7 +476,7 @@ bufspacewakeup(void)
 			break;
 	}
 	if (need_wakeup)
-		wakeup((void *)&needsbuffer);
+		wakeup(__DEVOLATILE(void *, &needsbuffer));
 	rw_runlock(&nblock);
 }
 
@@ -559,7 +559,7 @@ bufcountadd(struct buf *bp)
 			break;
 	}
 	if (need_wakeup)
-		wakeup((void *)&needsbuffer);
+		wakeup(__DEVOLATILE(void *, &needsbuffer));
 	rw_runlock(&nblock);
 }
 
@@ -2142,8 +2142,8 @@ getnewbuf_bufd_help(struct vnode *vp, in
 			if ((needsbuffer & flags) == 0)
 				break;
 		}
-		error = rw_sleep((void *)&needsbuffer, &nblock, (PRIBIO + 4) |
-		    slpflag, waitmsg, slptimeo);
+		error = rw_sleep(__DEVOLATILE(void *, &needsbuffer), &nblock,
+		    (PRIBIO + 4) | slpflag, waitmsg, slptimeo);
 		if (error != 0)
 			break;
 	}