Merge branch 'we21-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...

[linux-2.6] / fs / gfs2 / acl.c

diff --git a/fs/gfs2/acl.c b/fs/gfs2/acl.c
index 60c98c0314a1801ec58a04caef38c6324ba17d91..5f959b8ce4065dae9e240c3db24eb52f8ec3f589 100644 (file)
--- a/fs/gfs2/acl.c
+++ b/fs/gfs2/acl.c
@@ -15,9 +15,9 @@
 #include <linux/posix_acl.h>
 #include <linux/posix_acl_xattr.h>
 #include <linux/gfs2_ondisk.h>
+#include <linux/lm_interface.h>
 
 #include "gfs2.h"
-#include "lm_interface.h"
 #include "incore.h"
 #include "acl.h"
 #include "eaops.h"
@@ -65,9 +65,8 @@ int gfs2_acl_validate_set(struct gfs2_inode *ip, int access,
                        error = 0;
        }
 
- out:
+out:
        posix_acl_release(acl);
-
        return error;
 }
 
@@ -132,18 +131,16 @@ static int acl_get(struct gfs2_inode *ip, int access, struct posix_acl **acl,
                        error = PTR_ERR(*acl);
        }
 
- out_kfree:
+out_kfree:
        if (error || !data)
                kfree(er.er_data);
        else {
                *data = er.er_data;
                *len = er.er_data_len;
        }
-
- out:
+out:
        if (error || el == &el_this)
                brelse(el->el_bh);
-
        return error;
 }
 
@@ -184,7 +181,7 @@ int gfs2_check_acl(struct inode *inode, int mask)
                error = gfs2_check_acl_locked(inode, mask);
                gfs2_glock_dq_uninit(&i_gh);
        }
-       
+
        return error;
 }
 
@@ -270,7 +267,7 @@ int gfs2_acl_create(struct gfs2_inode *dip, struct gfs2_inode *ip)
        } else
                munge_mode(ip, mode);
 
- out:
+out:
        posix_acl_release(acl);
        kfree(er.er_data);
        return error;
@@ -303,11 +300,10 @@ int gfs2_acl_chmod(struct gfs2_inode *ip, struct iattr *attr)
                error = gfs2_ea_acl_chmod(ip, &el, attr, data);
        }
 
- out:
+out:
        posix_acl_release(acl);
        brelse(el.el_bh);
        kfree(data);
-
        return error;
 }