Re: [PATCH 11/25] Unionfs: add un/likely conditionals on debug ops

[roel <12o3l@tiscali.nl>]

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

[...]
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/