diff options
author | Paul Moore <pmoore@redhat.com> | 2014-03-31 09:49:07 -0400 |
---|---|---|
committer | Paul Moore <pmoore@redhat.com> | 2014-03-31 09:49:07 -0400 |
commit | 6d32c850621b0be75777b9102b14f6268bbd9f0f (patch) | |
tree | fec325f5c1ae763f5eccb3ca1254ab9d9d164b05 /drivers/staging/lustre/lustre/lmv/lmv_obd.c | |
parent | selinux: correctly label /proc inodes in use before the policy is loaded (diff) | |
parent | Linux 3.14 (diff) | |
download | linux-dev-6d32c850621b0be75777b9102b14f6268bbd9f0f.tar.xz linux-dev-6d32c850621b0be75777b9102b14f6268bbd9f0f.zip |
Merge tag 'v3.14' into next
Linux 3.14
Diffstat (limited to 'drivers/staging/lustre/lustre/lmv/lmv_obd.c')
-rw-r--r-- | drivers/staging/lustre/lustre/lmv/lmv_obd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/lustre/lustre/lmv/lmv_obd.c b/drivers/staging/lustre/lustre/lmv/lmv_obd.c index c2866046fc38..1bddd8f62fbf 100644 --- a/drivers/staging/lustre/lustre/lmv/lmv_obd.c +++ b/drivers/staging/lustre/lustre/lmv/lmv_obd.c @@ -628,7 +628,7 @@ static int lmv_disconnect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt) rc = obd_fid_fini(tgt->ltd_exp->exp_obd); if (rc) - CERROR("Can't finanize fids factory\n"); + CERROR("Can't finalize fids factory\n"); CDEBUG(D_INFO, "Disconnected from %s(%s) successfully\n", tgt->ltd_exp->exp_obd->obd_name, @@ -712,7 +712,7 @@ repeat_fid2path: GOTO(out_fid2path, rc); /* If remote_gf != NULL, it means just building the - * path on the remote MDT, copy this path segement to gf */ + * path on the remote MDT, copy this path segment to gf */ if (remote_gf != NULL) { struct getinfo_fid2path *ori_gf; char *ptr; @@ -1212,7 +1212,7 @@ static int lmv_placement_policy(struct obd_device *obd, /** * If stripe_offset is provided during setdirstripe - * (setdirstripe -i xx), xx MDS will be choosen. + * (setdirstripe -i xx), xx MDS will be chosen. */ if (op_data->op_cli_flags & CLI_SET_MEA) { struct lmv_user_md *lum; |