Merge branch 'core-hweight-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / fs / ceph / ceph_hash.c

diff --git a/fs/ceph/ceph_hash.c b/fs/ceph/ceph_hash.c
index ac8be54631fe559e5dc5b90ddee7bd29f65f21a8..bd570015d147ca2b1ce52061d359a56bb936a4df 100644 (file)
--- a/fs/ceph/ceph_hash.c
+++ b/fs/ceph/ceph_hash.c
@@ -82,14 +82,14 @@ unsigned ceph_str_hash_rjenkins(const char *str, unsigned length)
  */
 unsigned ceph_str_hash_linux(const char *str, unsigned length)
 {
-        unsigned long hash = 0;
+       unsigned long hash = 0;
        unsigned char c;
 
-        while (length-- > 0) {
+       while (length--) {
                c = *str++;
                hash = (hash + (c << 4) + (c >> 4)) * 11;
        }
-        return hash;
+       return hash;
 }
 
 
@@ -105,7 +105,7 @@ unsigned ceph_str_hash(int type, const char *s, unsigned len)
        }
 }
 
-const char *ceph_str_hash_name(int type) 
+const char *ceph_str_hash_name(int type)
 {
        switch (type) {
        case CEPH_STR_HASH_LINUX: