* Get FID of parent MDT object.
*
* This function reads extended attribute XATTR_NAME_FID of OFD object which
- * contains the MDT parent object FID and saves it in ofd_object::ofo_pfid.
+ * contains the MDT parent object FID and saves it in ofd_object::ofo_ff.
*
* The filter_fid::ff_parent::f_ver field currently holds
* the OST-object index in the parent MDT-object's layout EA,
*/
int ofd_object_ff_load(const struct lu_env *env, struct ofd_object *fo)
{
- struct ofd_thread_info *info = ofd_info(env);
- struct filter_fid_old *ff = &info->fti_mds_fid_old;
- struct lu_buf *buf = &info->fti_buf;
- struct lu_fid *pfid = &fo->ofo_pfid;
- int rc = 0;
+ struct ofd_thread_info *info = ofd_info(env);
+ struct filter_fid *ff = &fo->ofo_ff;
+ struct lu_buf *buf = &info->fti_buf;
+ int rc = 0;
- if (fid_is_sane(pfid))
+ if (fid_is_sane(&ff->ff_parent))
return 0;
buf->lb_buf = ff;
if (rc < 0)
return rc;
- if (rc < sizeof(struct lu_fid)) {
- fid_zero(pfid);
+ if (unlikely(rc < sizeof(struct lu_fid))) {
+ fid_zero(&ff->ff_parent);
return -ENODATA;
}
- pfid->f_seq = le64_to_cpu(ff->ff_parent.f_seq);
- pfid->f_oid = le32_to_cpu(ff->ff_parent.f_oid);
- pfid->f_stripe_idx = le32_to_cpu(ff->ff_parent.f_stripe_idx);
+ filter_fid_le_to_cpu(ff, ff, rc);
return 0;
}
/**
- * Put OFD object reference.
- *
- * \param[in] env execution environment
- * \param[in] fo OFD object
- */
-void ofd_object_put(const struct lu_env *env, struct ofd_object *fo)
-{
- lu_object_put(env, &fo->ofo_obj.do_lu);
-}
-
-/**
* Precreate the given number \a nr of objects in the given sequence \a oseq.
*
* This function precreates new OST objects in the given sequence.
RETURN(-ENOMEM);
info->fti_attr.la_valid = LA_TYPE | LA_MODE;
- info->fti_attr.la_mode = S_IFREG | S_ISUID | S_ISGID | 0666;
+ info->fti_attr.la_mode = S_IFREG | S_ISUID | S_ISGID | S_ISVTX | 0666;
info->fti_dof.dof_type = dt_mode_to_dft(S_IFREG);
info->fti_attr.la_valid |= LA_ATIME | LA_MTIME | LA_CTIME;
/* Only the new created objects need to be recorded. */
if (ofd->ofd_osd->dd_record_fid_accessed) {
- struct lfsck_request *lr = &ofd_info(env)->fti_lr;
+ struct lfsck_req_local *lrl = &ofd_info(env)->fti_lrl;
- lfsck_pack_rfa(lr, lu_object_fid(&fo->ofo_obj.do_lu),
- LE_FID_ACCESSED,
- LFSCK_TYPE_LAYOUT);
- lfsck_in_notify(env, ofd->ofd_osd, lr, NULL);
+ lfsck_pack_rfa(lrl, lu_object_fid(&fo->ofo_obj.do_lu),
+ LEL_FID_ACCESSED, LFSCK_TYPE_LAYOUT);
+ lfsck_in_notify_local(env, ofd->ofd_osd, lrl, NULL);
}
if (likely(!ofd_object_exists(fo) &&
*
* If the object still has SUID+SGID bits set, meaning that it was precreated
* by the MDT before it was assigned to any file, (see ofd_precreate_objects())
- * then we will accept the UID+GID if sent by the client for initializing the
- * ownership of this object. We only allow this to happen once (so clear these
- * bits) and later only allow setattr.
+ * then we will accept the UID/GID/PROJID if sent by the client for initializing
+ * the ownership of this object. We only allow this to happen once (so clear
+ * these bits) and later only allow setattr.
*
* \param[in] env execution environment
* \param[in] fo OFD object
* \retval 0 if successful
* \retval negative value on error
*/
-int ofd_attr_handle_ugid(const struct lu_env *env, struct ofd_object *fo,
+int ofd_attr_handle_id(const struct lu_env *env, struct ofd_object *fo,
struct lu_attr *la, int is_setattr)
{
struct ofd_thread_info *info = ofd_info(env);
ENTRY;
- if (!(la->la_valid & LA_UID) && !(la->la_valid & LA_GID))
+ if (!(la->la_valid & LA_UID) && !(la->la_valid & LA_GID) &&
+ !(la->la_valid & LA_PROJID))
RETURN(0);
rc = dt_attr_get(env, ofd_object_child(fo), ln);
LASSERT(ln->la_valid & LA_MODE);
+ /*
+ * Only allow setattr to change UID/GID/PROJID, if
+ * SUID+SGID is not set which means this is not
+ * initialization of this objects.
+ */
if (!is_setattr) {
if (!(ln->la_mode & S_ISUID))
la->la_valid &= ~LA_UID;
if (!(ln->la_mode & S_ISGID))
la->la_valid &= ~LA_GID;
+ if (!(ln->la_mode & S_ISVTX))
+ la->la_valid &= ~LA_PROJID;
}
+ /* Initialize ownership of this object, clear SUID+SGID bits*/
if ((la->la_valid & LA_UID) && (ln->la_mode & S_ISUID))
mask |= S_ISUID;
if ((la->la_valid & LA_GID) && (ln->la_mode & S_ISGID))
mask |= S_ISGID;
+ if ((la->la_valid & LA_PROJID) && (ln->la_mode & S_ISVTX))
+ mask |= S_ISVTX;
if (mask != 0) {
if (!(la->la_valid & LA_MODE) || !is_setattr) {
la->la_mode = ln->la_mode;
if (rc)
GOTO(unlock, rc);
- rc = ofd_attr_handle_ugid(env, fo, la, 1 /* is_setattr */);
+ rc = ofd_attr_handle_id(env, fo, la, 1 /* is_setattr */);
if (rc != 0)
GOTO(unlock, rc);
GOTO(stop, rc);
if (ff_needed) {
+ if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_UNMATCHED_PAIR1))
+ ff->ff_parent.f_oid = cpu_to_le32(1UL << 31);
+ else if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_UNMATCHED_PAIR2))
+ le32_add_cpu(&ff->ff_parent.f_oid, -1);
+
info->fti_buf.lb_buf = ff;
info->fti_buf.lb_len = sizeof(*ff);
rc = dt_declare_xattr_set(env, ofd_object_child(fo),
GOTO(stop, rc);
if (ff_needed) {
+ if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_NOPFID))
+ GOTO(stop, rc);
+
rc = dt_xattr_set(env, ofd_object_child(fo), &info->fti_buf,
XATTR_NAME_FID, 0, th);
- if (rc == 0) {
- fo->ofo_pfid.f_seq = le64_to_cpu(ff->ff_parent.f_seq);
- fo->ofo_pfid.f_oid = le32_to_cpu(ff->ff_parent.f_oid);
- /* Currently, the filter_fid::ff_parent::f_ver is not
- * the real parent MDT-object's FID::f_ver, instead it
- * is the OST-object index in its parent MDT-object's
- * layout EA. */
- fo->ofo_pfid.f_stripe_idx =
- le32_to_cpu(ff->ff_parent.f_stripe_idx);
- }
+ if (!rc)
+ filter_fid_le_to_cpu(&fo->ofo_ff, ff, sizeof(*ff));
}
GOTO(stop, rc);
if (rc)
GOTO(unlock, rc);
- rc = ofd_attr_handle_ugid(env, fo, la, 0 /* !is_setattr */);
+ rc = ofd_attr_handle_id(env, fo, la, 0 /* !is_setattr */);
if (rc != 0)
GOTO(unlock, rc);
GOTO(stop, rc);
if (ff_needed) {
+ if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_UNMATCHED_PAIR1))
+ ff->ff_parent.f_oid = cpu_to_le32(1UL << 31);
+ else if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_UNMATCHED_PAIR2))
+ le32_add_cpu(&ff->ff_parent.f_oid, -1);
+
info->fti_buf.lb_buf = ff;
info->fti_buf.lb_len = sizeof(*ff);
rc = dt_declare_xattr_set(env, ofd_object_child(fo),
GOTO(stop, rc);
if (ff_needed) {
+ if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_NOPFID))
+ GOTO(stop, rc);
+
rc = dt_xattr_set(env, ofd_object_child(fo), &info->fti_buf,
XATTR_NAME_FID, 0, th);
- if (rc == 0) {
- fo->ofo_pfid.f_seq = le64_to_cpu(ff->ff_parent.f_seq);
- fo->ofo_pfid.f_oid = le32_to_cpu(ff->ff_parent.f_oid);
- /* Currently, the filter_fid::ff_parent::f_ver is not
- * the real parent MDT-object's FID::f_ver, instead it
- * is the OST-object index in its parent MDT-object's
- * layout EA. */
- fo->ofo_pfid.f_stripe_idx =
- le32_to_cpu(ff->ff_parent.f_stripe_idx);
- }
+ if (!rc)
+ filter_fid_le_to_cpu(&fo->ofo_ff, ff, sizeof(*ff));
}
GOTO(stop, rc);
* \retval 0 if successful
* \retval negative value on error
*/
-int ofd_object_destroy(const struct lu_env *env, struct ofd_object *fo,
+int ofd_destroy(const struct lu_env *env, struct ofd_object *fo,
int orphan)
{
struct ofd_device *ofd = ofd_obj2dev(fo);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff