summaryrefslogtreecommitdiffstats
path: root/fs/gfs2/acl.c
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-09-04 12:04:26 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-09-04 12:04:26 -0400
commita91ea69ffd3f8a0b7139bfd44042ab384461e631 (patch)
treef05952e49e01609b21dbe8d27d9ffd30b4aa507f /fs/gfs2/acl.c
parent75d3b817a0b48425da921052955cc58f20bbab52 (diff)
downloadlinux-a91ea69ffd3f8a0b7139bfd44042ab384461e631.tar.bz2
[GFS2] Align all labels against LH side
This makes everything consistent. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/acl.c')
-rw-r--r--fs/gfs2/acl.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/fs/gfs2/acl.c b/fs/gfs2/acl.c
index 60c98c0314a1..d846b5ad1d87 100644
--- a/fs/gfs2/acl.c
+++ b/fs/gfs2/acl.c
@@ -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;
}
@@ -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;
}