aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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,
1316 struct ceph_mds_client *mdsc = &ceph_client(inode->i_sb)->mdsc; 1316 struct ceph_mds_client *mdsc = &ceph_client(inode->i_sb)->mdsc;
1317 struct ceph_inode_info *ci = ceph_inode(inode); 1317 struct ceph_inode_info *ci = ceph_inode(inode);
1318 int flushing; 1318 int flushing;
1319 1319
1320 BUG_ON(ci->i_dirty_caps == 0); 1320 BUG_ON(ci->i_dirty_caps == 0);
1321 BUG_ON(list_empty(&ci->i_dirty_item)); 1321 BUG_ON(list_empty(&ci->i_dirty_item));
1322 1322
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)
82 */ 82 */
83unsigned ceph_str_hash_linux(const char *str, unsigned length) 83unsigned ceph_str_hash_linux(const char *str, unsigned length)
84{ 84{
85 unsigned long hash = 0; 85 unsigned long hash = 0;
86 unsigned char c; 86 unsigned char c;
87 87
88 while (length--) { 88 while (length--) {
89 c = *str++; 89 c = *str++;
90 hash = (hash + (c << 4) + (c >> 4)) * 11; 90 hash = (hash + (c << 4) + (c >> 4)) * 11;
91 } 91 }
92 return hash; 92 return hash;
93} 93}
94 94
95 95
@@ -105,7 +105,7 @@ unsigned ceph_str_hash(int type, const char *s, unsigned len)
105 } 105 }
106} 106}
107 107
108const char *ceph_str_hash_name(int type) 108const char *ceph_str_hash_name(int type)
109{ 109{
110 switch (type) { 110 switch (type) {
111 case CEPH_STR_HASH_LINUX: 111 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)
254 x, r); 254 x, r);
255 default: 255 default:
256 BUG_ON(1); 256 BUG_ON(1);
257 return in->items[0]; 257 return in->items[0];
258 } 258 }
259} 259}
260 260
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)
279} 279}
280 280
281/* 281/*
282 * 282 *
283 */ 283 */
284int ceph_monc_open_session(struct ceph_mon_client *monc) 284int ceph_monc_open_session(struct ceph_mon_client *monc)
285{ 285{
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)
1308 * authentication 1308 * authentication
1309 */ 1309 */
1310static int get_authorizer(struct ceph_connection *con, 1310static int get_authorizer(struct ceph_connection *con,
1311 void **buf, int *len, int *proto, 1311 void **buf, int *len, int *proto,
1312 void **reply_buf, int *reply_len, int force_new) 1312 void **reply_buf, int *reply_len, int force_new)
1313{ 1313{
1314 struct ceph_osd *o = con->private; 1314 struct ceph_osd *o = con->private;
1315 struct ceph_osd_client *osdc = o->o_osdc; 1315 struct ceph_osd_client *osdc = o->o_osdc;