GIT: unionfs2-2.6.18.y: Unionfs: add un/likely conditionals on xattr ops

[Erez_Zadok]

commit 3ace11c932e840fce81ca598b1610b2c761ddfe3
Author: Erez Zadok <[EMAIL PROTECTED]>
Date:   Mon Sep 24 01:09:14 2007 -0400

    Unionfs: add un/likely conditionals on xattr ops
    
    Signed-off-by: Erez Zadok <[EMAIL PROTECTED]>

diff --git a/fs/unionfs/xattr.c b/fs/unionfs/xattr.c
index dcf17c2..3d34bb5 100644
--- a/fs/unionfs/xattr.c
+++ b/fs/unionfs/xattr.c
@@ -25,14 +25,14 @@ void *unionfs_xattr_alloc(size_t size, size_t limit)
 {
        void *ptr;
 
-       if (size > limit)
+       if (unlikely(size > limit))
                return ERR_PTR(-E2BIG);
 
-       if (!size)              /* size request, no buffer is needed */
+       if (unlikely(!size))    /* size request, no buffer is needed */
                return NULL;
 
        ptr = kmalloc(size, GFP_KERNEL);
-       if (!ptr)
+       if (unlikely(!ptr))
                return ERR_PTR(-ENOMEM);
        return ptr;
 }
@@ -50,7 +50,7 @@ ssize_t unionfs_getxattr(struct dentry *dentry, const char 
*name, void *value,
        unionfs_read_lock(dentry->d_sb);
        unionfs_lock_dentry(dentry);
 
-       if (!__unionfs_d_revalidate_chain(dentry, NULL, false)) {
+       if (unlikely(!__unionfs_d_revalidate_chain(dentry, NULL, false))) {
                err = -ESTALE;
                goto out;
        }
@@ -79,7 +79,7 @@ int unionfs_setxattr(struct dentry *dentry, const char *name,
        unionfs_read_lock(dentry->d_sb);
        unionfs_lock_dentry(dentry);
 
-       if (!__unionfs_d_revalidate_chain(dentry, NULL, false)) {
+       if (unlikely(!__unionfs_d_revalidate_chain(dentry, NULL, false))) {
                err = -ESTALE;
                goto out;
        }
@@ -108,7 +108,7 @@ int unionfs_removexattr(struct dentry *dentry, const char 
*name)
        unionfs_read_lock(dentry->d_sb);
        unionfs_lock_dentry(dentry);
 
-       if (!__unionfs_d_revalidate_chain(dentry, NULL, false)) {
+       if (unlikely(!__unionfs_d_revalidate_chain(dentry, NULL, false))) {
                err = -ESTALE;
                goto out;
        }
@@ -137,7 +137,7 @@ ssize_t unionfs_listxattr(struct dentry *dentry, char 
*list, size_t size)
        unionfs_read_lock(dentry->d_sb);
        unionfs_lock_dentry(dentry);
 
-       if (!__unionfs_d_revalidate_chain(dentry, NULL, false)) {
+       if (unlikely(!__unionfs_d_revalidate_chain(dentry, NULL, false))) {
                err = -ESTALE;
                goto out;
        }
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
unionfs-cvs@mail.fsl.cs.sunysb.edu
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs