From: Sage Weil Date: Tue, 8 Sep 2009 23:25:15 +0000 (-0700) Subject: kclient: checkpatch cleanups X-Git-Tag: v0.15~97 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c2b6534731270dc6a1da181f258437e1b9dd6f60;p=ceph.git kclient: checkpatch cleanups --- diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h index 482094c8ee99..39b8b3ed8bd8 100644 --- a/src/include/ceph_fs.h +++ b/src/include/ceph_fs.h @@ -24,8 +24,10 @@ #define _CEPH_STRINGIFY(x) #x #define CEPH_STRINGIFY(x) _CEPH_STRINGIFY(x) -#define CEPH_MAKE_VERSION(x, y, z) CEPH_STRINGIFY(x) "." CEPH_STRINGIFY(y) "." CEPH_STRINGIFY(z) -#define CEPH_VERSION CEPH_MAKE_VERSION(CEPH_VERSION_MAJOR, CEPH_VERSION_MINOR, CEPH_VERSION_PATCH) +#define CEPH_MAKE_VERSION(x, y, z) CEPH_STRINGIFY(x) "." CEPH_STRINGIFY(y) \ + "." CEPH_STRINGIFY(z) +#define CEPH_VERSION CEPH_MAKE_VERSION(CEPH_VERSION_MAJOR, \ + CEPH_VERSION_MINOR, CEPH_VERSION_PATCH) /* * subprotocol versions. when specific messages types or high-level @@ -198,7 +200,7 @@ struct ceph_file_layout { #define ceph_file_layout_pg_preferred(l) \ ((__s32)le32_to_cpu((l).fl_pg_preferred)) #define ceph_file_layout_pg_pool(l) \ - ((__s32)le32_to_cpu((l).fl_pg_pool)) + ((__s32)le32_to_cpu((l).fl_pg_pool)) #define ceph_file_layout_stripe_width(l) (le32_to_cpu((l).fl_stripe_unit) * \ le32_to_cpu((l).fl_stripe_count)) @@ -341,7 +343,7 @@ struct ceph_mon_subscribe_item { #define CEPH_MDS_STATE_BOOT -4 /* up, boot announcement. */ #define CEPH_MDS_STATE_STANDBY -5 /* up, idle. waiting for assignment. */ #define CEPH_MDS_STATE_CREATING -6 /* up, creating MDS instance. */ -#define CEPH_MDS_STATE_STARTING -7 /* up, starting previously stopped mds. */ +#define CEPH_MDS_STATE_STARTING -7 /* up, starting previously stopped mds */ #define CEPH_MDS_STATE_STANDBY_REPLAY -8 /* up, tailing active node's journal */ #define CEPH_MDS_STATE_REPLAY 8 /* up, replaying journal. */ diff --git a/src/include/rados.h b/src/include/rados.h index a25c69dbcbf3..a83cf35a7914 100644 --- a/src/include/rados.h +++ b/src/include/rados.h @@ -1,6 +1,3 @@ -// -*- mode:C; tab-width:8; c-basic-offset:8; indent-tabs-mode:t -*- -// vim: ts=8 sw=8 smarttab - #ifndef __RADOS_H #define __RADOS_H @@ -194,11 +191,11 @@ enum { CEPH_OSD_OP_SETTRUNC = CEPH_OSD_OP_MODE_WR | CEPH_OSD_OP_TYPE_DATA | 8, CEPH_OSD_OP_TRIMTRUNC = CEPH_OSD_OP_MODE_WR | CEPH_OSD_OP_TYPE_DATA | 9, - CEPH_OSD_OP_TMAPUP = CEPH_OSD_OP_MODE_RMW | CEPH_OSD_OP_TYPE_DATA | 10, - CEPH_OSD_OP_TMAPPUT = CEPH_OSD_OP_MODE_WR | CEPH_OSD_OP_TYPE_DATA | 11, - CEPH_OSD_OP_TMAPGET = CEPH_OSD_OP_MODE_RD | CEPH_OSD_OP_TYPE_DATA | 12, + CEPH_OSD_OP_TMAPUP = CEPH_OSD_OP_MODE_RMW | CEPH_OSD_OP_TYPE_DATA | 10, + CEPH_OSD_OP_TMAPPUT = CEPH_OSD_OP_MODE_WR | CEPH_OSD_OP_TYPE_DATA | 11, + CEPH_OSD_OP_TMAPGET = CEPH_OSD_OP_MODE_RD | CEPH_OSD_OP_TYPE_DATA | 12, - CEPH_OSD_OP_CREATE = CEPH_OSD_OP_MODE_WR | CEPH_OSD_OP_TYPE_DATA | 13, + CEPH_OSD_OP_CREATE = CEPH_OSD_OP_MODE_WR | CEPH_OSD_OP_TYPE_DATA | 13, /** attrs **/ /* read */ @@ -376,7 +373,7 @@ struct ceph_osd_op { struct { __le64 pgls_cookie, count; } __attribute__ ((packed)); - struct { + struct { __le32 flags; } __attribute__ ((packed)); }; diff --git a/src/kernel/caps.c b/src/kernel/caps.c index b883e83679fe..a6f16d4b0dc0 100644 --- a/src/kernel/caps.c +++ b/src/kernel/caps.c @@ -1246,7 +1246,7 @@ static void __mark_caps_flushing(struct inode *inode, * appropriate. * * CHECK_CAPS_NODELAY - caller is delayed work and we should not delay - * cap release further. + * cap release further. * CHECK_CAPS_AUTHONLY - we should only check the auth cap * CHECK_CAPS_FLUSH - we should flush any dirty caps immediately, without * further delay. @@ -1812,7 +1812,7 @@ static int try_get_cap_refs(struct ceph_inode_info *ci, int need, int want, dout("get_cap_refs %p need %s want %s\n", inode, ceph_cap_string(need), ceph_cap_string(want)); spin_lock(&inode->i_lock); - + /* make sure we _have_ some caps! */ if (!__ceph_is_any_caps(ci)) { dout("get_cap_refs %p no real caps\n", inode); diff --git a/src/kernel/ceph_debug.h b/src/kernel/ceph_debug.h index 34aaf5b5269a..be9b8bc10491 100644 --- a/src/kernel/ceph_debug.h +++ b/src/kernel/ceph_debug.h @@ -18,7 +18,8 @@ extern const char *ceph_file_part(const char *s, int len); # else /* faux printk call just to see any compiler warnings. */ # define dout(fmt, ...) do { \ - if (0) printk(KERN_DEBUG fmt, ##__VA_ARGS__); \ + if (0) \ + printk(KERN_DEBUG fmt, ##__VA_ARGS__); \ } while (0) # endif diff --git a/src/kernel/debugfs.c b/src/kernel/debugfs.c index 9edee6474218..1cd7f434fcf9 100644 --- a/src/kernel/debugfs.c +++ b/src/kernel/debugfs.c @@ -164,11 +164,10 @@ static int mdsc_show(struct seq_file *s, void *p) break; nexttid = req->r_tid + 1; - if (req->r_request) { + if (req->r_request) seq_printf(s, "%lld\tmds%d\t", req->r_tid, req->r_mds); - } else { + else seq_printf(s, "%lld\t(no request)\t", req->r_tid); - } seq_printf(s, "%s", ceph_mds_op_name(req->r_op)); diff --git a/src/kernel/dir.c b/src/kernel/dir.c index 3b47c8e8fcc9..a77a81146767 100644 --- a/src/kernel/dir.c +++ b/src/kernel/dir.c @@ -1059,8 +1059,8 @@ static int ceph_dir_fsync(struct file *file, struct dentry *dentry, dout("dir_fsync %p wait on tid %llu (until %llu)\n", inode, req->r_tid, last_tid); if (req->r_timeout) { - ret = wait_for_completion_timeout(&req->r_safe_completion, - req->r_timeout); + ret = wait_for_completion_timeout( + &req->r_safe_completion, req->r_timeout); if (ret > 0) ret = 0; else if (ret == 0) diff --git a/src/kernel/export.c b/src/kernel/export.c index 6b7e845366b8..81cb20b81700 100644 --- a/src/kernel/export.c +++ b/src/kernel/export.c @@ -66,7 +66,7 @@ static int ceph_encode_fh(struct dentry *dentry, u32 *rawfh, int *max_len, type = 1; } else { return -ENOSPC; - } + } return type; } diff --git a/src/kernel/ioctl.c b/src/kernel/ioctl.c index bf5a9d9d4efc..0abc2763046e 100644 --- a/src/kernel/ioctl.c +++ b/src/kernel/ioctl.c @@ -46,7 +46,7 @@ static long ceph_ioctl_set_layout(struct file *file, void __user *arg) (l.stripe_unit & ~PAGE_MASK) || !l.stripe_unit || (l.object_size && - (unsigned)l.object_size % (unsigned)l.stripe_unit)) + (unsigned)l.object_size % (unsigned)l.stripe_unit)) return -EINVAL; /* make sure it's a valid data pool */ diff --git a/src/kernel/mds_client.c b/src/kernel/mds_client.c index 88257637502d..06b940f98e83 100644 --- a/src/kernel/mds_client.c +++ b/src/kernel/mds_client.c @@ -412,8 +412,9 @@ void ceph_mdsc_put_request(struct ceph_mds_request *req) if (req->r_dentry) dput(req->r_dentry); if (req->r_old_dentry) { - ceph_put_cap_refs(ceph_inode(req->r_old_dentry->d_parent->d_inode), - CEPH_CAP_PIN); + ceph_put_cap_refs( + ceph_inode(req->r_old_dentry->d_parent->d_inode), + CEPH_CAP_PIN); dput(req->r_old_dentry); } kfree(req->r_path1); @@ -582,7 +583,7 @@ static int __choose_mds(struct ceph_mds_client *mdsc, } mds = cap->session->s_mds; dout("choose_mds %p %llx.%llx mds%d (%scap %p)\n", - inode, ceph_vinop(inode), mds, + inode, ceph_vinop(inode), mds, cap == ci->i_auth_cap ? "auth " : "", cap); spin_unlock(&inode->i_lock); return mds; @@ -807,7 +808,8 @@ static void renewed_caps(struct ceph_mds_client *mdsc, pr_info("ceph mds%d caps renewed\n", session->s_mds); wake = 1; } else { - pr_info("ceph mds%d caps still stale\n",session->s_mds); + pr_info("ceph mds%d caps still stale\n", + session->s_mds); } } dout("renewed_caps mds%d ttl now %lu, was %s, now %s\n", @@ -1573,8 +1575,9 @@ int ceph_mdsc_do_request(struct ceph_mds_client *mdsc, if (req->r_locked_dir) ceph_get_cap_refs(ceph_inode(req->r_locked_dir), CEPH_CAP_PIN); if (req->r_old_dentry) - ceph_get_cap_refs(ceph_inode(req->r_old_dentry->d_parent->d_inode), - CEPH_CAP_PIN); + ceph_get_cap_refs( + ceph_inode(req->r_old_dentry->d_parent->d_inode), + CEPH_CAP_PIN); /* issue */ mutex_lock(&mdsc->mutex); @@ -1852,7 +1855,7 @@ static void handle_session(struct ceph_mds_session *session, mutex_lock(&mdsc->mutex); /* FIXME: this ttl calculation is generous */ session->s_ttl = jiffies + HZ*mdsc->mdsmap->m_session_autoclose; - mutex_unlock(&mdsc->mutex); + mutex_unlock(&mdsc->mutex); mutex_lock(&session->s_mutex); @@ -2837,7 +2840,7 @@ static struct ceph_connection *con_get(struct ceph_connection *con) atomic_read(&s->s_ref) - 1, atomic_read(&s->s_ref)); return con; } - dout("mdsc con_get %p FAIL\n", s); + dout("mdsc con_get %p FAIL\n", s); return NULL; } diff --git a/src/kernel/mds_client.h b/src/kernel/mds_client.h index 8bf5d5a4d4e4..18a2932dc12d 100644 --- a/src/kernel/mds_client.h +++ b/src/kernel/mds_client.h @@ -267,7 +267,7 @@ extern const char *ceph_mds_op_name(int op); extern struct ceph_mds_session * __ceph_lookup_mds_session(struct ceph_mds_client *, int mds); -inline static struct ceph_mds_session * +static inline struct ceph_mds_session * ceph_get_mds_session(struct ceph_mds_session *s) { atomic_inc(&s->s_ref); diff --git a/src/kernel/osd_client.c b/src/kernel/osd_client.c index c1b8c2a5ab34..f532f7e81560 100644 --- a/src/kernel/osd_client.c +++ b/src/kernel/osd_client.c @@ -290,7 +290,7 @@ static void osd_reset(struct ceph_connection *con) { struct ceph_osd *osd = con->private; struct ceph_osd_client *osdc; - + if (!osd) return; dout("osd_reset osd%d\n", osd->o_osd); diff --git a/src/kernel/snap.c b/src/kernel/snap.c index ffc7b493392e..71cc0d0ee7bb 100644 --- a/src/kernel/snap.c +++ b/src/kernel/snap.c @@ -82,8 +82,9 @@ void ceph_get_snap_realm(struct ceph_mds_client *mdsc, * * caller must hold snap_rwsem for write. */ -static struct ceph_snap_realm *ceph_create_snap_realm(struct ceph_mds_client *mdsc, - u64 ino) +static struct ceph_snap_realm *ceph_create_snap_realm( + struct ceph_mds_client *mdsc, + u64 ino) { struct ceph_snap_realm *realm; diff --git a/src/kernel/super.c b/src/kernel/super.c index 386ea2838b2b..c0396704cbe4 100644 --- a/src/kernel/super.c +++ b/src/kernel/super.c @@ -31,7 +31,7 @@ const char *ceph_file_part(const char *s, int len) { const char *e = s + len; - + while (e != s && *(e-1) != '/') e--; return e; @@ -438,7 +438,7 @@ static int parse_mount_args(struct ceph_client *client, return err; /* build initial monmap */ - client->monc.monmap = kzalloc(sizeof(*client->monc.monmap) + + client->monc.monmap = kzalloc(sizeof(*client->monc.monmap) + num_mon*sizeof(client->monc.monmap->mon_inst[0]), GFP_KERNEL); if (!client->monc.monmap)