Commit ded9f908 authored by Hatice ERTÜRK's avatar Hatice ERTÜRK Committed by Greg Kroah-Hartman

Staging: lustre: lustre: obdecho: Add blank line after declarations

The following patch fixes the checkpatch.pl warning:
drivers/staging/lustre/lustre/obdecho/echo_client.c WARNING: Missing a blank line after declarations
Signed-off-by: default avatarHatice ERTURK <haticeerturk27@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 75f0cef5
...@@ -146,6 +146,7 @@ static struct lu_context_key echo_thread_key; ...@@ -146,6 +146,7 @@ static struct lu_context_key echo_thread_key;
static inline struct echo_thread_info *echo_env_info(const struct lu_env *env) static inline struct echo_thread_info *echo_env_info(const struct lu_env *env)
{ {
struct echo_thread_info *info; struct echo_thread_info *info;
info = lu_context_key_get(&env->le_ctx, &echo_thread_key); info = lu_context_key_get(&env->le_ctx, &echo_thread_key);
LASSERT(info != NULL); LASSERT(info != NULL);
return info; return info;
...@@ -637,6 +638,7 @@ static void echo_thread_key_fini(const struct lu_context *ctx, ...@@ -637,6 +638,7 @@ static void echo_thread_key_fini(const struct lu_context *ctx,
struct lu_context_key *key, void *data) struct lu_context_key *key, void *data)
{ {
struct echo_thread_info *info = data; struct echo_thread_info *info = data;
OBD_SLAB_FREE_PTR(info, echo_thread_kmem); OBD_SLAB_FREE_PTR(info, echo_thread_kmem);
} }
...@@ -667,6 +669,7 @@ static void echo_session_key_fini(const struct lu_context *ctx, ...@@ -667,6 +669,7 @@ static void echo_session_key_fini(const struct lu_context *ctx,
struct lu_context_key *key, void *data) struct lu_context_key *key, void *data)
{ {
struct echo_session_info *session = data; struct echo_session_info *session = data;
OBD_SLAB_FREE_PTR(session, echo_session_kmem); OBD_SLAB_FREE_PTR(session, echo_session_kmem);
} }
...@@ -783,6 +786,7 @@ static struct lu_device *echo_device_alloc(const struct lu_env *env, ...@@ -783,6 +786,7 @@ static struct lu_device *echo_device_alloc(const struct lu_env *env,
switch (cleanup) { switch (cleanup) {
case 4: { case 4: {
int rc2; int rc2;
rc2 = echo_client_cleanup(obd); rc2 = echo_client_cleanup(obd);
if (rc2) if (rc2)
CERROR("Cleanup obd device %s error(%d)\n", CERROR("Cleanup obd device %s error(%d)\n",
...@@ -958,11 +962,13 @@ static struct echo_object *cl_echo_object_find(struct echo_device *d, ...@@ -958,11 +962,13 @@ static struct echo_object *cl_echo_object_find(struct echo_device *d,
if (d->ed_next) { if (d->ed_next) {
if (!d->ed_next_islov) { if (!d->ed_next_islov) {
struct lov_oinfo *oinfo = lsm->lsm_oinfo[0]; struct lov_oinfo *oinfo = lsm->lsm_oinfo[0];
LASSERT(oinfo != NULL); LASSERT(oinfo != NULL);
oinfo->loi_oi = lsm->lsm_oi; oinfo->loi_oi = lsm->lsm_oi;
conf->eoc_cl.u.coc_oinfo = oinfo; conf->eoc_cl.u.coc_oinfo = oinfo;
} else { } else {
struct lustre_md *md; struct lustre_md *md;
md = &info->eti_md; md = &info->eti_md;
memset(md, 0, sizeof(*md)); memset(md, 0, sizeof(*md));
md->lsm = lsm; md->lsm = lsm;
...@@ -1011,6 +1017,7 @@ static int cl_echo_object_put(struct echo_object *eco) ...@@ -1011,6 +1017,7 @@ static int cl_echo_object_put(struct echo_object *eco)
/* an external function to kill an object? */ /* an external function to kill an object? */
if (eco->eo_deleted) { if (eco->eo_deleted) {
struct lu_object_header *loh = obj->co_lu.lo_header; struct lu_object_header *loh = obj->co_lu.lo_header;
LASSERT(&eco->eo_hdr == luh2coh(loh)); LASSERT(&eco->eo_hdr == luh2coh(loh));
set_bit(LU_OBJECT_HEARD_BANSHEE, &loh->loh_flags); set_bit(LU_OBJECT_HEARD_BANSHEE, &loh->loh_flags);
} }
...@@ -1152,6 +1159,7 @@ static int cl_echo_async_brw(const struct lu_env *env, struct cl_io *io, ...@@ -1152,6 +1159,7 @@ static int cl_echo_async_brw(const struct lu_env *env, struct cl_io *io,
cl_page_list_for_each_safe(clp, temp, &queue->c2_qin) { cl_page_list_for_each_safe(clp, temp, &queue->c2_qin) {
int rc; int rc;
rc = cl_page_cache_add(env, io, clp, CRT_WRITE); rc = cl_page_cache_add(env, io, clp, CRT_WRITE);
if (rc == 0) if (rc == 0)
continue; continue;
...@@ -1615,6 +1623,7 @@ static int echo_client_kbrw(struct echo_device *ed, int rw, struct obdo *oa, ...@@ -1615,6 +1623,7 @@ static int echo_client_kbrw(struct echo_device *ed, int rw, struct obdo *oa,
if (verify) { if (verify) {
int vrc; int vrc;
vrc = echo_client_page_debug_check(lsm, pgp->pg, vrc = echo_client_page_debug_check(lsm, pgp->pg,
ostid_id(&oa->o_oi), ostid_id(&oa->o_oi),
pgp->off, pgp->count); pgp->off, pgp->count);
...@@ -1911,6 +1920,7 @@ echo_client_iocontrol(unsigned int cmd, struct obd_export *exp, int len, ...@@ -1911,6 +1920,7 @@ echo_client_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
rc = echo_get_object(&eco, ed, oa); rc = echo_get_object(&eco, ed, oa);
if (rc == 0) { if (rc == 0) {
struct obd_info oinfo = { { { 0 } } }; struct obd_info oinfo = { { { 0 } } };
oinfo.oi_md = eco->eo_lsm; oinfo.oi_md = eco->eo_lsm;
oinfo.oi_oa = oa; oinfo.oi_oa = oa;
rc = obd_getattr(env, ec->ec_exp, &oinfo); rc = obd_getattr(env, ec->ec_exp, &oinfo);
...@@ -1927,6 +1937,7 @@ echo_client_iocontrol(unsigned int cmd, struct obd_export *exp, int len, ...@@ -1927,6 +1937,7 @@ echo_client_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
rc = echo_get_object(&eco, ed, oa); rc = echo_get_object(&eco, ed, oa);
if (rc == 0) { if (rc == 0) {
struct obd_info oinfo = { { { 0 } } }; struct obd_info oinfo = { { { 0 } } };
oinfo.oi_oa = oa; oinfo.oi_oa = oa;
oinfo.oi_md = eco->eo_lsm; oinfo.oi_md = eco->eo_lsm;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment