From 41a0f2aa755ec7162facd30209f2fa3f40308766 Mon Sep 17 00:00:00 2001 From: Soumya Koduri Date: Wed, 18 Sep 2019 16:32:08 +0530 Subject: gfapi: 'glfs_h_creat_open' - new API to create handle and open fd Right now we have two separate APIs, one - 'glfs_h_creat_handle' to create handle & another - 'glfs_h_open' to create a glfd to return to application Having two separate routines can result in access errors while trying to create and write into a read-only file. Since a fd is opened even during file/directory creation, introducing a new API to make these two operations atomic i.e, which can create both handle & fd and pass them to application Change-Id: Ibf513fcfcdad175f4d7eb6fa7a61b8feec6d33b5 Fixes: bz#1753569 Signed-off-by: Soumya Koduri --- api/src/gfapi.aliases | 2 + api/src/gfapi.map | 5 ++ api/src/glfs-handleops.c | 135 +++++++++++++++++++++++++++++++++++++++++++++++ api/src/glfs-handles.h | 5 ++ 4 files changed, 147 insertions(+) (limited to 'api') diff --git a/api/src/gfapi.aliases b/api/src/gfapi.aliases index 023f8c77dce..c0e0fcfda08 100644 --- a/api/src/gfapi.aliases +++ b/api/src/gfapi.aliases @@ -197,3 +197,5 @@ _pub_glfs_fsetattr _glfs_fsetattr$GFAPI_6.0 _pub_glfs_setattr _glfs_setattr$GFAPI_6.0 _pub_glfs_set_statedump_path _glfs_set_statedump_path@GFAPI_7.0 + +_pub_glfs_h_creat_open _glfs_h_creat_open@GFAPI_FUTURE diff --git a/api/src/gfapi.map b/api/src/gfapi.map index ca20d6407e7..6c821b8dfe7 100644 --- a/api/src/gfapi.map +++ b/api/src/gfapi.map @@ -276,3 +276,8 @@ GFAPI_7.0 { global: glfs_set_statedump_path; } GFAPI_PRIVATE_6.1; + +GFAPI_FUTURE { + global: + glfs_h_creat_open; +} GFAPI_7.0; diff --git a/api/src/glfs-handleops.c b/api/src/glfs-handleops.c index 8b4307e1096..8f82a5cc7f1 100644 --- a/api/src/glfs-handleops.c +++ b/api/src/glfs-handleops.c @@ -842,6 +842,141 @@ invalid_fs: GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_h_creat, 3.4.2); +struct glfs_object * +pub_glfs_h_creat_open(struct glfs *fs, struct glfs_object *parent, + const char *path, int flags, mode_t mode, + struct stat *stat, struct glfs_fd **out_fd) +{ + int ret = -1; + struct glfs_fd *glfd = NULL; + xlator_t *subvol = NULL; + inode_t *inode = NULL; + loc_t loc = { + 0, + }; + struct iatt iatt = { + 0, + }; + uuid_t gfid; + dict_t *xattr_req = NULL; + struct glfs_object *object = NULL; + dict_t *fop_attr = NULL; + + /* validate in args */ + if ((fs == NULL) || (parent == NULL) || (path == NULL) || + (out_fd == NULL)) { + errno = EINVAL; + return NULL; + } + + DECLARE_OLD_THIS; + __GLFS_ENTRY_VALIDATE_FS(fs, invalid_fs); + + /* get the active volume */ + subvol = glfs_active_subvol(fs); + if (!subvol) { + ret = -1; + goto out; + } + + /* get/refresh the in arg objects inode in correlation to the xlator */ + inode = glfs_resolve_inode(fs, subvol, parent); + if (!inode) { + ret = -1; + goto out; + } + + xattr_req = dict_new(); + if (!xattr_req) { + ret = -1; + errno = ENOMEM; + goto out; + } + + gf_uuid_generate(gfid); + ret = dict_set_gfuuid(xattr_req, "gfid-req", gfid, true); + if (ret) { + ret = -1; + errno = ENOMEM; + goto out; + } + + GLFS_LOC_FILL_PINODE(inode, loc, ret, errno, out, path); + + glfd = glfs_fd_new(fs); + if (!glfd) { + ret = -1; + errno = ENOMEM; + goto out; + } + + glfd->fd = fd_create(loc.inode, getpid()); + if (!glfd->fd) { + ret = -1; + errno = ENOMEM; + goto out; + } + glfd->fd->flags = flags; + + ret = get_fop_attr_thrd_key(&fop_attr); + if (ret) + gf_msg_debug("gfapi", 0, "Getting leaseid from thread failed"); + + /* fop/op */ + ret = syncop_create(subvol, &loc, flags, mode, glfd->fd, &iatt, xattr_req, + NULL); + DECODE_SYNCOP_ERR(ret); + + /* populate out args */ + if (ret == 0) { + glfd->fd->flags = flags; + + ret = glfs_loc_link(&loc, &iatt); + if (ret != 0) { + goto out; + } + + if (stat) + glfs_iatt_to_stat(fs, &iatt, stat); + + ret = glfs_create_object(&loc, &object); + } + +out: + if (ret && object != NULL) { + /* Release the held reference */ + glfs_h_close(object); + object = NULL; + } + + loc_wipe(&loc); + + if (inode) + inode_unref(inode); + + if (fop_attr) + dict_unref(fop_attr); + + if (xattr_req) + dict_unref(xattr_req); + + if (ret && glfd) { + GF_REF_PUT(glfd); + } else if (glfd) { + glfd_set_state_bind(glfd); + *out_fd = glfd; + } + + glfs_subvol_done(fs, subvol); + + __GLFS_EXIT_FS; + +invalid_fs: + return object; +} + +GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_h_creat_open, FUTURE); + struct glfs_object * pub_glfs_h_mkdir(struct glfs *fs, struct glfs_object *parent, const char *path, mode_t mode, struct stat *stat) diff --git a/api/src/glfs-handles.h b/api/src/glfs-handles.h index f7e6a06453f..475f450801e 100644 --- a/api/src/glfs-handles.h +++ b/api/src/glfs-handles.h @@ -250,6 +250,11 @@ int glfs_h_access(glfs_t *fs, glfs_object_t *object, int mask) __THROW GFAPI_PUBLIC(glfs_h_access, 3.6.0); +struct glfs_object * +glfs_h_creat_open(struct glfs *fs, struct glfs_object *parent, const char *path, + int flags, mode_t mode, struct stat *stat, + struct glfs_fd **out_fd) __THROW + GFAPI_PUBLIC(glfs_h_creat_open, FUTURE); /* SYNOPSIS -- cgit