[lustre-devel] [PATCH 25/32] lustre: quota: skip non-exist or inact tgt for lfs_quota
James Simmons
jsimmons at infradead.org
Wed Aug 3 18:38:10 PDT 2022
From: Hongchao Zhang <hongchao at whamcloud.com>
The nonexistent or inactive targets (MDC or OSC) should be skipped
for quota reporting.
WC-bug-id: https://jira.whamcloud.com/browse/LU-14472
Lustre-commit: b54b7ce43929ce7ff ("LU-14472 quota: skip non-exist or inact tgt for lfs_quota")
Signed-off-by: Hongchao Zhang <hongchao at whamcloud.com>
Reviewed-on: https://review.whamcloud.com/41771
Reviewed-by: Andreas Dilger <adilger at whamcloud.com>
Reviewed-by: Feng, Lei <flei at whamcloud.com>
Reviewed-by: Oleg Drokin <green at whamcloud.com>
Signed-off-by: James Simmons <jsimmons at infradead.org>
---
fs/lustre/llite/dir.c | 8 +++-----
fs/lustre/lmv/lmv_obd.c | 15 +++++++++++++--
fs/lustre/lov/lov_obd.c | 13 ++++++++++++-
3 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/fs/lustre/llite/dir.c b/fs/lustre/llite/dir.c
index 2b63c48..26c9ec3 100644
--- a/fs/lustre/llite/dir.c
+++ b/fs/lustre/llite/dir.c
@@ -1215,10 +1215,9 @@ int quotactl_ioctl(struct super_block *sb, struct if_quotactl *qctl)
break;
}
+ qctl->qc_cmd = cmd;
if (rc)
return rc;
-
- qctl->qc_cmd = cmd;
} else {
struct obd_quotactl *oqctl;
int oqctl_len = sizeof(*oqctl);
@@ -2009,10 +2008,9 @@ static long ll_dir_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
}
rc = quotactl_ioctl(inode->i_sb, qctl);
- if (rc == 0 && copy_to_user((void __user *)arg, qctl,
- sizeof(*qctl)))
+ if ((rc == 0 || rc == -ENODATA) &&
+ copy_to_user((void __user *)arg, qctl, sizeof(*qctl)))
rc = -EFAULT;
-
out_quotactl:
kfree(qctl);
return rc;
diff --git a/fs/lustre/lmv/lmv_obd.c b/fs/lustre/lmv/lmv_obd.c
index 8656d6b..6c0eb03 100644
--- a/fs/lustre/lmv/lmv_obd.c
+++ b/fs/lustre/lmv/lmv_obd.c
@@ -845,6 +845,7 @@ static int lmv_iocontrol(unsigned int cmd, struct obd_export *exp,
case OBD_IOC_QUOTACTL: {
struct if_quotactl *qctl = karg;
struct obd_quotactl *oqctl;
+ struct obd_import *imp;
if (qctl->qc_valid == QC_MDTIDX) {
tgt = lmv_tgt(lmv, qctl->qc_idx);
@@ -863,9 +864,19 @@ static int lmv_iocontrol(unsigned int cmd, struct obd_export *exp,
return -EINVAL;
}
- if (!tgt || !tgt->ltd_exp)
+ if (!tgt)
+ return -ENODEV;
+
+ if (!tgt->ltd_exp)
return -EINVAL;
+ imp = class_exp2cliimp(tgt->ltd_exp);
+ if (!tgt->ltd_active && imp->imp_state != LUSTRE_IMP_IDLE) {
+ qctl->qc_valid = QC_MDTIDX;
+ qctl->obd_uuid = tgt->ltd_uuid;
+ return -ENODATA;
+ }
+
oqctl = kzalloc(sizeof(*oqctl), GFP_KERNEL);
if (!oqctl)
return -ENOMEM;
@@ -3122,7 +3133,7 @@ static int lmv_get_info(const struct lu_env *env, struct obd_export *exp,
exp->exp_connect_data = *(struct obd_connect_data *)val;
return rc;
} else if (KEY_IS(KEY_TGT_COUNT)) {
- *((int *)val) = lmv->lmv_mdt_descs.ltd_lmv_desc.ld_tgt_count;
+ *((int *)val) = lmv->lmv_mdt_descs.ltd_tgts_size;
return 0;
}
diff --git a/fs/lustre/lov/lov_obd.c b/fs/lustre/lov/lov_obd.c
index 161226f..d2fe8c3 100644
--- a/fs/lustre/lov/lov_obd.c
+++ b/fs/lustre/lov/lov_obd.c
@@ -1021,13 +1021,17 @@ static int lov_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
struct if_quotactl *qctl = karg;
struct lov_tgt_desc *tgt = NULL;
struct obd_quotactl *oqctl;
+ struct obd_import *imp;
if (qctl->qc_valid == QC_OSTIDX) {
if (count <= qctl->qc_idx)
return -EINVAL;
tgt = lov->lov_tgts[qctl->qc_idx];
- if (!tgt || !tgt->ltd_exp)
+ if (!tgt)
+ return -ENODEV;
+
+ if (!tgt->ltd_exp)
return -EINVAL;
} else if (qctl->qc_valid == QC_UUID) {
for (i = 0; i < count; i++) {
@@ -1050,6 +1054,13 @@ static int lov_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
return -EAGAIN;
LASSERT(tgt && tgt->ltd_exp);
+ imp = class_exp2cliimp(tgt->ltd_exp);
+ if (!tgt->ltd_active && imp->imp_state != LUSTRE_IMP_IDLE) {
+ qctl->qc_valid = QC_OSTIDX;
+ qctl->obd_uuid = tgt->ltd_uuid;
+ return -ENODATA;
+ }
+
oqctl = kzalloc(sizeof(*oqctl), GFP_NOFS);
if (!oqctl)
return -ENOMEM;
--
1.8.3.1
More information about the lustre-devel
mailing list