From: Andreas Dilger Date: Fri, 19 Oct 2018 03:43:11 +0000 (-0400) Subject: LU-10030 idl: use proper ATTR/MDS_ATTR/MDS_OPEN flags X-Git-Tag: 2.12.0-RC1~144 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=9c2ffe39bd32f85dab4fbb13855112e57b1dbc5a;p=fs%2Flustre-release.git LU-10030 idl: use proper ATTR/MDS_ATTR/MDS_OPEN flags Add proper MDS_ATTR_* and MDS_OPEN_* flags for different flags namespaces. The MDS_OPEN_OWNEROVERRIDE was being mapped into the MDS_ATTR_* flags in some cases. This did not conflict yet, but add separate ATTR_OVERRIDE and MDS_ATTR_OVERRIDE flags for this use so they don't conflict in the future. Remove the MDS_OPEN_CROSS flag, since this was only used internally as a hack to pass open flags to mdd_permission(), but was truncating the u64 open flags to a 32-bit int in the process. Do the convert to MAY_* flags at the MDT layer instead of inside mdd_permission() by moving the accmode() flag conversion into lustre_mds.h code. The ATTR_OPEN flag has existed since kernel 2.6.27, so we can always use that directly instead of the ATTR_FROM_OPEN flag we #defined. The ATTR_RAW flag is no longer used at all and can be removed. Rename various "flags" uses in the code to "open_flags" so that it is more clear which flags values are being used. This exposed a few places in the code where we were using an int to pass these flags, but some of the MDS_OPEN_* flags are using 64-bit values already. Signed-off-by: Andreas Dilger Change-Id: I833a6e6102f947a9276cb6bf03826fd4a5ecab07 Reviewed-on: https://review.whamcloud.com/32107 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: John L. Hammond Reviewed-by: Oleg Drokin --- diff --git a/lustre/include/lustre_mds.h b/lustre/include/lustre_mds.h index 09a4101..cb43281 100644 --- a/lustre/include/lustre_mds.h +++ b/lustre/include/lustre_mds.h @@ -68,10 +68,26 @@ struct md_rejig_data { #define MDD_OBD_NAME "mdd_obd" #define MDD_OBD_UUID "mdd_obd_uuid" -static inline int md_should_create(__u64 flags) +static inline int md_should_create(u64 open_flags) { - return !(flags & MDS_OPEN_DELAY_CREATE) && (flags & MDS_FMODE_WRITE) && - !(flags & MDS_OPEN_LEASE); + return !(open_flags & MDS_OPEN_DELAY_CREATE) && + (open_flags & MDS_FMODE_WRITE) && + !(open_flags & MDS_OPEN_LEASE); +} + +/* do NOT or the MAY_*'s, you'll get the weakest */ +static inline int mds_accmode(u64 open_flags) +{ + int res = 0; + + if (open_flags & MDS_FMODE_READ) + res |= MAY_READ; + if (open_flags & (MDS_FMODE_WRITE | MDS_OPEN_TRUNC | MDS_OPEN_APPEND)) + res |= MAY_WRITE; + if (open_flags & MDS_FMODE_EXEC) + res = MAY_EXEC; + + return res; } /** @} mds */ diff --git a/lustre/include/lustre_patchless_compat.h b/lustre/include/lustre_patchless_compat.h index fd7f82d..b607087 100644 --- a/lustre/include/lustre_patchless_compat.h +++ b/lustre/include/lustre_patchless_compat.h @@ -111,18 +111,6 @@ truncate_complete_page(struct address_space *mapping, struct page *page) # define ll_d_count(d) ((d)->d_count) #endif /* HAVE_DCACHE_LOCK */ -#ifdef ATTR_OPEN -# define ATTR_FROM_OPEN ATTR_OPEN -#else -# ifndef ATTR_FROM_OPEN -# define ATTR_FROM_OPEN 0 -# endif -#endif /* ATTR_OPEN */ - -#ifndef ATTR_RAW -#define ATTR_RAW 0 -#endif - #ifndef HAVE_IN_COMPAT_SYSCALL #define in_compat_syscall is_compat_task #endif diff --git a/lustre/include/md_object.h b/lustre/include/md_object.h index 9e54f79..242e90d 100644 --- a/lustre/include/md_object.h +++ b/lustre/include/md_object.h @@ -148,7 +148,7 @@ struct md_op_spec { } sp_ea; } u; - /** Create flag from client: such as MDS_OPEN_CREAT, and others. */ + /** Open flags from client: such as MDS_OPEN_CREAT, and others. */ __u64 sp_cr_flags; /* File security context for creates. */ @@ -193,51 +193,52 @@ union ldlm_policy_data; * Operations implemented for each md object (both directory and leaf). */ struct md_object_operations { - int (*moo_permission)(const struct lu_env *env, - struct md_object *pobj, struct md_object *cobj, - struct md_attr *attr, int mask); + int (*moo_permission)(const struct lu_env *env, + struct md_object *pobj, struct md_object *cobj, + struct md_attr *attr, int mask); - int (*moo_attr_get)(const struct lu_env *env, struct md_object *obj, - struct md_attr *attr); + int (*moo_attr_get)(const struct lu_env *env, struct md_object *obj, + struct md_attr *attr); - int (*moo_attr_set)(const struct lu_env *env, struct md_object *obj, - const struct md_attr *attr); + int (*moo_attr_set)(const struct lu_env *env, struct md_object *obj, + const struct md_attr *attr); - int (*moo_xattr_get)(const struct lu_env *env, struct md_object *obj, - struct lu_buf *buf, const char *name); + int (*moo_xattr_get)(const struct lu_env *env, struct md_object *obj, + struct lu_buf *buf, const char *name); - int (*moo_xattr_list)(const struct lu_env *env, struct md_object *obj, - struct lu_buf *buf); + int (*moo_xattr_list)(const struct lu_env *env, struct md_object *obj, + struct lu_buf *buf); - int (*moo_xattr_set)(const struct lu_env *env, struct md_object *obj, - const struct lu_buf *buf, const char *name, - int fl); + int (*moo_xattr_set)(const struct lu_env *env, struct md_object *obj, + const struct lu_buf *buf, const char *name, + int fl); - int (*moo_xattr_del)(const struct lu_env *env, struct md_object *obj, - const char *name); + int (*moo_xattr_del)(const struct lu_env *env, struct md_object *obj, + const char *name); /** This method is used to swap the layouts between 2 objects */ int (*moo_swap_layouts)(const struct lu_env *env, struct md_object *obj1, struct md_object *obj2, __u64 flags); - /** \retval number of bytes actually read upon success */ - int (*moo_readpage)(const struct lu_env *env, struct md_object *obj, - const struct lu_rdpg *rdpg); + /** \retval number of bytes actually read upon success */ + int (*moo_readpage)(const struct lu_env *env, struct md_object *obj, + const struct lu_rdpg *rdpg); + + int (*moo_readlink)(const struct lu_env *env, struct md_object *obj, + struct lu_buf *buf); - int (*moo_readlink)(const struct lu_env *env, struct md_object *obj, - struct lu_buf *buf); int (*moo_changelog)(const struct lu_env *env, enum changelog_rec_type type, int flags, struct md_device *m, const struct lu_fid *fid); - int (*moo_open)(const struct lu_env *env, - struct md_object *obj, int flag); + int (*moo_open)(const struct lu_env *env, + struct md_object *obj, u64 open_flags); - int (*moo_close)(const struct lu_env *env, struct md_object *obj, - struct md_attr *ma, int mode); + int (*moo_close)(const struct lu_env *env, struct md_object *obj, + struct md_attr *ma, u64 open_flags); - int (*moo_object_sync)(const struct lu_env *, struct md_object *); + int (*moo_object_sync)(const struct lu_env *, struct md_object *); int (*moo_object_lock)(const struct lu_env *env, struct md_object *obj, struct lustre_handle *lh, @@ -386,22 +387,19 @@ static inline struct md_object *md_object_find_slice(const struct lu_env *env, /** md operations */ -static inline int mo_permission(const struct lu_env *env, - struct md_object *p, - struct md_object *c, - struct md_attr *at, - int mask) +static inline int mo_permission(const struct lu_env *env, struct md_object *p, + struct md_object *c, struct md_attr *at, + int mask) { - LASSERT(c->mo_ops->moo_permission); - return c->mo_ops->moo_permission(env, p, c, at, mask); + LASSERT(c->mo_ops->moo_permission); + return c->mo_ops->moo_permission(env, p, c, at, mask); } -static inline int mo_attr_get(const struct lu_env *env, - struct md_object *m, - struct md_attr *at) +static inline int mo_attr_get(const struct lu_env *env, struct md_object *m, + struct md_attr *at) { - LASSERT(m->mo_ops->moo_attr_get); - return m->mo_ops->moo_attr_get(env, m, at); + LASSERT(m->mo_ops->moo_attr_get); + return m->mo_ops->moo_attr_get(env, m, at); } static inline int mo_readlink(const struct lu_env *env, @@ -506,21 +504,18 @@ static inline int mo_swap_layouts(const struct lu_env *env, return o1->mo_ops->moo_swap_layouts(env, o1, o2, flags); } -static inline int mo_open(const struct lu_env *env, - struct md_object *m, - int flags) +static inline int mo_open(const struct lu_env *env, struct md_object *m, + u64 open_flags) { - LASSERT(m->mo_ops->moo_open); - return m->mo_ops->moo_open(env, m, flags); + LASSERT(m->mo_ops->moo_open); + return m->mo_ops->moo_open(env, m, open_flags); } -static inline int mo_close(const struct lu_env *env, - struct md_object *m, - struct md_attr *ma, - int mode) +static inline int mo_close(const struct lu_env *env, struct md_object *m, + struct md_attr *ma, u64 open_flags) { - LASSERT(m->mo_ops->moo_close); - return m->mo_ops->moo_close(env, m, ma, mode); + LASSERT(m->mo_ops->moo_close); + return m->mo_ops->moo_close(env, m, ma, open_flags); } static inline int mo_readpage(const struct lu_env *env, diff --git a/lustre/include/uapi/linux/lustre/lustre_idl.h b/lustre/include/uapi/linux/lustre/lustre_idl.h index a4ecd35..ff8ab1a 100644 --- a/lustre/include/uapi/linux/lustre/lustre_idl.h +++ b/lustre/include/uapi/linux/lustre/lustre_idl.h @@ -1908,6 +1908,7 @@ struct mdt_rec_setattr { #define MDS_ATTR_PROJID 0x10000ULL /* = 65536 */ #define MDS_ATTR_LSIZE 0x20000ULL /* = 131072 */ #define MDS_ATTR_LBLOCKS 0x40000ULL /* = 262144 */ +#define MDS_ATTR_OVERRIDE 0x2000000ULL /* = 33554432 */ enum mds_op_bias { /* MDS_CHECK_SPLIT = 1 << 0, obsolete before 2.3.58 */ diff --git a/lustre/include/uapi/linux/lustre/lustre_user.h b/lustre/include/uapi/linux/lustre/lustre_user.h index e7d6fa4..6913d99 100644 --- a/lustre/include/uapi/linux/lustre/lustre_user.h +++ b/lustre/include/uapi/linux/lustre/lustre_user.h @@ -1043,7 +1043,7 @@ enum la_valid { /* MDS_FMODE_SOM 04000000 obsolete since 2.8.0 */ #define MDS_OPEN_CREATED 00000010 -#define MDS_OPEN_CROSS 00000020 +/* MDS_OPEN_CROSS 00000020 obsolete in 2.12, internal use only */ #define MDS_OPEN_CREAT 00000100 #define MDS_OPEN_EXCL 00000200 diff --git a/lustre/llite/file.c b/lustre/llite/file.c index 2bcab21..4f7d2b8 100644 --- a/lustre/llite/file.c +++ b/lustre/llite/file.c @@ -690,12 +690,13 @@ int ll_file_open(struct inode *inode, struct file *file) if (file->f_flags & O_TRUNC) oit.it_flags |= FMODE_WRITE; - /* kernel only call f_op->open in dentry_open. filp_open calls - * dentry_open after call to open_namei that checks permissions. - * Only nfsd_open call dentry_open directly without checking - * permissions and because of that this code below is safe. */ - if (oit.it_flags & (FMODE_WRITE | FMODE_READ)) - oit.it_flags |= MDS_OPEN_OWNEROVERRIDE; + /* kernel only call f_op->open in dentry_open. filp_open calls + * dentry_open after call to open_namei that checks permissions. + * Only nfsd_open call dentry_open directly without checking + * permissions and because of that this code below is safe. + */ + if (oit.it_flags & (FMODE_WRITE | FMODE_READ)) + oit.it_flags |= MDS_OPEN_OWNEROVERRIDE; /* We do not want O_EXCL here, presumably we opened the file * already? XXX - NFS implications? */ diff --git a/lustre/mdc/mdc_lib.c b/lustre/mdc/mdc_lib.c index 9380d74..f6e0066 100644 --- a/lustre/mdc/mdc_lib.c +++ b/lustre/mdc/mdc_lib.c @@ -318,7 +318,7 @@ static inline u64 attr_pack(unsigned int ia_valid, enum op_xvalid ia_xvalid) sa_valid |= MDS_ATTR_KILL_SGID; if (ia_xvalid & OP_XVALID_CTIME_SET) sa_valid |= MDS_ATTR_CTIME_SET; - if (ia_valid & ATTR_FROM_OPEN) + if (ia_valid & ATTR_OPEN) sa_valid |= MDS_ATTR_FROM_OPEN; if (ia_xvalid & OP_XVALID_BLOCKS) sa_valid |= MDS_ATTR_BLOCKS; diff --git a/lustre/mdd/mdd_internal.h b/lustre/mdd/mdd_internal.h index 78863de..1406099 100644 --- a/lustre/mdd/mdd_internal.h +++ b/lustre/mdd/mdd_internal.h @@ -305,7 +305,6 @@ extern const struct md_dir_operations mdd_dir_ops; extern const struct md_object_operations mdd_obj_ops; int mdd_readlink(const struct lu_env *env, struct md_object *obj, struct lu_buf *buf); -int accmode(const struct lu_env *env, const struct lu_attr *la, int flags); extern struct lu_context_key mdd_thread_key; extern const struct lu_device_operations mdd_lu_ops; @@ -402,9 +401,8 @@ int __mdd_fix_mode_acl(const struct lu_env *env, struct lu_buf *buf, __u32 *mode); int __mdd_permission_internal(const struct lu_env *env, struct mdd_object *obj, const struct lu_attr *la, int mask, int role); -int mdd_permission(const struct lu_env *env, - struct md_object *pobj, struct md_object *cobj, - struct md_attr *ma, int mask); +int mdd_permission(const struct lu_env *env, struct md_object *pobj, + struct md_object *cobj, struct md_attr *ma, int mask); int mdd_generic_thread_start(struct mdd_generic_thread *thread, int (*func)(void *), void *data, char *name); void mdd_generic_thread_stop(struct mdd_generic_thread *thread); diff --git a/lustre/mdd/mdd_object.c b/lustre/mdd/mdd_object.c index 1025a0d..5044a03 100644 --- a/lustre/mdd/mdd_object.c +++ b/lustre/mdd/mdd_object.c @@ -55,7 +55,7 @@ static const struct lu_object_operations mdd_lu_obj_ops; struct mdd_object_user { struct list_head mou_list; /**< linked off mod_users */ - int mou_flags; /**< open mode by client */ + u64 mou_open_flags; /**< open mode by client */ __u64 mou_uidgid; /**< uid_gid on client */ int mou_opencount; /**< # opened */ ktime_t mou_deniednext; /**< time of next access denied @@ -77,21 +77,21 @@ static int mdd_changelog_data_store_by_fid(const struct lu_env *env, static inline bool has_prefix(const char *str, const char *prefix); -static unsigned int flags_helper(int flags) +static u32 flags_helper(u64 open_flags) { - unsigned int mflags = 0; + u32 open_mode = 0; - if (flags & MDS_FMODE_EXEC) { - mflags = MDS_FMODE_EXEC; + if (open_flags & MDS_FMODE_EXEC) { + open_mode = MDS_FMODE_EXEC; } else { - if (flags & MDS_FMODE_READ) - mflags = MDS_FMODE_READ; - if (flags & + if (open_flags & MDS_FMODE_READ) + open_mode = MDS_FMODE_READ; + if (open_flags & (MDS_FMODE_WRITE | MDS_OPEN_TRUNC | MDS_OPEN_APPEND)) - mflags |= MDS_FMODE_WRITE; + open_mode |= MDS_FMODE_WRITE; } - return mflags; + return open_mode; } /** Allocate/init a user and its sub-structures. @@ -102,7 +102,7 @@ static unsigned int flags_helper(int flags) * \retval mou [OUT] success valid structure * \retval mou [OUT] */ -static struct mdd_object_user *mdd_obj_user_alloc(int flags, +static struct mdd_object_user *mdd_obj_user_alloc(u64 open_flags, uid_t uid, gid_t gid) { struct mdd_object_user *mou; @@ -113,7 +113,7 @@ static struct mdd_object_user *mdd_obj_user_alloc(int flags, if (mou == NULL) RETURN(ERR_PTR(-ENOMEM)); - mou->mou_flags = flags; + mou->mou_open_flags = open_flags; mou->mou_uidgid = ((__u64)uid << 32) | gid; mou->mou_opencount = 0; mou->mou_deniednext = ktime_set(0, 0); @@ -142,7 +142,8 @@ static void mdd_obj_user_free(struct mdd_object_user *mou) */ static struct mdd_object_user *mdd_obj_user_find(struct mdd_object *mdd_obj, - uid_t uid, gid_t gid, int flags) + uid_t uid, gid_t gid, + u64 open_flags) { struct mdd_object_user *mou; __u64 uidgid; @@ -152,7 +153,8 @@ struct mdd_object_user *mdd_obj_user_find(struct mdd_object *mdd_obj, uidgid = ((__u64)uid << 32) | gid; list_for_each_entry(mou, &mdd_obj->mod_users, mou_list) { if (mou->mou_uidgid == uidgid && - flags_helper(mou->mou_flags) == flags_helper(flags)) + flags_helper(mou->mou_open_flags) == + flags_helper(open_flags)) RETURN(mou); } RETURN(NULL); @@ -178,8 +180,7 @@ static int mdd_obj_user_add(struct mdd_object *mdd_obj, ENTRY; - tmp = mdd_obj_user_find(mdd_obj, uid, - gid, mou->mou_flags); + tmp = mdd_obj_user_find(mdd_obj, uid, gid, mou->mou_open_flags); if (tmp != NULL) RETURN(-EEXIST); @@ -2953,37 +2954,27 @@ void mdd_object_make_hint(const struct lu_env *env, struct mdd_object *parent, nc->do_ops->do_ah_init(env, hint, np, nc, attr->la_mode & S_IFMT); } -/* - * do NOT or the MAY_*'s, you'll get the weakest - */ -int accmode(const struct lu_env *env, const struct lu_attr *la, int flags) +static int accmode(const struct lu_env *env, const struct lu_attr *la, + u64 open_flags) { - int res = 0; - /* Sadly, NFSD reopens a file repeatedly during operation, so the * "acc_mode = 0" allowance for newly-created files isn't honoured. * NFSD uses the MDS_OPEN_OWNEROVERRIDE flag to say that a file * owner can write to a file even if it is marked readonly to hide * its brokenness. (bug 5781) */ - if (flags & MDS_OPEN_OWNEROVERRIDE) { + if (open_flags & MDS_OPEN_OWNEROVERRIDE) { struct lu_ucred *uc = lu_ucred_check(env); if ((uc == NULL) || (la->la_uid == uc->uc_fsuid)) return 0; } - if (flags & MDS_FMODE_READ) - res |= MAY_READ; - if (flags & (MDS_FMODE_WRITE | MDS_OPEN_TRUNC | MDS_OPEN_APPEND)) - res |= MAY_WRITE; - if (flags & MDS_FMODE_EXEC) - res = MAY_EXEC; - return res; + return mds_accmode(open_flags); } static int mdd_open_sanity_check(const struct lu_env *env, - struct mdd_object *obj, - const struct lu_attr *attr, int flag) + struct mdd_object *obj, + const struct lu_attr *attr, u64 open_flags) { int mode, rc; ENTRY; @@ -2998,12 +2989,12 @@ static int mdd_open_sanity_check(const struct lu_env *env, if (S_ISLNK(attr->la_mode)) RETURN(-ELOOP); - mode = accmode(env, attr, flag); + mode = accmode(env, attr, open_flags); if (S_ISDIR(attr->la_mode) && (mode & MAY_WRITE)) RETURN(-EISDIR); - if (!(flag & MDS_OPEN_CREATED)) { + if (!(open_flags & MDS_OPEN_CREATED)) { rc = mdd_permission_internal(env, obj, attr, mode); if (rc) RETURN(rc); @@ -3011,13 +3002,14 @@ static int mdd_open_sanity_check(const struct lu_env *env, if (S_ISFIFO(attr->la_mode) || S_ISSOCK(attr->la_mode) || S_ISBLK(attr->la_mode) || S_ISCHR(attr->la_mode)) - flag &= ~MDS_OPEN_TRUNC; + open_flags &= ~MDS_OPEN_TRUNC; /* For writing append-only file must open it with append mode. */ if (attr->la_flags & LUSTRE_APPEND_FL) { - if ((flag & MDS_FMODE_WRITE) && !(flag & MDS_OPEN_APPEND)) + if ((open_flags & MDS_FMODE_WRITE) && + !(open_flags & MDS_OPEN_APPEND)) RETURN(-EPERM); - if (flag & MDS_OPEN_TRUNC) + if (open_flags & MDS_OPEN_TRUNC) RETURN(-EPERM); } @@ -3025,7 +3017,7 @@ static int mdd_open_sanity_check(const struct lu_env *env, } static int mdd_open(const struct lu_env *env, struct md_object *obj, - int flags) + u64 open_flags) { struct mdd_object *mdd_obj = md2mdd_obj(obj); struct md_device *md_dev = lu2md_dev(mdd2lu_dev(mdo2mdd(obj))); @@ -3042,7 +3034,7 @@ static int mdd_open(const struct lu_env *env, struct md_object *obj, if (rc != 0) GOTO(out, rc); - rc = mdd_open_sanity_check(env, mdd_obj, attr, flags); + rc = mdd_open_sanity_check(env, mdd_obj, attr, open_flags); if ((rc == -EACCES) && (mdd->mdd_cl.mc_mask & (1 << CL_DN_OPEN))) type = CL_DN_OPEN; else if (rc != 0) @@ -3055,13 +3047,13 @@ static int mdd_open(const struct lu_env *env, struct md_object *obj, find: /* look for existing opener in list under mdd_write_lock */ - mou = mdd_obj_user_find(mdd_obj, uc->uc_uid, uc->uc_gid, flags); + mou = mdd_obj_user_find(mdd_obj, uc->uc_uid, uc->uc_gid, open_flags); if (!mou) { int rc2; /* add user to list */ - mou = mdd_obj_user_alloc(flags, uc->uc_uid, uc->uc_gid); + mou = mdd_obj_user_alloc(open_flags, uc->uc_uid, uc->uc_gid); if (IS_ERR(mou)) { if (rc == 0) rc = PTR_ERR(mou); @@ -3097,7 +3089,7 @@ find: } } - mdd_changelog(env, type, flags, md_dev, mdo2fid(mdd_obj)); + mdd_changelog(env, type, open_flags, md_dev, mdo2fid(mdd_obj)); EXIT; out: @@ -3121,7 +3113,7 @@ static int mdd_declare_close(const struct lu_env *env, struct mdd_object *obj, * No permission check is needed. */ static int mdd_close(const struct lu_env *env, struct md_object *obj, - struct md_attr *ma, int mode) + struct md_attr *ma, u64 open_flags) { struct mdd_object *mdd_obj = md2mdd_obj(obj); struct mdd_device *mdd = mdo2mdd(obj); @@ -3220,7 +3212,8 @@ cont: * the user had the file open. So the corresponding close * will not be logged. */ - mou = mdd_obj_user_find(mdd_obj, uc->uc_uid, uc->uc_gid, mode); + mou = mdd_obj_user_find(mdd_obj, uc->uc_uid, uc->uc_gid, + open_flags); if (mou) { mou->mou_opencount--; if (mou->mou_opencount == 0) { @@ -3279,7 +3272,8 @@ out: * CL_OPEN. Plus Changelogs mask may not change often. */ if (((!(mdd->mdd_cl.mc_mask & (1 << CL_OPEN)) && - (mode & (MDS_FMODE_WRITE | MDS_OPEN_APPEND | MDS_OPEN_TRUNC))) || + (open_flags & (MDS_FMODE_WRITE | MDS_OPEN_APPEND | + MDS_OPEN_TRUNC))) || ((mdd->mdd_cl.mc_mask & (1 << CL_OPEN)) && last_close_by_uid)) && !(ma->ma_valid & MA_FLAGS && ma->ma_attr_flags & MDS_RECOV_OPEN)) { if (handle == NULL) { @@ -3292,14 +3286,14 @@ out: if (rc) GOTO(stop, rc); - rc = mdd_trans_start(env, mdo2mdd(obj), handle); - if (rc) - GOTO(stop, rc); - } + rc = mdd_trans_start(env, mdo2mdd(obj), handle); + if (rc) + GOTO(stop, rc); + } - mdd_changelog_data_store(env, mdd, CL_CLOSE, mode, + mdd_changelog_data_store(env, mdd, CL_CLOSE, open_flags, mdd_obj, handle); - } + } stop: if (handle != NULL && !IS_ERR(handle)) diff --git a/lustre/mdd/mdd_permission.c b/lustre/mdd/mdd_permission.c index 0065a61..01b30e1 100644 --- a/lustre/mdd/mdd_permission.c +++ b/lustre/mdd/mdd_permission.c @@ -315,9 +315,8 @@ check_capabilities: RETURN(-EACCES); } -int mdd_permission(const struct lu_env *env, - struct md_object *pobj, struct md_object *cobj, - struct md_attr *ma, int mask) +int mdd_permission(const struct lu_env *env, struct md_object *pobj, + struct md_object *cobj, struct md_attr *ma, int mask) { struct mdd_object *mdd_pobj = NULL; struct mdd_object *mdd_cobj; @@ -341,12 +340,6 @@ int mdd_permission(const struct lu_env *env, if (rc) RETURN(rc); - /* For cross_open case, the "mask" is open flags, - * so convert it to permission mask first. - * XXX: MDS_OPEN_CROSS must be NOT equal to permission mask MAY_*. */ - if (unlikely(mask & MDS_OPEN_CROSS)) - mask = accmode(env, cattr, mask & ~MDS_OPEN_CROSS); - rc = mdd_permission_internal_locked(env, mdd_cobj, cattr, mask & ~MAY_RGETFACL, MOR_TGT_CHILD); diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c index d94fbbc..da37f72 100644 --- a/lustre/mdt/mdt_handler.c +++ b/lustre/mdt/mdt_handler.c @@ -1527,12 +1527,12 @@ static int mdt_swap_layouts(struct tgt_session_info *tsi) /* permission check. Make sure the calling process having permission * to write both files. */ rc = mo_permission(info->mti_env, NULL, mdt_object_child(o1), NULL, - MAY_WRITE); + MAY_WRITE); if (rc < 0) GOTO(put, rc); rc = mo_permission(info->mti_env, NULL, mdt_object_child(o2), NULL, - MAY_WRITE); + MAY_WRITE); if (rc < 0) GOTO(put, rc); @@ -5753,7 +5753,7 @@ static int mdt_export_cleanup(struct obd_export *exp) * archive request into a noop if it's not actually * dirty. */ - if (mfd->mfd_mode & MDS_FMODE_WRITE) + if (mfd->mfd_open_flags & MDS_FMODE_WRITE) rc = mdt_ctxt_add_dirty_flag(&env, info, mfd); /* Don't unlink orphan on failover umount, LU-184 */ diff --git a/lustre/mdt/mdt_internal.h b/lustre/mdt/mdt_internal.h index 7b01a83..7cc7b8e 100644 --- a/lustre/mdt/mdt_internal.h +++ b/lustre/mdt/mdt_internal.h @@ -67,7 +67,7 @@ struct mdt_file_data { /** portals handle must be first */ struct portals_handle mfd_open_handle; /** open mode provided by client */ - __u64 mfd_mode; + u64 mfd_open_flags; /** protected by med_open_lock */ struct list_head mfd_list; /** xid of the open request */ @@ -816,15 +816,10 @@ int mdt_export_stats_init(struct obd_device *obd, void *client_nid); int mdt_lock_new_child(struct mdt_thread_info *info, - struct mdt_object *o, - struct mdt_lock_handle *child_lockh); - -void mdt_mfd_set_mode(struct mdt_file_data *mfd, - __u64 mode); - -int mdt_reint_open(struct mdt_thread_info *info, - struct mdt_lock_handle *lhc); - + struct mdt_object *o, + struct mdt_lock_handle *child_lockh); +void mdt_mfd_set_mode(struct mdt_file_data *mfd, u64 open_flags); +int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc); struct mdt_file_data *mdt_open_handle2mfd(struct mdt_export_data *med, const struct lustre_handle *open_handle, bool is_replay); diff --git a/lustre/mdt/mdt_lib.c b/lustre/mdt/mdt_lib.c index 6f0ec2f..baaebdc 100644 --- a/lustre/mdt/mdt_lib.c +++ b/lustre/mdt/mdt_lib.c @@ -974,7 +974,7 @@ static __u64 mdt_attr_valid_xlate(__u64 in, struct mdt_reint_record *rr, if (in & MDS_ATTR_FROM_OPEN) rr->rr_flags |= MRF_OPEN_TRUNC; - if (in & MDS_OPEN_OWNEROVERRIDE) + if (in & MDS_ATTR_OVERRIDE) ma->ma_attr_flags |= MDS_OWNEROVERRIDE; if (in & MDS_ATTR_FORCE) ma->ma_attr_flags |= MDS_PERM_BYPASS; @@ -985,7 +985,7 @@ static __u64 mdt_attr_valid_xlate(__u64 in, struct mdt_reint_record *rr, MDS_ATTR_SIZE | MDS_ATTR_BLOCKS | MDS_ATTR_ATTR_FLAG | MDS_ATTR_FORCE | MDS_ATTR_KILL_SUID | MDS_ATTR_KILL_SGID | MDS_ATTR_FROM_OPEN | MDS_ATTR_LSIZE | MDS_ATTR_LBLOCKS | - MDS_OPEN_OWNEROVERRIDE); + MDS_ATTR_OVERRIDE); if (in != 0) CERROR("Unknown attr bits: %#llx\n", in); return out; diff --git a/lustre/mdt/mdt_open.c b/lustre/mdt/mdt_open.c index 2597f43..a91bbf1 100644 --- a/lustre/mdt/mdt_open.c +++ b/lustre/mdt/mdt_open.c @@ -291,14 +291,15 @@ static void mdt_empty_transno(struct mdt_thread_info *info, int rc) EXIT; } -void mdt_mfd_set_mode(struct mdt_file_data *mfd, __u64 mode) +void mdt_mfd_set_mode(struct mdt_file_data *mfd, u64 open_flags) { LASSERT(mfd != NULL); - CDEBUG(D_DENTRY, DFID " Change mfd mode %#llo -> %#llo.\n", - PFID(mdt_object_fid(mfd->mfd_object)), mfd->mfd_mode, mode); + CDEBUG(D_DENTRY, DFID " Change mfd open_flags %#llo -> %#llo.\n", + PFID(mdt_object_fid(mfd->mfd_object)), mfd->mfd_open_flags, + open_flags); - mfd->mfd_mode = mode; + mfd->mfd_open_flags = open_flags; } /** @@ -329,45 +330,47 @@ static void mdt_prep_ma_buf_from_rep(struct mdt_thread_info *info, } static int mdt_mfd_open(struct mdt_thread_info *info, struct mdt_object *p, - struct mdt_object *o, __u64 flags, int created, + struct mdt_object *o, u64 open_flags, int created, struct ldlm_reply *rep) { - struct ptlrpc_request *req = mdt_info_req(info); - struct mdt_export_data *med = &req->rq_export->exp_mdt_data; - struct mdt_file_data *mfd; - struct md_attr *ma = &info->mti_attr; - struct lu_attr *la = &ma->ma_attr; - struct mdt_body *repbody; - int rc = 0, isdir, isreg; - ENTRY; + struct ptlrpc_request *req = mdt_info_req(info); + struct mdt_export_data *med = &req->rq_export->exp_mdt_data; + struct mdt_file_data *mfd; + struct md_attr *ma = &info->mti_attr; + struct lu_attr *la = &ma->ma_attr; + struct mdt_body *repbody; + bool isdir, isreg; + int rc = 0; - repbody = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY); + ENTRY; + repbody = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY); - isreg = S_ISREG(la->la_mode); - isdir = S_ISDIR(la->la_mode); - if (isreg && !(ma->ma_valid & MA_LOV) && !(flags & MDS_OPEN_RELEASE)) { - /* - * No EA, check whether it is will set regEA and dirEA since in - * above attr get, these size might be zero, so reset it, to - * retrieve the MD after create obj. - */ - ma->ma_lmm_size = req_capsule_get_size(info->mti_pill, - &RMF_MDT_MD, - RCL_SERVER); - /* in replay case, p == NULL */ - rc = mdt_create_data(info, p, o); - if (rc) - RETURN(rc); + isreg = S_ISREG(la->la_mode); + isdir = S_ISDIR(la->la_mode); + if (isreg && !(ma->ma_valid & MA_LOV) && + !(open_flags & MDS_OPEN_RELEASE)) { + /* + * No EA, check whether it is will set regEA and dirEA since in + * above attr get, these size might be zero, so reset it, to + * retrieve the MD after create obj. + */ + ma->ma_lmm_size = req_capsule_get_size(info->mti_pill, + &RMF_MDT_MD, + RCL_SERVER); + /* in replay case, p == NULL */ + rc = mdt_create_data(info, p, o); + if (rc) + RETURN(rc); if (exp_connect_flags(req->rq_export) & OBD_CONNECT_DISP_STRIPE) mdt_set_disposition(info, rep, DISP_OPEN_STRIPE); - } + } CDEBUG(D_INODE, "after open, ma_valid bit = %#llx lmm_size = %d\n", ma->ma_valid, ma->ma_lmm_size); - if (ma->ma_valid & MA_LOV) { - LASSERT(ma->ma_lmm_size != 0); + if (ma->ma_valid & MA_LOV) { + LASSERT(ma->ma_lmm_size != 0); repbody->mbo_eadatasize = ma->ma_lmm_size; if (isdir) repbody->mbo_valid |= OBD_MD_FLDIREA; @@ -382,16 +385,16 @@ static int mdt_mfd_open(struct mdt_thread_info *info, struct mdt_object *p, repbody->mbo_valid |= OBD_MD_FLDIREA | OBD_MD_MEA; } - if (flags & MDS_FMODE_WRITE) + if (open_flags & MDS_FMODE_WRITE) rc = mdt_write_get(o); - else if (flags & MDS_FMODE_EXEC) + else if (open_flags & MDS_FMODE_EXEC) rc = mdt_write_deny(o); - if (rc) - RETURN(rc); + if (rc) + RETURN(rc); - rc = mo_open(info->mti_env, mdt_object_child(o), - created ? flags | MDS_OPEN_CREATED : flags); + rc = mo_open(info->mti_env, mdt_object_child(o), + created ? open_flags | MDS_OPEN_CREATED : open_flags); if (rc != 0) { /* If we allow the client to chgrp (CFS_SETGRP_PERM), but the * client does not know which suppgid should be sent to the MDS, @@ -418,16 +421,16 @@ static int mdt_mfd_open(struct mdt_thread_info *info, struct mdt_object *p, mfd->mfd_xid = req->rq_xid; /* - * @flags is always not zero. At least it should be FMODE_READ, + * @open_flags is always not zero. At least it should be FMODE_READ, * FMODE_WRITE or MDS_FMODE_EXEC. */ - LASSERT(flags != 0); + LASSERT(open_flags != 0); /* Open handling. */ - mdt_mfd_set_mode(mfd, flags); + mdt_mfd_set_mode(mfd, open_flags); atomic_inc(&o->mot_open_count); - if (flags & MDS_OPEN_LEASE) + if (open_flags & MDS_OPEN_LEASE) atomic_inc(&o->mot_lease_count); /* replay handle */ @@ -487,12 +490,12 @@ static int mdt_mfd_open(struct mdt_thread_info *info, struct mdt_object *p, mdt_empty_transno(info, rc); - RETURN(rc); + RETURN(rc); err_out: - if (flags & MDS_FMODE_WRITE) + if (open_flags & MDS_FMODE_WRITE) mdt_write_put(o); - else if (flags & MDS_FMODE_EXEC) + else if (open_flags & MDS_FMODE_EXEC) mdt_write_allow(o); return rc; @@ -500,7 +503,8 @@ err_out: static int mdt_finish_open(struct mdt_thread_info *info, struct mdt_object *p, struct mdt_object *o, - __u64 flags, int created, struct ldlm_reply *rep) + u64 open_flags, int created, + struct ldlm_reply *rep) { struct ptlrpc_request *req = mdt_info_req(info); struct obd_export *exp = req->rq_export; @@ -547,7 +551,7 @@ static int mdt_finish_open(struct mdt_thread_info *info, DISP_LOOKUP_NEG | DISP_LOOKUP_POS); - if (flags & MDS_OPEN_LOCK) + if (open_flags & MDS_OPEN_LOCK) mdt_set_disposition(info, rep, DISP_OPEN_LOCK); RETURN(-ENOENT); @@ -566,36 +570,37 @@ static int mdt_finish_open(struct mdt_thread_info *info, } #endif - /* - * If we are following a symlink, don't open; and do not return open - * handle for special nodes as client required. - */ + /* + * If we are following a symlink, don't open; and do not return open + * handle for special nodes as client required. + */ if (islnk || (!isreg && !isdir && (exp_connect_flags(req->rq_export) & OBD_CONNECT_NODEVOH))) { lustre_msg_set_transno(req->rq_repmsg, 0); RETURN(0); } - /* - * We need to return the existing object's fid back, so it is done here, - * after preparing the reply. - */ - if (!created && (flags & MDS_OPEN_EXCL) && (flags & MDS_OPEN_CREAT)) - RETURN(-EEXIST); - - /* This can't be done earlier, we need to return reply body */ - if (isdir) { - if (flags & (MDS_OPEN_CREAT | MDS_FMODE_WRITE)) { - /* We are trying to create or write an existing dir. */ - RETURN(-EISDIR); - } - } else if (flags & MDS_OPEN_DIRECTORY) - RETURN(-ENOTDIR); + /* + * We need to return the existing object's fid back, so it is done here, + * after preparing the reply. + */ + if (!created && (open_flags & MDS_OPEN_EXCL) && + (open_flags & MDS_OPEN_CREAT)) + RETURN(-EEXIST); + + /* This can't be done earlier, we need to return reply body */ + if (isdir) { + if (open_flags & (MDS_OPEN_CREAT | MDS_FMODE_WRITE)) { + /* We are trying to create or write an existing dir. */ + RETURN(-EISDIR); + } + } else if (open_flags & MDS_OPEN_DIRECTORY) + RETURN(-ENOTDIR); - if (OBD_FAIL_CHECK_RESET(OBD_FAIL_MDS_OPEN_CREATE, - OBD_FAIL_LDLM_REPLY | OBD_FAIL_ONCE)) { - RETURN(-EAGAIN); - } + if (OBD_FAIL_CHECK_RESET(OBD_FAIL_MDS_OPEN_CREATE, + OBD_FAIL_LDLM_REPLY | OBD_FAIL_ONCE)) { + RETURN(-EAGAIN); + } mfd = NULL; if (lustre_msg_get_flags(req->rq_reqmsg) & MSG_RESENT) { @@ -625,7 +630,7 @@ static int mdt_finish_open(struct mdt_thread_info *info, } } - rc = mdt_mfd_open(info, p, o, flags, created, rep); + rc = mdt_mfd_open(info, p, o, open_flags, created, rep); if (!rc) mdt_set_disposition(info, rep, DISP_OPEN_OPEN); @@ -633,26 +638,26 @@ static int mdt_finish_open(struct mdt_thread_info *info, } void mdt_reconstruct_open(struct mdt_thread_info *info, - struct mdt_lock_handle *lhc) + struct mdt_lock_handle *lhc) { - const struct lu_env *env = info->mti_env; - struct mdt_device *mdt = info->mti_mdt; - struct req_capsule *pill = info->mti_pill; - struct ptlrpc_request *req = mdt_info_req(info); - struct md_attr *ma = &info->mti_attr; - struct mdt_reint_record *rr = &info->mti_rr; - __u64 flags = info->mti_spec.sp_cr_flags; - struct ldlm_reply *ldlm_rep; - struct mdt_object *parent; - struct mdt_object *child; - struct mdt_body *repbody; - int rc; - __u64 opdata; + const struct lu_env *env = info->mti_env; + struct mdt_device *mdt = info->mti_mdt; + struct req_capsule *pill = info->mti_pill; + struct ptlrpc_request *req = mdt_info_req(info); + struct md_attr *ma = &info->mti_attr; + struct mdt_reint_record *rr = &info->mti_rr; + u64 open_flags = info->mti_spec.sp_cr_flags; + struct ldlm_reply *ldlm_rep; + struct mdt_object *parent; + struct mdt_object *child; + struct mdt_body *repbody; + u64 opdata; + int rc; ENTRY; - LASSERT(pill->rc_fmt == &RQF_LDLM_INTENT_OPEN); - ldlm_rep = req_capsule_server_get(pill, &RMF_DLM_REP); - repbody = req_capsule_server_get(pill, &RMF_MDT_BODY); + LASSERT(pill->rc_fmt == &RQF_LDLM_INTENT_OPEN); + ldlm_rep = req_capsule_server_get(pill, &RMF_DLM_REP); + repbody = req_capsule_server_get(pill, &RMF_MDT_BODY); ma->ma_need = MA_INODE | MA_HSM; ma->ma_valid = 0; @@ -716,7 +721,7 @@ void mdt_reconstruct_open(struct mdt_thread_info *info, rc = mdt_attr_get_complex(info, child, ma); if (rc == 0) rc = mdt_finish_open(info, parent, - child, flags, + child, open_flags, 1, ldlm_rep); } else { /* the child does not exist, we should do @@ -726,46 +731,46 @@ void mdt_reconstruct_open(struct mdt_thread_info *info, GOTO(regular_open, 0); } } - mdt_object_put(env, parent); - mdt_object_put(env, child); - GOTO(out, rc); - } else { + mdt_object_put(env, parent); + mdt_object_put(env, child); + GOTO(out, rc); + } else { regular_open: - /* We did not try to create, so we are a pure open */ - rc = mdt_reint_open(info, lhc); - } + /* We did not try to create, so we are a pure open */ + rc = mdt_reint_open(info, lhc); + } - EXIT; + EXIT; out: - req->rq_status = rc; - lustre_msg_set_status(req->rq_repmsg, req->rq_status); - LASSERT(ergo(rc < 0, lustre_msg_get_transno(req->rq_repmsg) == 0)); + req->rq_status = rc; + lustre_msg_set_status(req->rq_repmsg, req->rq_status); + LASSERT(ergo(rc < 0, lustre_msg_get_transno(req->rq_repmsg) == 0)); } static int mdt_open_by_fid(struct mdt_thread_info *info, struct ldlm_reply *rep) { - __u64 flags = info->mti_spec.sp_cr_flags; - struct mdt_reint_record *rr = &info->mti_rr; - struct md_attr *ma = &info->mti_attr; - struct mdt_object *o; - int rc; - ENTRY; + u64 open_flags = info->mti_spec.sp_cr_flags; + struct mdt_reint_record *rr = &info->mti_rr; + struct md_attr *ma = &info->mti_attr; + struct mdt_object *o; + int rc; - o = mdt_object_find(info->mti_env, info->mti_mdt, rr->rr_fid2); - if (IS_ERR(o)) - RETURN(rc = PTR_ERR(o)); + ENTRY; + o = mdt_object_find(info->mti_env, info->mti_mdt, rr->rr_fid2); + if (IS_ERR(o)) + RETURN(rc = PTR_ERR(o)); if (unlikely(mdt_object_remote(o))) { - /* the child object was created on remote server */ - struct mdt_body *repbody; + /* the child object was created on remote server */ + struct mdt_body *repbody; mdt_set_disposition(info, rep, (DISP_IT_EXECD | DISP_LOOKUP_EXECD | DISP_LOOKUP_POS)); - repbody = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY); + repbody = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY); repbody->mbo_fid1 = *rr->rr_fid2; repbody->mbo_valid |= (OBD_MD_FLID | OBD_MD_MDS); - rc = 0; + rc = 0; } else { if (mdt_object_exists(o)) { mdt_set_disposition(info, rep, (DISP_IT_EXECD | @@ -774,15 +779,15 @@ static int mdt_open_by_fid(struct mdt_thread_info *info, struct ldlm_reply *rep) mdt_prep_ma_buf_from_rep(info, o, ma); rc = mdt_attr_get_complex(info, o, ma); if (rc == 0) - rc = mdt_finish_open(info, NULL, o, flags, 0, - rep); + rc = mdt_finish_open(info, NULL, o, open_flags, + 0, rep); } else { rc = -ENOENT; } } - mdt_object_put(info->mti_env, o); - RETURN(rc); + mdt_object_put(info->mti_env, o); + RETURN(rc); } /* lock object for open */ @@ -1067,32 +1072,32 @@ static int mdt_open_by_fid_lock(struct mdt_thread_info *info, struct ldlm_reply *rep, struct mdt_lock_handle *lhc) { - const struct lu_env *env = info->mti_env; - struct mdt_device *mdt = info->mti_mdt; - __u64 flags = info->mti_spec.sp_cr_flags; - struct mdt_reint_record *rr = &info->mti_rr; - struct md_attr *ma = &info->mti_attr; - struct mdt_object *parent= NULL; - struct mdt_object *o; - int rc; - bool object_locked = false; - __u64 ibits = 0; - ENTRY; + const struct lu_env *env = info->mti_env; + struct mdt_device *mdt = info->mti_mdt; + u64 open_flags = info->mti_spec.sp_cr_flags; + struct mdt_reint_record *rr = &info->mti_rr; + struct md_attr *ma = &info->mti_attr; + struct mdt_object *parent = NULL; + struct mdt_object *o; + bool object_locked = false; + u64 ibits = 0; + int rc; - if (md_should_create(flags)) { - if (!lu_fid_eq(rr->rr_fid1, rr->rr_fid2)) { - parent = mdt_object_find(env, mdt, rr->rr_fid1); - if (IS_ERR(parent)) { - CDEBUG(D_INODE, "Fail to find parent "DFID - " for anonymous created %ld, try to" - " use server-side parent.\n", - PFID(rr->rr_fid1), PTR_ERR(parent)); - parent = NULL; - } - } - if (parent == NULL) - ma->ma_need |= MA_PFID; - } + ENTRY; + if (md_should_create(open_flags)) { + if (!lu_fid_eq(rr->rr_fid1, rr->rr_fid2)) { + parent = mdt_object_find(env, mdt, rr->rr_fid1); + if (IS_ERR(parent)) { + CDEBUG(D_INODE, "Fail to find parent "DFID + " for anonymous created %ld, try to" + " use server-side parent.\n", + PFID(rr->rr_fid1), PTR_ERR(parent)); + parent = NULL; + } + } + if (parent == NULL) + ma->ma_need |= MA_PFID; + } o = mdt_object_find(env, mdt, rr->rr_fid2); if (IS_ERR(o)) @@ -1114,7 +1119,7 @@ static int mdt_open_by_fid_lock(struct mdt_thread_info *info, mdt_set_disposition(info, rep, (DISP_IT_EXECD | DISP_LOOKUP_EXECD)); mdt_prep_ma_buf_from_rep(info, o, ma); - if (flags & MDS_OPEN_RELEASE) + if (open_flags & MDS_OPEN_RELEASE) ma->ma_need |= MA_HSM; rc = mdt_attr_get_complex(info, o, ma); if (rc) @@ -1122,12 +1127,12 @@ static int mdt_open_by_fid_lock(struct mdt_thread_info *info, /* We should not change file's existing LOV EA */ if (S_ISREG(lu_object_attr(&o->mot_obj)) && - flags & MDS_OPEN_HAS_EA && ma->ma_valid & MA_LOV) + open_flags & MDS_OPEN_HAS_EA && ma->ma_valid & MA_LOV) GOTO(out, rc = -EEXIST); - /* If a release request, check file flags are fine and ask for an + /* If a release request, check file open flags are fine and ask for an * exclusive open access. */ - if (flags & MDS_OPEN_RELEASE && !mdt_hsm_release_allow(ma)) + if (open_flags & MDS_OPEN_RELEASE && !mdt_hsm_release_allow(ma)) GOTO(out, rc = -EPERM); rc = mdt_check_resent_lock(info, o, lhc); @@ -1140,23 +1145,23 @@ static int mdt_open_by_fid_lock(struct mdt_thread_info *info, GOTO(out_unlock, rc); } - if (ma->ma_valid & MA_PFID) { - parent = mdt_object_find(env, mdt, &ma->ma_pfid); - if (IS_ERR(parent)) { - CDEBUG(D_INODE, "Fail to find parent "DFID - " for anonymous created %ld, try to" - " use system default.\n", - PFID(&ma->ma_pfid), PTR_ERR(parent)); - parent = NULL; - } - } + if (ma->ma_valid & MA_PFID) { + parent = mdt_object_find(env, mdt, &ma->ma_pfid); + if (IS_ERR(parent)) { + CDEBUG(D_INODE, "Fail to find parent "DFID + " for anonymous created %ld, try to" + " use system default.\n", + PFID(&ma->ma_pfid), PTR_ERR(parent)); + parent = NULL; + } + } - rc = mdt_finish_open(info, parent, o, flags, 0, rep); + rc = mdt_finish_open(info, parent, o, open_flags, 0, rep); if (!rc) { mdt_set_disposition(info, rep, DISP_LOOKUP_POS); - if (flags & MDS_OPEN_LOCK) + if (open_flags & MDS_OPEN_LOCK) mdt_set_disposition(info, rep, DISP_OPEN_LOCK); - if (flags & MDS_OPEN_LEASE) + if (open_flags & MDS_OPEN_LEASE) mdt_set_disposition(info, rep, DISP_OPEN_LEASE); } GOTO(out_unlock, rc); @@ -1178,16 +1183,16 @@ out_parent_put: static int mdt_cross_open(struct mdt_thread_info *info, const struct lu_fid *parent_fid, const struct lu_fid *fid, - struct ldlm_reply *rep, __u32 flags) + struct ldlm_reply *rep, u64 open_flags) { - struct md_attr *ma = &info->mti_attr; - struct mdt_object *o; - int rc; - ENTRY; + struct md_attr *ma = &info->mti_attr; + struct mdt_object *o; + int rc; + ENTRY; - o = mdt_object_find(info->mti_env, info->mti_mdt, fid); - if (IS_ERR(o)) - RETURN(rc = PTR_ERR(o)); + o = mdt_object_find(info->mti_env, info->mti_mdt, fid); + if (IS_ERR(o)) + RETURN(rc = PTR_ERR(o)); if (mdt_object_remote(o)) { /* Something is wrong here, the object is on another MDS! */ @@ -1196,13 +1201,18 @@ static int mdt_cross_open(struct mdt_thread_info *info, LU_OBJECT_DEBUG(D_WARNING, info->mti_env, &o->mot_obj, "Object isn't on this server! FLD error?"); - rc = -EFAULT; + rc = -EFAULT; } else { if (mdt_object_exists(o)) { - /* Do permission check for cross-open. */ + int mask; + + /* Do permission check for cross-open after converting + * MDS_OPEN_* flags to MAY_* permission mask. + */ + mask = mds_accmode(open_flags); + rc = mo_permission(info->mti_env, NULL, - mdt_object_child(o), - NULL, flags | MDS_OPEN_CROSS); + mdt_object_child(o), NULL, mask); if (rc) goto out; @@ -1211,7 +1221,7 @@ static int mdt_cross_open(struct mdt_thread_info *info, if (rc != 0) GOTO(out, rc); - rc = mdt_finish_open(info, NULL, o, flags, 0, rep); + rc = mdt_finish_open(info, NULL, o, open_flags, 0, rep); } else { /* * Something is wrong here. lookup was positive but @@ -1221,10 +1231,11 @@ static int mdt_cross_open(struct mdt_thread_info *info, mdt_obd_name(info->mti_mdt), PFID(fid), -EFAULT); rc = -EFAULT; } - } + } out: - mdt_object_put(info->mti_env, o); - RETURN(rc); + mdt_object_put(info->mti_env, o); + + RETURN(rc); } /* @@ -1283,55 +1294,54 @@ static int mdt_lock_root_xattr(struct mdt_thread_info *info, int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) { - struct mdt_device *mdt = info->mti_mdt; - struct ptlrpc_request *req = mdt_info_req(info); - struct mdt_object *parent; - struct mdt_object *child; - struct mdt_lock_handle *lh; - struct ldlm_reply *ldlm_rep; - struct mdt_body *repbody; - struct lu_fid *child_fid = &info->mti_tmp_fid1; - struct md_attr *ma = &info->mti_attr; - __u64 create_flags = info->mti_spec.sp_cr_flags; - __u64 ibits = 0; - struct mdt_reint_record *rr = &info->mti_rr; - int result, rc; - int created = 0; - int object_locked = 0; - __u32 msg_flags; - ENTRY; + struct mdt_device *mdt = info->mti_mdt; + struct ptlrpc_request *req = mdt_info_req(info); + struct mdt_object *parent; + struct mdt_object *child; + struct mdt_lock_handle *lh; + struct ldlm_reply *ldlm_rep; + struct mdt_body *repbody; + struct lu_fid *child_fid = &info->mti_tmp_fid1; + struct md_attr *ma = &info->mti_attr; + u64 open_flags = info->mti_spec.sp_cr_flags; + u64 ibits = 0; + struct mdt_reint_record *rr = &info->mti_rr; + int result, rc; + int created = 0; + int object_locked = 0; + u32 msg_flags; - OBD_FAIL_TIMEOUT_ORSET(OBD_FAIL_MDS_PAUSE_OPEN, OBD_FAIL_ONCE, - (obd_timeout + 1) / 4); + ENTRY; + OBD_FAIL_TIMEOUT_ORSET(OBD_FAIL_MDS_PAUSE_OPEN, OBD_FAIL_ONCE, + (obd_timeout + 1) / 4); mdt_counter_incr(req, LPROC_MDT_OPEN); - repbody = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY); + repbody = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY); - ma->ma_need = MA_INODE; - ma->ma_valid = 0; + ma->ma_need = MA_INODE; + ma->ma_valid = 0; - LASSERT(info->mti_pill->rc_fmt == &RQF_LDLM_INTENT_OPEN); - ldlm_rep = req_capsule_server_get(info->mti_pill, &RMF_DLM_REP); + LASSERT(info->mti_pill->rc_fmt == &RQF_LDLM_INTENT_OPEN); + ldlm_rep = req_capsule_server_get(info->mti_pill, &RMF_DLM_REP); - if (unlikely(create_flags & MDS_OPEN_JOIN_FILE)) { - CERROR("file join is not supported anymore.\n"); - GOTO(out, result = err_serious(-EOPNOTSUPP)); - } - msg_flags = lustre_msg_get_flags(req->rq_reqmsg); + if (unlikely(open_flags & MDS_OPEN_JOIN_FILE)) { + CERROR("file join is not supported anymore.\n"); + GOTO(out, result = err_serious(-EOPNOTSUPP)); + } + msg_flags = lustre_msg_get_flags(req->rq_reqmsg); - if ((create_flags & (MDS_OPEN_HAS_EA | MDS_OPEN_HAS_OBJS)) && - info->mti_spec.u.sp_ea.eadata == NULL) - GOTO(out, result = err_serious(-EINVAL)); + if ((open_flags & (MDS_OPEN_HAS_EA | MDS_OPEN_HAS_OBJS)) && + info->mti_spec.u.sp_ea.eadata == NULL) + GOTO(out, result = err_serious(-EINVAL)); - if (create_flags & MDS_FMODE_WRITE && + if (open_flags & MDS_FMODE_WRITE && exp_connect_flags(req->rq_export) & OBD_CONNECT_RDONLY) GOTO(out, result = -EROFS); CDEBUG(D_INODE, "I am going to open "DFID"/("DNAME"->"DFID") " "cr_flag=%#llo mode=0%06o msg_flag=0x%x\n", - PFID(rr->rr_fid1), PNAME(&rr->rr_name), - PFID(rr->rr_fid2), create_flags, - ma->ma_attr.la_mode, msg_flags); + PFID(rr->rr_fid1), PNAME(&rr->rr_name), PFID(rr->rr_fid2), + open_flags, ma->ma_attr.la_mode, msg_flags); if (info->mti_cross_ref) { /* This is cross-ref open */ @@ -1339,7 +1349,7 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) (DISP_IT_EXECD | DISP_LOOKUP_EXECD | DISP_LOOKUP_POS)); result = mdt_cross_open(info, rr->rr_fid2, rr->rr_fid1, - ldlm_rep, create_flags); + ldlm_rep, open_flags); GOTO(out, result); } else if (req_is_replay(req)) { result = mdt_open_by_fid(info, ldlm_rep); @@ -1349,13 +1359,13 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) /* We didn't find the correct object, so we need to re-create it * via a regular replay. */ - if (!(create_flags & MDS_OPEN_CREAT)) { + if (!(open_flags & MDS_OPEN_CREAT)) { DEBUG_REQ(D_ERROR, req, "OPEN & CREAT not in open replay/by_fid."); GOTO(out, result = -EFAULT); } CDEBUG(D_INFO, "No object(1), continue as regular open.\n"); - } else if (create_flags & (MDS_OPEN_BY_FID | MDS_OPEN_LOCK)) { + } else if (open_flags & (MDS_OPEN_BY_FID | MDS_OPEN_LOCK)) { /* * MDS_OPEN_LOCK is checked for backward compatibility with 2.1 * client. @@ -1382,8 +1392,7 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) again: lh = &info->mti_lh[MDT_LH_PARENT]; - mdt_lock_pdo_init(lh, - (create_flags & MDS_OPEN_CREAT) ? LCK_PW : LCK_PR, + mdt_lock_pdo_init(lh, (open_flags & MDS_OPEN_CREAT) ? LCK_PW : LCK_PR, &rr->rr_name); parent = mdt_object_find(info->mti_env, mdt, rr->rr_fid1); @@ -1396,12 +1405,12 @@ again: GOTO(out, result); } - /* get and check version of parent */ - result = mdt_version_get_check(info, parent, 0); - if (result) - GOTO(out_parent, result); + /* get and check version of parent */ + result = mdt_version_get_check(info, parent, 0); + if (result) + GOTO(out_parent, result); - fid_zero(child_fid); + fid_zero(child_fid); result = mdo_lookup(info->mti_env, mdt_object_child(parent), &rr->rr_name, child_fid, &info->mti_spec); @@ -1411,8 +1420,8 @@ again: PFID(mdt_object_fid(parent)), PNAME(&rr->rr_name), PFID(child_fid)); - if (result != 0 && result != -ENOENT && result != -ESTALE) - GOTO(out_parent, result); + if (result != 0 && result != -ENOENT && result != -ESTALE) + GOTO(out_parent, result); if (result == -ENOENT || result == -ESTALE) { /* If the object is dead, let's check if the object @@ -1453,34 +1462,34 @@ again: GOTO(out_parent, result = -ENOENT); } - if (!(create_flags & MDS_OPEN_CREAT)) - GOTO(out_parent, result); + if (!(open_flags & MDS_OPEN_CREAT)) + GOTO(out_parent, result); if (mdt_rdonly(req->rq_export)) GOTO(out_parent, result = -EROFS); - *child_fid = *info->mti_rr.rr_fid2; - LASSERTF(fid_is_sane(child_fid), "fid="DFID"\n", - PFID(child_fid)); + *child_fid = *info->mti_rr.rr_fid2; + LASSERTF(fid_is_sane(child_fid), "fid="DFID"\n", + PFID(child_fid)); /* In the function below, .hs_keycmp resolves to * lu_obj_hop_keycmp() */ /* coverity[overrun-buffer-val] */ child = mdt_object_new(info->mti_env, mdt, child_fid); } else { /* - * Check for O_EXCL is moved to the mdt_finish_open(), we need to - * return FID back in that case. + * Check for O_EXCL is moved to the mdt_finish_open(), + * we need to return FID back in that case. */ mdt_set_disposition(info, ldlm_rep, DISP_LOOKUP_POS); child = mdt_object_find(info->mti_env, mdt, child_fid); } - if (IS_ERR(child)) - GOTO(out_parent, result = PTR_ERR(child)); + if (IS_ERR(child)) + GOTO(out_parent, result = PTR_ERR(child)); - /** check version of child */ - rc = mdt_version_get_check(info, child, 1); - if (rc) - GOTO(out_child, result = rc); + /** check version of child */ + rc = mdt_version_get_check(info, child, 1); + if (rc) + GOTO(out_child, result = rc); - if (result == -ENOENT) { + if (result == -ENOENT) { /* Create under OBF and .lustre is not permitted */ if (!fid_is_md_operative(rr->rr_fid1)) GOTO(out_child, result = -EPERM); @@ -1573,7 +1582,7 @@ again: /* the open lock might already be gotten in * ldlm_handle_enqueue() */ LASSERT(lustre_msg_get_flags(req->rq_reqmsg) & MSG_RESENT); - if (create_flags & MDS_OPEN_LOCK) + if (open_flags & MDS_OPEN_LOCK) mdt_set_disposition(info, ldlm_rep, DISP_OPEN_LOCK); } else { /* get openlock if this isn't replay and client requested it */ @@ -1582,20 +1591,20 @@ again: object_locked = 1; if (rc != 0) GOTO(out_child_unlock, result = rc); - else if (create_flags & MDS_OPEN_LOCK) + else if (open_flags & MDS_OPEN_LOCK) mdt_set_disposition(info, ldlm_rep, DISP_OPEN_LOCK); } } /* Try to open it now. */ - rc = mdt_finish_open(info, parent, child, create_flags, + rc = mdt_finish_open(info, parent, child, open_flags, created, ldlm_rep); if (rc) { result = rc; - /* openlock will be released if mdt_finish_open failed */ + /* openlock will be released if mdt_finish_open() failed */ mdt_clear_disposition(info, ldlm_rep, DISP_OPEN_LOCK); - if (created && create_flags & MDS_OPEN_VOLATILE) { + if (created && (open_flags & MDS_OPEN_VOLATILE)) { CERROR("%s: cannot open volatile file "DFID", orphan " "file will be left in PENDING directory until " "next reboot, rc = %d\n", mdt_obd_name(mdt), @@ -2220,10 +2229,11 @@ out_reprocess: return rc; } -#define MFD_CLOSED(mode) ((mode) == MDS_FMODE_CLOSED) +#define MFD_CLOSED(open_flags) ((open_flags) == MDS_FMODE_CLOSED) + static int mdt_mfd_closed(struct mdt_file_data *mfd) { - return ((mfd == NULL) || MFD_CLOSED(mfd->mfd_mode)); + return ((mfd == NULL) || MFD_CLOSED(mfd->mfd_open_flags)); } int mdt_mfd_close(struct mdt_thread_info *info, struct mdt_file_data *mfd) @@ -2233,13 +2243,13 @@ int mdt_mfd_close(struct mdt_thread_info *info, struct mdt_file_data *mfd) struct md_attr *ma = &info->mti_attr; struct lu_fid *ofid = &info->mti_tmp_fid1; int rc = 0; - __u64 mode; - __u64 intent; + u64 open_flags; + u64 intent; bool discard = false; ENTRY; - mode = mfd->mfd_mode; + open_flags = mfd->mfd_open_flags; intent = ma->ma_attr_flags & MDS_CLOSE_INTENT; *ofid = *mdt_object_fid(o); @@ -2291,14 +2301,14 @@ int mdt_mfd_close(struct mdt_thread_info *info, struct mdt_file_data *mfd) /* continue to close even if error occured. */ } - if (mode & MDS_FMODE_WRITE) + if (open_flags & MDS_FMODE_WRITE) mdt_write_put(o); - else if (mode & MDS_FMODE_EXEC) + else if (open_flags & MDS_FMODE_EXEC) mdt_write_allow(o); /* Update atime on close only. */ - if ((mode & MDS_FMODE_EXEC || mode & MDS_FMODE_READ || - mode & MDS_FMODE_WRITE) && (ma->ma_valid & MA_INODE) && + if ((open_flags & MDS_FMODE_EXEC || open_flags & MDS_FMODE_READ || + open_flags & MDS_FMODE_WRITE) && (ma->ma_valid & MA_INODE) && (ma->ma_attr.la_valid & LA_ATIME)) { /* Set the atime only. */ ma->ma_valid = MA_INODE; @@ -2317,13 +2327,13 @@ int mdt_mfd_close(struct mdt_thread_info *info, struct mdt_file_data *mfd) atomic_dec(&o->mot_open_count); mdt_handle_last_unlink(info, o, ma); - if (!MFD_CLOSED(mode)) { - rc = mo_close(info->mti_env, next, ma, mode); + if (!MFD_CLOSED(open_flags)) { + rc = mo_close(info->mti_env, next, ma, open_flags); discard = mdt_dom_check_for_discard(info, o); } /* adjust open and lease count */ - if (mode & MDS_OPEN_LEASE) { + if (open_flags & MDS_OPEN_LEASE) { LASSERT(atomic_read(&o->mot_lease_count) > 0); atomic_dec(&o->mot_lease_count); } diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c index a7ca562..ad29829 100644 --- a/lustre/ptlrpc/wiretest.c +++ b/lustre/ptlrpc/wiretest.c @@ -257,6 +257,8 @@ void lustre_assert_wire_constants(void) (long long)MDS_ATTR_LSIZE); LASSERTF(MDS_ATTR_LBLOCKS == 0x0000000000040000ULL, "found 0x%.16llxULL\n", (long long)MDS_ATTR_LBLOCKS); + LASSERTF(MDS_ATTR_OVERRIDE == 0x0000000002000000ULL, "found 0x%.16llxULL\n", + (long long)MDS_ATTR_OVERRIDE); LASSERTF(FLD_QUERY == 900, "found %lld\n", (long long)FLD_QUERY); LASSERTF(FLD_READ == 901, "found %lld\n", @@ -2429,8 +2431,6 @@ void lustre_assert_wire_constants(void) MDS_FMODE_EXEC); LASSERTF(MDS_OPEN_CREATED == 000000000010UL, "found 0%.11oUL\n", MDS_OPEN_CREATED); - LASSERTF(MDS_OPEN_CROSS == 000000000020UL, "found 0%.11oUL\n", - MDS_OPEN_CROSS); LASSERTF(MDS_OPEN_CREAT == 000000000100UL, "found 0%.11oUL\n", MDS_OPEN_CREAT); LASSERTF(MDS_OPEN_EXCL == 000000000200UL, "found 0%.11oUL\n", diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c index 3ae1c4d..c14a965 100644 --- a/lustre/utils/wirecheck.c +++ b/lustre/utils/wirecheck.c @@ -1093,7 +1093,6 @@ check_mdt_body(void) CHECK_VALUE_O(MDS_FMODE_EXEC); CHECK_VALUE_O(MDS_OPEN_CREATED); - CHECK_VALUE_O(MDS_OPEN_CROSS); CHECK_VALUE_O(MDS_OPEN_CREAT); CHECK_VALUE_O(MDS_OPEN_EXCL); CHECK_VALUE_O(MDS_OPEN_TRUNC); @@ -2646,6 +2645,7 @@ main(int argc, char **argv) CHECK_VALUE_64X(MDS_ATTR_PROJID); CHECK_VALUE_64X(MDS_ATTR_LSIZE); CHECK_VALUE_64X(MDS_ATTR_LBLOCKS); + CHECK_VALUE_64X(MDS_ATTR_OVERRIDE); CHECK_VALUE(FLD_QUERY); CHECK_VALUE(FLD_READ); diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c index 0f574e9..f34e6f4 100644 --- a/lustre/utils/wiretest.c +++ b/lustre/utils/wiretest.c @@ -279,6 +279,8 @@ void lustre_assert_wire_constants(void) (long long)MDS_ATTR_LSIZE); LASSERTF(MDS_ATTR_LBLOCKS == 0x0000000000040000ULL, "found 0x%.16llxULL\n", (long long)MDS_ATTR_LBLOCKS); + LASSERTF(MDS_ATTR_OVERRIDE == 0x0000000002000000ULL, "found 0x%.16llxULL\n", + (long long)MDS_ATTR_OVERRIDE); LASSERTF(FLD_QUERY == 900, "found %lld\n", (long long)FLD_QUERY); LASSERTF(FLD_READ == 901, "found %lld\n", @@ -2451,8 +2453,6 @@ void lustre_assert_wire_constants(void) MDS_FMODE_EXEC); LASSERTF(MDS_OPEN_CREATED == 000000000010UL, "found 0%.11oUL\n", MDS_OPEN_CREATED); - LASSERTF(MDS_OPEN_CROSS == 000000000020UL, "found 0%.11oUL\n", - MDS_OPEN_CROSS); LASSERTF(MDS_OPEN_CREAT == 000000000100UL, "found 0%.11oUL\n", MDS_OPEN_CREAT); LASSERTF(MDS_OPEN_EXCL == 000000000200UL, "found 0%.11oUL\n",