summaryrefslogtreecommitdiff
path: root/fs/ceph
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2009-12-02 01:12:07 +0300
committerSage Weil <sage@newdream.net>2009-12-04 01:59:44 +0300
commit50b885b96c903e420a1eac54dd27626244704a06 (patch)
tree35038a32cbb963c784685e8b73d6ecd1a7cde3c9 /fs/ceph
parent34b43a56b9b103a7a820032177131532d9dbdbe8 (diff)
downloadlinux-50b885b96c903e420a1eac54dd27626244704a06.tar.xz
ceph: whitespace cleanup
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph')
-rw-r--r--fs/ceph/caps.c2
-rw-r--r--fs/ceph/ceph_hash.c8
-rw-r--r--fs/ceph/crush/mapper.c2
-rw-r--r--fs/ceph/mon_client.c2
-rw-r--r--fs/ceph/osd_client.c4
5 files changed, 9 insertions, 9 deletions
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index 9dd110602cda..9b9ce143ac1f 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -1316,7 +1316,7 @@ static int __mark_caps_flushing(struct inode *inode,
struct ceph_mds_client *mdsc = &ceph_client(inode->i_sb)->mdsc;
struct ceph_inode_info *ci = ceph_inode(inode);
int flushing;
-
+
BUG_ON(ci->i_dirty_caps == 0);
BUG_ON(list_empty(&ci->i_dirty_item));
diff --git a/fs/ceph/ceph_hash.c b/fs/ceph/ceph_hash.c
index 1c44e43fe89e..bd570015d147 100644
--- 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--) {
+ 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:
diff --git a/fs/ceph/crush/mapper.c b/fs/ceph/crush/mapper.c
index 2523d448445c..9ba54efb6543 100644
--- a/fs/ceph/crush/mapper.c
+++ b/fs/ceph/crush/mapper.c
@@ -254,7 +254,7 @@ static int crush_bucket_choose(struct crush_bucket *in, int x, int r)
x, r);
default:
BUG_ON(1);
- return in->items[0];
+ return in->items[0];
}
}
diff --git a/fs/ceph/mon_client.c b/fs/ceph/mon_client.c
index 9ff2da69d33a..1dd0dc258c50 100644
--- a/fs/ceph/mon_client.c
+++ b/fs/ceph/mon_client.c
@@ -279,7 +279,7 @@ void ceph_monc_request_next_osdmap(struct ceph_mon_client *monc)
}
/*
- *
+ *
*/
int ceph_monc_open_session(struct ceph_mon_client *monc)
{
diff --git a/fs/ceph/osd_client.c b/fs/ceph/osd_client.c
index d600073f1d3f..d639c74e749f 100644
--- a/fs/ceph/osd_client.c
+++ b/fs/ceph/osd_client.c
@@ -1308,8 +1308,8 @@ static void put_osd_con(struct ceph_connection *con)
* authentication
*/
static int get_authorizer(struct ceph_connection *con,
- void **buf, int *len, int *proto,
- void **reply_buf, int *reply_len, int force_new)
+ void **buf, int *len, int *proto,
+ void **reply_buf, int *reply_len, int force_new)
{
struct ceph_osd *o = con->private;
struct ceph_osd_client *osdc = o->o_osdc;