Commit e5e663ae authored by Srikrishan Malik's avatar Srikrishan Malik Committed by Greg Kroah-Hartman

staging: lustre: fix lines over 80 chars

Fixes the following  checkpatch warning:

WARNING: line over 80 characters
Signed-off-by: default avatarSrikrishan Malik <srikrishanmalik@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 982ec91f
...@@ -56,7 +56,8 @@ static ssize_t mdc_max_rpcs_in_flight_seq_write(struct file *file, ...@@ -56,7 +56,8 @@ static ssize_t mdc_max_rpcs_in_flight_seq_write(struct file *file,
size_t count, size_t count,
loff_t *off) loff_t *off)
{ {
struct obd_device *dev = ((struct seq_file *)file->private_data)->private; struct obd_device *dev =
((struct seq_file *)file->private_data)->private;
struct client_obd *cli = &dev->u.cli; struct client_obd *cli = &dev->u.cli;
int val, rc; int val, rc;
...@@ -84,7 +85,8 @@ static int mdc_kuc_open(struct inode *inode, struct file *file) ...@@ -84,7 +85,8 @@ static int mdc_kuc_open(struct inode *inode, struct file *file)
static ssize_t mdc_kuc_write(struct file *file, const char *buffer, static ssize_t mdc_kuc_write(struct file *file, const char *buffer,
size_t count, loff_t *off) size_t count, loff_t *off)
{ {
struct obd_device *obd = ((struct seq_file *)file->private_data)->private; struct obd_device *obd =
((struct seq_file *)file->private_data)->private;
struct kuc_hdr *lh; struct kuc_hdr *lh;
struct hsm_action_list *hal; struct hsm_action_list *hal;
struct hsm_action_item *hai; struct hsm_action_item *hai;
......
...@@ -52,7 +52,8 @@ static void __mdc_pack_body(struct mdt_body *b, __u32 suppgid) ...@@ -52,7 +52,8 @@ static void __mdc_pack_body(struct mdt_body *b, __u32 suppgid)
b->capability = cfs_curproc_cap_pack(); b->capability = cfs_curproc_cap_pack();
} }
void mdc_pack_capa(struct ptlrpc_request *req, const struct req_msg_field *field, void mdc_pack_capa(struct ptlrpc_request *req,
const struct req_msg_field *field,
struct obd_capa *oc) struct obd_capa *oc)
{ {
struct req_capsule *pill = &req->rq_pill; struct req_capsule *pill = &req->rq_pill;
...@@ -317,7 +318,8 @@ static void mdc_setattr_pack_rec(struct mdt_rec_setattr *rec, ...@@ -317,7 +318,8 @@ static void mdc_setattr_pack_rec(struct mdt_rec_setattr *rec,
rec->sa_atime = LTIME_S(op_data->op_attr.ia_atime); rec->sa_atime = LTIME_S(op_data->op_attr.ia_atime);
rec->sa_mtime = LTIME_S(op_data->op_attr.ia_mtime); rec->sa_mtime = LTIME_S(op_data->op_attr.ia_mtime);
rec->sa_ctime = LTIME_S(op_data->op_attr.ia_ctime); rec->sa_ctime = LTIME_S(op_data->op_attr.ia_ctime);
rec->sa_attr_flags = ((struct ll_iattr *)&op_data->op_attr)->ia_attr_flags; rec->sa_attr_flags =
((struct ll_iattr *)&op_data->op_attr)->ia_attr_flags;
if ((op_data->op_attr.ia_valid & ATTR_GID) && if ((op_data->op_attr.ia_valid & ATTR_GID) &&
in_group_p(op_data->op_attr.ia_gid)) in_group_p(op_data->op_attr.ia_gid))
rec->sa_suppgid = rec->sa_suppgid =
...@@ -552,7 +554,8 @@ int mdc_enter_request(struct client_obd *cli) ...@@ -552,7 +554,8 @@ int mdc_enter_request(struct client_obd *cli)
list_add_tail(&mcw.mcw_entry, &cli->cl_cache_waiters); list_add_tail(&mcw.mcw_entry, &cli->cl_cache_waiters);
init_waitqueue_head(&mcw.mcw_waitq); init_waitqueue_head(&mcw.mcw_waitq);
client_obd_list_unlock(&cli->cl_loi_list_lock); client_obd_list_unlock(&cli->cl_loi_list_lock);
rc = l_wait_event(mcw.mcw_waitq, mdc_req_avail(cli, &mcw), &lwi); rc = l_wait_event(mcw.mcw_waitq, mdc_req_avail(cli, &mcw),
&lwi);
if (rc) { if (rc) {
client_obd_list_lock(&cli->cl_loi_list_lock); client_obd_list_lock(&cli->cl_loi_list_lock);
if (list_empty(&mcw.mcw_entry)) if (list_empty(&mcw.mcw_entry))
......
...@@ -450,8 +450,8 @@ static struct ptlrpc_request *mdc_intent_unlink_pack(struct obd_export *exp, ...@@ -450,8 +450,8 @@ static struct ptlrpc_request *mdc_intent_unlink_pack(struct obd_export *exp,
} }
static struct ptlrpc_request *mdc_intent_getattr_pack(struct obd_export *exp, static struct ptlrpc_request *mdc_intent_getattr_pack(struct obd_export *exp,
struct lookup_intent *it, struct lookup_intent *it,
struct md_op_data *op_data) struct md_op_data *op_data)
{ {
struct ptlrpc_request *req; struct ptlrpc_request *req;
struct obd_device *obddev = class_exp2obd(exp); struct obd_device *obddev = class_exp2obd(exp);
...@@ -1039,7 +1039,8 @@ static int mdc_finish_intent_lock(struct obd_export *exp, ...@@ -1039,7 +1039,8 @@ static int mdc_finish_intent_lock(struct obd_export *exp,
memcpy(&old_lock, lockh, sizeof(*lockh)); memcpy(&old_lock, lockh, sizeof(*lockh));
if (ldlm_lock_match(NULL, LDLM_FL_BLOCK_GRANTED, NULL, if (ldlm_lock_match(NULL, LDLM_FL_BLOCK_GRANTED, NULL,
LDLM_IBITS, &policy, LCK_NL, &old_lock, 0)) { LDLM_IBITS, &policy, LCK_NL,
&old_lock, 0)) {
ldlm_lock_decref_and_cancel(lockh, ldlm_lock_decref_and_cancel(lockh,
it->d.lustre.it_lock_mode); it->d.lustre.it_lock_mode);
memcpy(lockh, &old_lock, sizeof(old_lock)); memcpy(lockh, &old_lock, sizeof(old_lock));
......
...@@ -897,7 +897,8 @@ int mdc_close(struct obd_export *exp, struct md_op_data *op_data, ...@@ -897,7 +897,8 @@ int mdc_close(struct obd_export *exp, struct md_op_data *op_data,
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);
} else { } else {
CDEBUG(D_HA, "couldn't find open req; expecting close error\n"); CDEBUG(D_HA,
"couldn't find open req; expecting close error\n");
} }
mdc_close_pack(req, op_data); mdc_close_pack(req, op_data);
...@@ -1084,7 +1085,8 @@ int mdc_readpage(struct obd_export *exp, struct md_op_data *op_data, ...@@ -1084,7 +1085,8 @@ int mdc_readpage(struct obd_export *exp, struct md_op_data *op_data,
CERROR("too many resend retries, returning error\n"); CERROR("too many resend retries, returning error\n");
return -EIO; return -EIO;
} }
lwi = LWI_TIMEOUT_INTR(cfs_time_seconds(resends), NULL, NULL, NULL); lwi = LWI_TIMEOUT_INTR(cfs_time_seconds(resends),
NULL, NULL, NULL);
l_wait_event(waitq, 0, &lwi); l_wait_event(waitq, 0, &lwi);
goto restart_bulk; goto restart_bulk;
......
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