From mboxrd@z Thu Jan  1 00:00:00 1970
From: roel <12o3l@tiscali.nl>
Subject: Re: [PATCH 11/25] Unionfs: add un/likely conditionals on debug ops
Date: Wed, 26 Sep 2007 23:34:26 +0200
Message-ID: <46FAD062.4060009@tiscali.nl>
References: <11907762042481-git-send-email-ezk@cs.sunysb.edu> <11907762093651-git-send-email-ezk@cs.sunysb.edu>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org,
	linux-fsdevel@vger.kernel.org, viro@ftp.linux.org.uk,
	hch@infradead.org
To: Erez Zadok <ezk@cs.sunysb.edu>
Return-path: <linux-kernel-owner+glk-linux-kernel-3=40m.gmane.org-S1762268AbXIZVeq@vger.kernel.org>
In-Reply-To: <11907762093651-git-send-email-ezk@cs.sunysb.edu>
Sender: linux-kernel-owner@vger.kernel.org
List-Id: linux-fsdevel.vger.kernel.org

Erez Zadok wrote:
> Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
> ---
>  fs/unionfs/debug.c |  108 +++++++++++++++++++++++++++------------------------
>  1 files changed, 57 insertions(+), 51 deletions(-)
> 
> diff --git a/fs/unionfs/debug.c b/fs/unionfs/debug.c
> index 9546a41..09b52ce 100644
> --- a/fs/unionfs/debug.c
> +++ b/fs/unionfs/debug.c
> @@ -56,19 +56,19 @@ void __unionfs_check_inode(const struct inode *inode,
>  	sb = inode->i_sb;
>  	istart = ibstart(inode);
>  	iend = ibend(inode);
> -	if (istart > iend) {
> +	if (unlikely(istart > iend)) {
>  		PRINT_CALLER(fname, fxn, line);
>  		printk(" Ci0: inode=%p istart/end=%d:%d\n",
>  		       inode, istart, iend);
>  	}
> -	if ((istart == -1 && iend != -1) ||
> -	    (istart != -1 && iend == -1)) {
> +	if (unlikely((istart == -1 && iend != -1) ||
> +		     (istart != -1 && iend == -1))) {

you could also do
	if (unlikely((istart == -1 || iend == -1) && istart != iend)) {
	
[...]

> @@ -138,8 +139,8 @@ void __unionfs_check_dentry(const struct dentry *dentry,
>  	dend = dbend(dentry);
>  	BUG_ON(dstart > dend);
>  
> -	if ((dstart == -1 && dend != -1) ||
> -	    (dstart != -1 && dend == -1)) {
> +	if (unlikely((dstart == -1 && dend != -1) ||
> +		     (dstart != -1 && dend == -1))) {

[...]

the same here

> @@ -223,30 +224,30 @@ void __unionfs_check_dentry(const struct dentry *dentry,
>  	istart = ibstart(inode);
>  	iend = ibend(inode);
>  	BUG_ON(istart > iend);
> -	if ((istart == -1 && iend != -1) ||
> -	    (istart != -1 && iend == -1)) {
> +	if (unlikely((istart == -1 && iend != -1) ||
> +		     (istart != -1 && iend == -1))) {

and here

[...]

> @@ -350,30 +354,30 @@ void __unionfs_check_file(const struct file *file,
>  	fend = fbend(file);
>  	BUG_ON(fstart > fend);
>  
> -	if ((fstart == -1 && fend != -1) ||
> -	    (fstart != -1 && fend == -1)) {
> +	if (unlikely((fstart == -1 && fend != -1) ||
> +		     (fstart != -1 && fend == -1))) {

and here

[...]