aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/reiserfs_acl.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-12 23:21:28 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-12 23:21:28 -0400
commitbd4c625c061c2a38568d0add3478f59172455159 (patch)
tree1c44a17c55bce2ee7ad5ea3d15a208ecc0955f74 /include/linux/reiserfs_acl.h
parent7fa94c8868edfef8cb6a201fcc9a5078b7b961da (diff)
reiserfs: run scripts/Lindent on reiserfs code
This was a pure indentation change, using: scripts/Lindent fs/reiserfs/*.c include/linux/reiserfs_*.h to make reiserfs match the regular Linux indentation style. As Jeff Mahoney <jeffm@suse.com> writes: The ReiserFS code is a mix of a number of different coding styles, sometimes different even from line-to-line. Since the code has been relatively stable for quite some time and there are few outstanding patches to be applied, it is time to reformat the code to conform to the Linux style standard outlined in Documentation/CodingStyle. This patch contains the result of running scripts/Lindent against fs/reiserfs/*.c and include/linux/reiserfs_*.h. There are places where the code can be made to look better, but I'd rather keep those patches separate so that there isn't a subtle by-hand hand accident in the middle of a huge patch. To be clear: This patch is reformatting *only*. A number of patches may follow that continue to make the code more consistent with the Linux coding style. Hans wasn't particularly enthusiastic about these patches, but said he wouldn't really oppose them either. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/reiserfs_acl.h')
-rw-r--r--include/linux/reiserfs_acl.h52
1 files changed, 25 insertions, 27 deletions
diff --git a/include/linux/reiserfs_acl.h b/include/linux/reiserfs_acl.h
index 0760507a545b..0a3605099c44 100644
--- a/include/linux/reiserfs_acl.h
+++ b/include/linux/reiserfs_acl.h
@@ -4,29 +4,29 @@
4#define REISERFS_ACL_VERSION 0x0001 4#define REISERFS_ACL_VERSION 0x0001
5 5
6typedef struct { 6typedef struct {
7 __le16 e_tag; 7 __le16 e_tag;
8 __le16 e_perm; 8 __le16 e_perm;
9 __le32 e_id; 9 __le32 e_id;
10} reiserfs_acl_entry; 10} reiserfs_acl_entry;
11 11
12typedef struct { 12typedef struct {
13 __le16 e_tag; 13 __le16 e_tag;
14 __le16 e_perm; 14 __le16 e_perm;
15} reiserfs_acl_entry_short; 15} reiserfs_acl_entry_short;
16 16
17typedef struct { 17typedef struct {
18 __le32 a_version; 18 __le32 a_version;
19} reiserfs_acl_header; 19} reiserfs_acl_header;
20 20
21static inline size_t reiserfs_acl_size(int count) 21static inline size_t reiserfs_acl_size(int count)
22{ 22{
23 if (count <= 4) { 23 if (count <= 4) {
24 return sizeof(reiserfs_acl_header) + 24 return sizeof(reiserfs_acl_header) +
25 count * sizeof(reiserfs_acl_entry_short); 25 count * sizeof(reiserfs_acl_entry_short);
26 } else { 26 } else {
27 return sizeof(reiserfs_acl_header) + 27 return sizeof(reiserfs_acl_header) +
28 4 * sizeof(reiserfs_acl_entry_short) + 28 4 * sizeof(reiserfs_acl_entry_short) +
29 (count - 4) * sizeof(reiserfs_acl_entry); 29 (count - 4) * sizeof(reiserfs_acl_entry);
30 } 30 }
31} 31}
32 32
@@ -46,14 +46,14 @@ static inline int reiserfs_acl_count(size_t size)
46 } 46 }
47} 47}
48 48
49
50#ifdef CONFIG_REISERFS_FS_POSIX_ACL 49#ifdef CONFIG_REISERFS_FS_POSIX_ACL
51struct posix_acl * reiserfs_get_acl(struct inode *inode, int type); 50struct posix_acl *reiserfs_get_acl(struct inode *inode, int type);
52int reiserfs_acl_chmod (struct inode *inode); 51int reiserfs_acl_chmod(struct inode *inode);
53int reiserfs_inherit_default_acl (struct inode *dir, struct dentry *dentry, struct inode *inode); 52int reiserfs_inherit_default_acl(struct inode *dir, struct dentry *dentry,
54int reiserfs_cache_default_acl (struct inode *dir); 53 struct inode *inode);
55extern int reiserfs_xattr_posix_acl_init (void) __init; 54int reiserfs_cache_default_acl(struct inode *dir);
56extern int reiserfs_xattr_posix_acl_exit (void); 55extern int reiserfs_xattr_posix_acl_init(void) __init;
56extern int reiserfs_xattr_posix_acl_exit(void);
57extern struct reiserfs_xattr_handler posix_acl_default_handler; 57extern struct reiserfs_xattr_handler posix_acl_default_handler;
58extern struct reiserfs_xattr_handler posix_acl_access_handler; 58extern struct reiserfs_xattr_handler posix_acl_access_handler;
59#else 59#else
@@ -61,28 +61,26 @@ extern struct reiserfs_xattr_handler posix_acl_access_handler;
61#define reiserfs_get_acl NULL 61#define reiserfs_get_acl NULL
62#define reiserfs_cache_default_acl(inode) 0 62#define reiserfs_cache_default_acl(inode) 0
63 63
64static inline int 64static inline int reiserfs_xattr_posix_acl_init(void)
65reiserfs_xattr_posix_acl_init (void)
66{ 65{
67 return 0; 66 return 0;
68} 67}
69 68
70static inline int 69static inline int reiserfs_xattr_posix_acl_exit(void)
71reiserfs_xattr_posix_acl_exit (void)
72{ 70{
73 return 0; 71 return 0;
74} 72}
75 73
76static inline int 74static inline int reiserfs_acl_chmod(struct inode *inode)
77reiserfs_acl_chmod (struct inode *inode)
78{ 75{
79 return 0; 76 return 0;
80} 77}
81 78
82static inline int 79static inline int
83reiserfs_inherit_default_acl (const struct inode *dir, struct dentry *dentry, struct inode *inode) 80reiserfs_inherit_default_acl(const struct inode *dir, struct dentry *dentry,
81 struct inode *inode)
84{ 82{
85 return 0; 83 return 0;
86} 84}
87 85
88#endif 86#endif