Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 188636
b: refs/heads/master
c: 50b885b
h: refs/heads/master
v: v3
  • Loading branch information
Sage Weil committed Dec 3, 2009
1 parent b581a93 commit ab22c90
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 34b43a56b9b103a7a820032177131532d9dbdbe8
refs/heads/master: 50b885b96c903e420a1eac54dd27626244704a06
2 changes: 1 addition & 1 deletion trunk/fs/ceph/caps.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down
8 changes: 4 additions & 4 deletions trunk/fs/ceph/ceph_hash.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}


Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/ceph/crush/mapper.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
}
}

Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/ceph/mon_client.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
4 changes: 2 additions & 2 deletions trunk/fs/ceph/osd_client.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit ab22c90

Please sign in to comment.