return lu_fid_eq(&ll_i2info(inode)->lli_fid, opaque);
}
-int ll_dom_lock_cancel(struct inode *inode, struct ldlm_lock *lock)
+static int ll_dom_lock_cancel(struct inode *inode, struct ldlm_lock *lock)
{
struct lu_env *env;
struct ll_inode_info *lli = ll_i2info(inode);
- struct cl_layout clt = { .cl_layout_gen = 0, };
- int rc;
__u16 refcheck;
-
-
+ int rc;
ENTRY;
if (!lli->lli_clob) {
if (IS_ERR(env))
RETURN(PTR_ERR(env));
- rc = cl_object_layout_get(env, lli->lli_clob, &clt);
- if (rc) {
- CDEBUG(D_INODE, "Cannot get layout for "DFID"\n",
- PFID(ll_inode2fid(inode)));
- rc = -ENODATA;
- } else if (clt.cl_size == 0 || clt.cl_dom_comp_size == 0) {
- CDEBUG(D_INODE, "DOM lock without DOM layout for "DFID"\n",
- PFID(ll_inode2fid(inode)));
- } else {
- enum cl_fsync_mode mode;
- loff_t end = clt.cl_dom_comp_size - 1;
+ /* reach MDC layer to flush data under the DoM ldlm lock */
+ rc = cl_object_flush(env, lli->lli_clob, lock);
- mode = ldlm_is_discard_data(lock) ?
- CL_FSYNC_DISCARD : CL_FSYNC_LOCAL;
- rc = cl_sync_file_range(inode, 0, end, mode, 1);
- truncate_inode_pages_range(inode->i_mapping, 0, end);
- }
cl_env_put(env, &refcheck);
RETURN(rc);
}
-void ll_lock_cancel_bits(struct ldlm_lock *lock, __u64 to_cancel)
+static void ll_lock_cancel_bits(struct ldlm_lock *lock, __u64 to_cancel)
{
struct inode *inode = ll_inode_from_resource_lock(lock);
+ struct ll_inode_info *lli;
__u64 bits = to_cancel;
int rc;
}
if (bits & MDS_INODELOCK_XATTR) {
- if (S_ISDIR(inode->i_mode))
- ll_i2info(inode)->lli_def_stripe_offset = -1;
ll_xattr_cache_destroy(inode);
bits &= ~MDS_INODELOCK_XATTR;
}
PFID(ll_inode2fid(inode)), rc);
}
- if (bits & MDS_INODELOCK_UPDATE) {
- struct ll_inode_info *lli = ll_i2info(inode);
+ lli = ll_i2info(inode);
+ if (bits & MDS_INODELOCK_UPDATE)
lli->lli_update_atime = 1;
- }
if ((bits & MDS_INODELOCK_UPDATE) && S_ISDIR(inode->i_mode)) {
- struct ll_inode_info *lli = ll_i2info(inode);
-
CDEBUG(D_INODE, "invalidating inode "DFID" lli = %p, "
"pfid = "DFID"\n", PFID(ll_inode2fid(inode)),
lli, PFID(&lli->lli_pfid));
struct lu_fid fid = ll_i2info(parent)->lli_fid;
/* If it is striped directory, get the real stripe parent */
- if (unlikely(ll_i2info(parent)->lli_lsm_md != NULL)) {
+ if (unlikely(ll_dir_striped(parent))) {
rc = md_get_fid_from_lsm(ll_i2mdexp(parent),
ll_i2info(parent)->lli_lsm_md,
(*de)->d_name.name,
}
if (it->it_op & IT_OPEN && it->it_flags & FMODE_WRITE &&
- dentry->d_sb->s_flags & MS_RDONLY)
+ dentry->d_sb->s_flags & SB_RDONLY)
RETURN(ERR_PTR(-EROFS));
if (it->it_op & IT_CREAT)
lum->lmm_magic = LOV_USER_MAGIC_V1;
lum->lmm_pattern = LOV_PATTERN_F_RELEASED | LOV_PATTERN_RAID0;
- lum->lmm_stripe_size = 0;
- lum->lmm_stripe_count = 0;
- lum->lmm_stripe_offset = 0;
-
op_data->op_data = lum;
op_data->op_data_size = sizeof(*lum);
- op_data->op_archive_id = dataset->pccd_id;
+ op_data->op_archive_id = dataset->pccd_rwid;
rc = obd_fid_alloc(NULL, ll_i2mdexp(parent), &op_data->op_fid2,
op_data);
if (rc)
GOTO(out, retval = ERR_PTR(rc));
- rc = pcc_inode_create(dataset, &op_data->op_fid2,
+ rc = pcc_inode_create(parent->i_sb, dataset, &op_data->op_fid2,
&pca->pca_dentry);
if (rc)
GOTO(out, retval = ERR_PTR(rc));
return de;
}
+#ifdef FMODE_CREATED /* added in Linux v4.18-rc1-20-g73a09dd */
+# define ll_is_opened(o, f) ((f)->f_mode & FMODE_OPENED)
+# define ll_finish_open(f, d, o) finish_open((f), (d), NULL)
+# define ll_last_arg
+# define ll_set_created(o, f) \
+do { \
+ (f)->f_mode |= FMODE_CREATED; \
+} while (0)
+
+#else
+# define ll_is_opened(o, f) (*(o))
+# define ll_finish_open(f, d, o) finish_open((f), (d), NULL, (o))
+# define ll_last_arg , int *opened
+# define ll_set_created(o, f) \
+do { \
+ *(o) |= FILE_CREATED; \
+} while (0)
+
+#endif
+
/*
* For cached negative dentry and new dentry, handle lookup/create/open
* together.
*/
static int ll_atomic_open(struct inode *dir, struct dentry *dentry,
struct file *file, unsigned open_flags,
- umode_t mode, int *opened)
+ umode_t mode ll_last_arg)
{
struct lookup_intent *it;
struct dentry *de;
CDEBUG(D_VFSTRACE, "VFS Op:name=%.*s, dir="DFID"(%p), file %p,"
"open_flags %x, mode %x opened %d\n",
dentry->d_name.len, dentry->d_name.name,
- PFID(ll_inode2fid(dir)), dir, file, open_flags, mode, *opened);
+ PFID(ll_inode2fid(dir)), dir, file, open_flags, mode,
+ ll_is_opened(opened, file));
/* Only negative dentries enter here */
LASSERT(dentry->d_inode == NULL);
/* Volatile file is used for HSM restore, so do not use PCC */
if (!filename_is_volatile(dentry->d_name.name,
dentry->d_name.len, NULL)) {
- dataset = pcc_dataset_get(&sbi->ll_pcc_super,
- ll_i2info(dir)->lli_projid,
- 0);
+ struct pcc_matcher item;
+
+ item.pm_uid = from_kuid(&init_user_ns, current_uid());
+ item.pm_gid = from_kgid(&init_user_ns, current_gid());
+ item.pm_projid = ll_i2info(dir)->lli_projid;
+ item.pm_name = &dentry->d_name;
+ dataset = pcc_dataset_match_get(&sbi->ll_pcc_super,
+ &item);
pca.pca_dataset = dataset;
}
}
GOTO(out_release, rc);
}
}
-
- *opened |= FILE_CREATED;
+ ll_set_created(opened, file);
}
if (dentry->d_inode && it_disposition(it, DISP_OPEN_OPEN)) {
rc = finish_no_open(file, de);
} else {
file->private_data = it;
- rc = finish_open(file, dentry, NULL, opened);
+ rc = ll_finish_open(file, dentry, opened);
/* We dget in ll_splice_alias. finish_open takes
* care of dget for fd open.
*/
it = ll_convert_intent(&nd->intent.open, nd->flags,
(nd->path.mnt->mnt_flags & MNT_READONLY) ||
- (nd->path.mnt->mnt_sb->s_flags & MS_RDONLY));
+ (nd->path.mnt->mnt_sb->s_flags & SB_RDONLY));
if (IS_ERR(it))
RETURN((struct dentry *)it);
}
from_kuid(&init_user_ns, current_fsuid()),
from_kgid(&init_user_ns, current_fsgid()),
cfs_curproc_cap_pack(), rdev, &request);
- if (err < 0 && err != -EREMOTE)
- GOTO(err_exit, err);
-
- /* If the client doesn't know where to create a subdirectory (or
- * in case of a race that sends the RPC to the wrong MDS), the
- * MDS will return -EREMOTE and the client will fetch the layout
- * of the directory, then create the directory on the right MDT. */
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 14, 58, 0)
+ /*
+ * server < 2.12.58 doesn't pack default LMV in intent_getattr reply,
+ * fetch default LMV here.
+ */
if (unlikely(err == -EREMOTE)) {
struct ll_inode_info *lli = ll_i2info(dir);
struct lmv_user_md *lum;
err2 = ll_dir_getstripe(dir, (void **)&lum, &lumsize, &request,
OBD_MD_DEFAULT_MEA);
+ ll_finish_md_op_data(op_data);
+ op_data = NULL;
if (err2 == 0) {
- /* Update stripe_offset and retry */
- lli->lli_def_stripe_offset = lum->lum_stripe_offset;
- } else if (err2 == -ENODATA &&
- lli->lli_def_stripe_offset != -1) {
- /* If there are no default stripe EA on the MDT, but the
+ struct lustre_md md = { NULL };
+
+ md.body = req_capsule_server_get(&request->rq_pill,
+ &RMF_MDT_BODY);
+ if (!md.body)
+ GOTO(err_exit, err = -EPROTO);
+
+ OBD_ALLOC_PTR(md.default_lmv);
+ if (!md.default_lmv)
+ GOTO(err_exit, err = -ENOMEM);
+
+ md.default_lmv->lsm_md_magic = lum->lum_magic;
+ md.default_lmv->lsm_md_stripe_count =
+ lum->lum_stripe_count;
+ md.default_lmv->lsm_md_master_mdt_index =
+ lum->lum_stripe_offset;
+ md.default_lmv->lsm_md_hash_type = lum->lum_hash_type;
+
+ err = ll_update_inode(dir, &md);
+ md_free_lustre_md(sbi->ll_md_exp, &md);
+ if (err)
+ GOTO(err_exit, err);
+ } else if (err2 == -ENODATA && lli->lli_default_lsm_md) {
+ /*
+ * If there are no default stripe EA on the MDT, but the
* client has default stripe, then it probably means
- * default stripe EA has just been deleted. */
- lli->lli_def_stripe_offset = -1;
+ * default stripe EA has just been deleted.
+ */
+ down_write(&lli->lli_lsm_sem);
+ if (lli->lli_default_lsm_md)
+ OBD_FREE_PTR(lli->lli_default_lsm_md);
+ lli->lli_default_lsm_md = NULL;
+ up_write(&lli->lli_lsm_sem);
} else {
GOTO(err_exit, err);
}
ptlrpc_req_finished(request);
request = NULL;
- ll_finish_md_op_data(op_data);
goto again;
}
+#endif
+
+ if (err < 0)
+ GOTO(err_exit, err);
ll_update_times(request, dir);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff