Commit 1df232ee authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman

staging/lustre/mdc: Adjust comments to better conform to coding style

This patch fixes "Block comments use a trailing */ on a separate line"
warnings from checkpatch
Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent acb9abc1
...@@ -489,7 +489,8 @@ static int mdc_req_avail(struct client_obd *cli, struct mdc_cache_waiter *mcw) ...@@ -489,7 +489,8 @@ static int mdc_req_avail(struct client_obd *cli, struct mdc_cache_waiter *mcw)
/* We record requests in flight in cli->cl_r_in_flight here. /* We record requests in flight in cli->cl_r_in_flight here.
* There is only one write rpc possible in mdc anyway. If this to change * There is only one write rpc possible in mdc anyway. If this to change
* in the future - the code may need to be revisited. */ * in the future - the code may need to be revisited.
*/
int mdc_enter_request(struct client_obd *cli) int mdc_enter_request(struct client_obd *cli)
{ {
int rc = 0; int rc = 0;
......
...@@ -65,7 +65,8 @@ static int mdc_reint(struct ptlrpc_request *request, ...@@ -65,7 +65,8 @@ static int mdc_reint(struct ptlrpc_request *request,
/* Find and cancel locally locks matched by inode @bits & @mode in the resource /* Find and cancel locally locks matched by inode @bits & @mode in the resource
* found by @fid. Found locks are added into @cancel list. Returns the amount of * found by @fid. Found locks are added into @cancel list. Returns the amount of
* locks added to @cancels list. */ * locks added to @cancels list.
*/
int mdc_resource_get_unused(struct obd_export *exp, const struct lu_fid *fid, int mdc_resource_get_unused(struct obd_export *exp, const struct lu_fid *fid,
struct list_head *cancels, enum ldlm_mode mode, struct list_head *cancels, enum ldlm_mode mode,
__u64 bits) __u64 bits)
...@@ -81,7 +82,8 @@ int mdc_resource_get_unused(struct obd_export *exp, const struct lu_fid *fid, ...@@ -81,7 +82,8 @@ int mdc_resource_get_unused(struct obd_export *exp, const struct lu_fid *fid,
* *
* This distinguishes from a case when ELC is not supported originally, * This distinguishes from a case when ELC is not supported originally,
* when we still want to cancel locks in advance and just cancel them * when we still want to cancel locks in advance and just cancel them
* locally, without sending any RPC. */ * locally, without sending any RPC.
*/
if (exp_connect_cancelset(exp) && !ns_connect_cancelset(ns)) if (exp_connect_cancelset(exp) && !ns_connect_cancelset(ns))
return 0; return 0;
...@@ -258,7 +260,8 @@ int mdc_create(struct obd_export *exp, struct md_op_data *op_data, ...@@ -258,7 +260,8 @@ int mdc_create(struct obd_export *exp, struct md_op_data *op_data,
ptlrpc_request_set_replen(req); ptlrpc_request_set_replen(req);
/* ask ptlrpc not to resend on EINPROGRESS since we have our own retry /* ask ptlrpc not to resend on EINPROGRESS since we have our own retry
* logic here */ * logic here
*/
req->rq_no_retry_einprogress = 1; req->rq_no_retry_einprogress = 1;
if (resends) { if (resends) {
...@@ -276,7 +279,8 @@ int mdc_create(struct obd_export *exp, struct md_op_data *op_data, ...@@ -276,7 +279,8 @@ int mdc_create(struct obd_export *exp, struct md_op_data *op_data,
goto resend; goto resend;
} else if (rc == -EINPROGRESS) { } else if (rc == -EINPROGRESS) {
/* Retry create infinitely until succeed or get other /* Retry create infinitely until succeed or get other
* error code. */ * error code.
*/
ptlrpc_req_finished(req); ptlrpc_req_finished(req);
resends++; resends++;
......
...@@ -63,7 +63,8 @@ static inline int mdc_queue_wait(struct ptlrpc_request *req) ...@@ -63,7 +63,8 @@ static inline int mdc_queue_wait(struct ptlrpc_request *req)
/* mdc_enter_request() ensures that this client has no more /* mdc_enter_request() ensures that this client has no more
* than cl_max_rpcs_in_flight RPCs simultaneously inf light * than cl_max_rpcs_in_flight RPCs simultaneously inf light
* against an MDT. */ * against an MDT.
*/
rc = mdc_enter_request(cli); rc = mdc_enter_request(cli);
if (rc != 0) if (rc != 0)
return rc; return rc;
...@@ -813,7 +814,8 @@ static int mdc_close(struct obd_export *exp, struct md_op_data *op_data, ...@@ -813,7 +814,8 @@ static int mdc_close(struct obd_export *exp, struct md_op_data *op_data,
/* To avoid a livelock (bug 7034), we need to send CLOSE RPCs to a /* To avoid a livelock (bug 7034), we need to send CLOSE RPCs to a
* portal whose threads are not taking any DLM locks and are therefore * portal whose threads are not taking any DLM locks and are therefore
* always progressing */ * always progressing
*/
req->rq_request_portal = MDS_READPAGE_PORTAL; req->rq_request_portal = MDS_READPAGE_PORTAL;
ptlrpc_at_set_req_timeout(req); ptlrpc_at_set_req_timeout(req);
...@@ -827,7 +829,8 @@ static int mdc_close(struct obd_export *exp, struct md_op_data *op_data, ...@@ -827,7 +829,8 @@ static int mdc_close(struct obd_export *exp, struct md_op_data *op_data,
DEBUG_REQ(D_HA, mod->mod_open_req, "matched open"); DEBUG_REQ(D_HA, mod->mod_open_req, "matched open");
/* We no longer want to preserve this open for replay even /* We no longer want to preserve this open for replay even
* though the open was committed. b=3632, b=3633 */ * though the open was committed. b=3632, b=3633
*/
spin_lock(&mod->mod_open_req->rq_lock); spin_lock(&mod->mod_open_req->rq_lock);
mod->mod_open_req->rq_replay = 0; mod->mod_open_req->rq_replay = 0;
spin_unlock(&mod->mod_open_req->rq_lock); spin_unlock(&mod->mod_open_req->rq_lock);
...@@ -884,7 +887,8 @@ static int mdc_close(struct obd_export *exp, struct md_op_data *op_data, ...@@ -884,7 +887,8 @@ static int mdc_close(struct obd_export *exp, struct md_op_data *op_data,
if (rc != 0) if (rc != 0)
mod->mod_close_req = NULL; mod->mod_close_req = NULL;
/* Since now, mod is accessed through open_req only, /* Since now, mod is accessed through open_req only,
* thus close req does not keep a reference on mod anymore. */ * thus close req does not keep a reference on mod anymore.
*/
obd_mod_put(mod); obd_mod_put(mod);
} }
*request = req; *request = req;
...@@ -918,7 +922,8 @@ static int mdc_done_writing(struct obd_export *exp, struct md_op_data *op_data, ...@@ -918,7 +922,8 @@ static int mdc_done_writing(struct obd_export *exp, struct md_op_data *op_data,
mod->mod_close_req = req; mod->mod_close_req = req;
DEBUG_REQ(D_HA, mod->mod_open_req, "matched setattr"); DEBUG_REQ(D_HA, mod->mod_open_req, "matched setattr");
/* We no longer want to preserve this setattr for replay even /* We no longer want to preserve this setattr for replay even
* though the open was committed. b=3632, b=3633 */ * though the open was committed. b=3632, b=3633
*/
spin_lock(&mod->mod_open_req->rq_lock); spin_lock(&mod->mod_open_req->rq_lock);
mod->mod_open_req->rq_replay = 0; mod->mod_open_req->rq_replay = 0;
spin_unlock(&mod->mod_open_req->rq_lock); spin_unlock(&mod->mod_open_req->rq_lock);
...@@ -950,7 +955,8 @@ static int mdc_done_writing(struct obd_export *exp, struct md_op_data *op_data, ...@@ -950,7 +955,8 @@ static int mdc_done_writing(struct obd_export *exp, struct md_op_data *op_data,
mdc_free_open(mod); mdc_free_open(mod);
/* Since now, mod is accessed through setattr req only, /* Since now, mod is accessed through setattr req only,
* thus DW req does not keep a reference on mod anymore. */ * thus DW req does not keep a reference on mod anymore.
*/
obd_mod_put(mod); obd_mod_put(mod);
} }
...@@ -1608,7 +1614,8 @@ static int mdc_quotacheck(struct obd_device *unused, struct obd_export *exp, ...@@ -1608,7 +1614,8 @@ static int mdc_quotacheck(struct obd_device *unused, struct obd_export *exp,
ptlrpc_request_set_replen(req); ptlrpc_request_set_replen(req);
/* the next poll will find -ENODATA, that means quotacheck is /* the next poll will find -ENODATA, that means quotacheck is
* going on */ * going on
*/
cli->cl_qchk_stat = -ENODATA; cli->cl_qchk_stat = -ENODATA;
rc = ptlrpc_queue_wait(req); rc = ptlrpc_queue_wait(req);
if (rc) if (rc)
...@@ -1908,7 +1915,8 @@ static int mdc_get_info_rpc(struct obd_export *exp, ...@@ -1908,7 +1915,8 @@ static int mdc_get_info_rpc(struct obd_export *exp,
rc = ptlrpc_queue_wait(req); rc = ptlrpc_queue_wait(req);
/* -EREMOTE means the get_info result is partial, and it needs to /* -EREMOTE means the get_info result is partial, and it needs to
* continue on another MDT, see fid2path part in lmv_iocontrol */ * continue on another MDT, see fid2path part in lmv_iocontrol
*/
if (rc == 0 || rc == -EREMOTE) { if (rc == 0 || rc == -EREMOTE) {
tmp = req_capsule_server_get(&req->rq_pill, &RMF_GETINFO_VAL); tmp = req_capsule_server_get(&req->rq_pill, &RMF_GETINFO_VAL);
memcpy(val, tmp, vallen); memcpy(val, tmp, vallen);
...@@ -2247,7 +2255,8 @@ static int mdc_cancel_for_recovery(struct ldlm_lock *lock) ...@@ -2247,7 +2255,8 @@ static int mdc_cancel_for_recovery(struct ldlm_lock *lock)
/* FIXME: if we ever get into a situation where there are too many /* FIXME: if we ever get into a situation where there are too many
* opened files with open locks on a single node, then we really * opened files with open locks on a single node, then we really
* should replay these open locks to reget it */ * should replay these open locks to reget it
*/
if (lock->l_policy_data.l_inodebits.bits & MDS_INODELOCK_OPEN) if (lock->l_policy_data.l_inodebits.bits & MDS_INODELOCK_OPEN)
return 0; return 0;
......
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