Commit bd4c625c authored by Linus Torvalds's avatar Linus Torvalds

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: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7fa94c88
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <asm/types.h> #include <asm/types.h>
#include <asm/bug.h> #include <asm/bug.h>
#define DELTA 0x9E3779B9 #define DELTA 0x9E3779B9
#define FULLROUNDS 10 /* 32 is overkill, 16 is strong crypto */ #define FULLROUNDS 10 /* 32 is overkill, 16 is strong crypto */
#define PARTROUNDS 6 /* 6 gets complete mixing */ #define PARTROUNDS 6 /* 6 gets complete mixing */
...@@ -48,105 +47,75 @@ ...@@ -48,105 +47,75 @@
h1 += b1; \ h1 += b1; \
} while(0) } while(0)
u32 keyed_hash(const signed char *msg, int len) u32 keyed_hash(const signed char *msg, int len)
{ {
u32 k[] = { 0x9464a485, 0x542e1a94, 0x3e846bff, 0xb75bcfc3}; u32 k[] = { 0x9464a485, 0x542e1a94, 0x3e846bff, 0xb75bcfc3 };
u32 h0 = k[0], h1 = k[1]; u32 h0 = k[0], h1 = k[1];
u32 a, b, c, d; u32 a, b, c, d;
u32 pad; u32 pad;
int i; int i;
// assert(len >= 0 && len < 256);
pad = (u32)len | ((u32)len << 8); // assert(len >= 0 && len < 256);
pad = (u32) len | ((u32) len << 8);
pad |= pad << 16; pad |= pad << 16;
while(len >= 16) while (len >= 16) {
{ a = (u32) msg[0] |
a = (u32)msg[ 0] | (u32) msg[1] << 8 | (u32) msg[2] << 16 | (u32) msg[3] << 24;
(u32)msg[ 1] << 8 | b = (u32) msg[4] |
(u32)msg[ 2] << 16| (u32) msg[5] << 8 | (u32) msg[6] << 16 | (u32) msg[7] << 24;
(u32)msg[ 3] << 24; c = (u32) msg[8] |
b = (u32)msg[ 4] | (u32) msg[9] << 8 |
(u32)msg[ 5] << 8 | (u32) msg[10] << 16 | (u32) msg[11] << 24;
(u32)msg[ 6] << 16| d = (u32) msg[12] |
(u32)msg[ 7] << 24; (u32) msg[13] << 8 |
c = (u32)msg[ 8] | (u32) msg[14] << 16 | (u32) msg[15] << 24;
(u32)msg[ 9] << 8 |
(u32)msg[10] << 16|
(u32)msg[11] << 24;
d = (u32)msg[12] |
(u32)msg[13] << 8 |
(u32)msg[14] << 16|
(u32)msg[15] << 24;
TEACORE(PARTROUNDS); TEACORE(PARTROUNDS);
len -= 16; len -= 16;
msg += 16; msg += 16;
} }
if (len >= 12) if (len >= 12) {
{ a = (u32) msg[0] |
a = (u32)msg[ 0] | (u32) msg[1] << 8 | (u32) msg[2] << 16 | (u32) msg[3] << 24;
(u32)msg[ 1] << 8 | b = (u32) msg[4] |
(u32)msg[ 2] << 16| (u32) msg[5] << 8 | (u32) msg[6] << 16 | (u32) msg[7] << 24;
(u32)msg[ 3] << 24; c = (u32) msg[8] |
b = (u32)msg[ 4] | (u32) msg[9] << 8 |
(u32)msg[ 5] << 8 | (u32) msg[10] << 16 | (u32) msg[11] << 24;
(u32)msg[ 6] << 16|
(u32)msg[ 7] << 24;
c = (u32)msg[ 8] |
(u32)msg[ 9] << 8 |
(u32)msg[10] << 16|
(u32)msg[11] << 24;
d = pad; d = pad;
for(i = 12; i < len; i++) for (i = 12; i < len; i++) {
{
d <<= 8; d <<= 8;
d |= msg[i]; d |= msg[i];
} }
} } else if (len >= 8) {
else if (len >= 8) a = (u32) msg[0] |
{ (u32) msg[1] << 8 | (u32) msg[2] << 16 | (u32) msg[3] << 24;
a = (u32)msg[ 0] | b = (u32) msg[4] |
(u32)msg[ 1] << 8 | (u32) msg[5] << 8 | (u32) msg[6] << 16 | (u32) msg[7] << 24;
(u32)msg[ 2] << 16|
(u32)msg[ 3] << 24;
b = (u32)msg[ 4] |
(u32)msg[ 5] << 8 |
(u32)msg[ 6] << 16|
(u32)msg[ 7] << 24;
c = d = pad; c = d = pad;
for(i = 8; i < len; i++) for (i = 8; i < len; i++) {
{
c <<= 8; c <<= 8;
c |= msg[i]; c |= msg[i];
} }
} } else if (len >= 4) {
else if (len >= 4) a = (u32) msg[0] |
{ (u32) msg[1] << 8 | (u32) msg[2] << 16 | (u32) msg[3] << 24;
a = (u32)msg[ 0] |
(u32)msg[ 1] << 8 |
(u32)msg[ 2] << 16|
(u32)msg[ 3] << 24;
b = c = d = pad; b = c = d = pad;
for(i = 4; i < len; i++) for (i = 4; i < len; i++) {
{
b <<= 8; b <<= 8;
b |= msg[i]; b |= msg[i];
} }
} } else {
else
{
a = b = c = d = pad; a = b = c = d = pad;
for(i = 0; i < len; i++) for (i = 0; i < len; i++) {
{
a <<= 8; a <<= 8;
a |= msg[i]; a |= msg[i];
} }
...@@ -155,55 +124,59 @@ u32 keyed_hash(const signed char *msg, int len) ...@@ -155,55 +124,59 @@ u32 keyed_hash(const signed char *msg, int len)
TEACORE(FULLROUNDS); TEACORE(FULLROUNDS);
/* return 0;*/ /* return 0;*/
return h0^h1; return h0 ^ h1;
} }
/* What follows in this file is copyright 2000 by Hans Reiser, and the /* What follows in this file is copyright 2000 by Hans Reiser, and the
* licensing of what follows is governed by reiserfs/README */ * licensing of what follows is governed by reiserfs/README */
u32 yura_hash (const signed char *msg, int len) u32 yura_hash(const signed char *msg, int len)
{ {
int j, pow; int j, pow;
u32 a, c; u32 a, c;
int i; int i;
for (pow=1,i=1; i < len; i++) pow = pow * 10; for (pow = 1, i = 1; i < len; i++)
pow = pow * 10;
if (len == 1)
a = msg[0]-48; if (len == 1)
else a = msg[0] - 48;
a = (msg[0] - 48) * pow; else
a = (msg[0] - 48) * pow;
for (i=1; i < len; i++) {
c = msg[i] - 48; for (i = 1; i < len; i++) {
for (pow=1,j=i; j < len-1; j++) pow = pow * 10; c = msg[i] - 48;
a = a + c * pow; for (pow = 1, j = i; j < len - 1; j++)
} pow = pow * 10;
a = a + c * pow;
for (; i < 40; i++) { }
c = '0' - 48;
for (pow=1,j=i; j < len-1; j++) pow = pow * 10; for (; i < 40; i++) {
a = a + c * pow; c = '0' - 48;
} for (pow = 1, j = i; j < len - 1; j++)
pow = pow * 10;
for (; i < 256; i++) { a = a + c * pow;
c = i; }
for (pow=1,j=i; j < len-1; j++) pow = pow * 10;
a = a + c * pow; for (; i < 256; i++) {
} c = i;
for (pow = 1, j = i; j < len - 1; j++)
a = a << 7; pow = pow * 10;
return a; a = a + c * pow;
}
a = a << 7;
return a;
} }
u32 r5_hash (const signed char *msg, int len) u32 r5_hash(const signed char *msg, int len)
{ {
u32 a=0; u32 a = 0;
while(*msg) { while (*msg) {
a += *msg << 4; a += *msg << 4;
a += *msg >> 4; a += *msg >> 4;
a *= 11; a *= 11;
msg++; msg++;
} }
return a; return a;
} }
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -9,57 +9,55 @@ ...@@ -9,57 +9,55 @@
#define XATTR_SECURITY_PREFIX "security." #define XATTR_SECURITY_PREFIX "security."
static int static int
security_get (struct inode *inode, const char *name, void *buffer, size_t size) security_get(struct inode *inode, const char *name, void *buffer, size_t size)
{ {
if (strlen(name) < sizeof(XATTR_SECURITY_PREFIX)) if (strlen(name) < sizeof(XATTR_SECURITY_PREFIX))
return -EINVAL; return -EINVAL;
if (is_reiserfs_priv_object(inode)) if (is_reiserfs_priv_object(inode))
return -EPERM; return -EPERM;
return reiserfs_xattr_get (inode, name, buffer, size); return reiserfs_xattr_get(inode, name, buffer, size);
} }
static int static int
security_set (struct inode *inode, const char *name, const void *buffer, security_set(struct inode *inode, const char *name, const void *buffer,
size_t size, int flags) size_t size, int flags)
{ {
if (strlen(name) < sizeof(XATTR_SECURITY_PREFIX)) if (strlen(name) < sizeof(XATTR_SECURITY_PREFIX))
return -EINVAL; return -EINVAL;
if (is_reiserfs_priv_object(inode)) if (is_reiserfs_priv_object(inode))
return -EPERM; return -EPERM;
return reiserfs_xattr_set (inode, name, buffer, size, flags); return reiserfs_xattr_set(inode, name, buffer, size, flags);
} }
static int static int security_del(struct inode *inode, const char *name)
security_del (struct inode *inode, const char *name)
{ {
if (strlen(name) < sizeof(XATTR_SECURITY_PREFIX)) if (strlen(name) < sizeof(XATTR_SECURITY_PREFIX))
return -EINVAL; return -EINVAL;
if (is_reiserfs_priv_object(inode)) if (is_reiserfs_priv_object(inode))
return -EPERM; return -EPERM;
return 0; return 0;
} }
static int static int
security_list (struct inode *inode, const char *name, int namelen, char *out) security_list(struct inode *inode, const char *name, int namelen, char *out)
{ {
int len = namelen; int len = namelen;
if (is_reiserfs_priv_object(inode)) if (is_reiserfs_priv_object(inode))
return 0; return 0;
if (out) if (out)
memcpy (out, name, len); memcpy(out, name, len);
return len; return len;
} }
struct reiserfs_xattr_handler security_handler = { struct reiserfs_xattr_handler security_handler = {
.prefix = XATTR_SECURITY_PREFIX, .prefix = XATTR_SECURITY_PREFIX,
.get = security_get, .get = security_get,
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment