The branch, master has been updated
via a96f0542c83 vfs_ceph_new: Do not resolve by inode number
via 9341d7fb466 vfs_ceph_new: Handle absolute path in vfs_ceph_ll_walk
via ee1c3e1db9a vfs_ceph_new: Remove unused code in cephmount_mount_fs()
via c5ddd94a085 vfs_ceph_new: Remove redundant re-intialization to NULL
from 0d7ea9cfb60 s4:auth: let auth_user_info_dc_expand_sids() add This
Organization SID
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a96f0542c8317a7dd0470b32350de6893fd98723
Author: Anoop C S <anoo...@samba.org>
Date: Tue Feb 25 17:40:13 2025 +0530
vfs_ceph_new: Do not resolve by inode number
CephFS snapshots within snap directory shares the same inode number from
its parent. Until unless we resolve by name we may incorrectly point at
an inode which is not a snapshot directory. Therefore to be functionally
correct we avoid resolving by inode number but proper name.
For example:
path (ino = 3)
|
--- dir (ino = 4)
|
--- .snap (ino = 3)
|
--- snap1 (ino = 3)
|
--- dir (ino = 4)
In this case an attempt to resolve 'snap1' by inode number 3 results in
pointing at 'path' which is not the desired outcome.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15818
Signed-off-by: Anoop C S <anoo...@samba.org>
Reviewed-by: Guenther Deschner <g...@samba.org>
Autobuild-User(master): Günther Deschner <g...@samba.org>
Autobuild-Date(master): Fri Mar 7 18:20:47 UTC 2025 on atb-devel-224
commit 9341d7fb466c95ea5aa0643049ce2a1f4183b9d0
Author: Anoop C S <anoo...@samba.org>
Date: Mon Feb 24 14:00:56 2025 +0530
vfs_ceph_new: Handle absolute path in vfs_ceph_ll_walk
It can very well be the case that the incoming path is absolute in
nature which breaks the assumption inside vfs_ceph_ll_walk that it
is within the current working directory. Instead perform a check to
see whether the path includes current working directory path in its
components and accordingly trim it to make it relative in nature.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15818
Signed-off-by: Anoop C S <anoo...@samba.org>
Reviewed-by: Guenther Deschner <g...@samba.org>
commit ee1c3e1db9a2d12ba6d9dd24faccf0020b1daf0d
Author: Anoop C S <anoo...@samba.org>
Date: Mon Feb 24 12:09:06 2025 +0530
vfs_ceph_new: Remove unused code in cephmount_mount_fs()
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15818
Signed-off-by: Anoop C S <anoo...@samba.org>
Reviewed-by: Guenther Deschner <g...@samba.org>
commit c5ddd94a08503a52914ce351ebf1083178e8c8bc
Author: Anoop C S <anoo...@samba.org>
Date: Mon Feb 24 11:54:45 2025 +0530
vfs_ceph_new: Remove redundant re-intialization to NULL
TALLOC_FREE() by default re-initializes the pointer to NULL after
corresponding memory is freed.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15818
Signed-off-by: Anoop C S <anoo...@samba.org>
Reviewed-by: Guenther Deschner <g...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/modules/vfs_ceph_new.c | 147 +++++++++++++----------------------------
1 file changed, 47 insertions(+), 100 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_ceph_new.c b/source3/modules/vfs_ceph_new.c
index e705722e820..4ef800951d2 100644
--- a/source3/modules/vfs_ceph_new.c
+++ b/source3/modules/vfs_ceph_new.c
@@ -107,7 +107,6 @@ struct vfs_ceph_config {
enum vfs_cephfs_proxy_mode proxy;
void *libhandle;
- CEPH_FN(ceph_ll_lookup_inode);
CEPH_FN(ceph_ll_walk);
CEPH_FN(ceph_ll_getattr);
CEPH_FN(ceph_ll_setattr);
@@ -274,7 +273,6 @@ static struct ceph_mount_info *cephmount_mount_fs(
struct vfs_ceph_config *config)
{
int ret;
- char buf[256];
struct ceph_mount_info *mnt = NULL;
/* if config_file and/or user_id are NULL, ceph will use defaults */
@@ -294,12 +292,6 @@ static struct ceph_mount_info *cephmount_mount_fs(
goto out;
}
- DBG_DEBUG("[CEPH] calling ceph_conf_get: option='%s'\n", "log_file");
- ret = config->ceph_conf_get_fn(mnt, "log_file", buf, sizeof(buf));
- if (ret < 0) {
- goto out;
- }
-
/* libcephfs disables POSIX ACL support by default, enable it... */
ret = cephmount_update_conf(config,
mnt,
@@ -396,7 +388,6 @@ static bool vfs_cephfs_load_lib(struct vfs_ceph_config
*config)
break;
}
- CHECK_CEPH_FN(libhandle, ceph_ll_lookup_inode);
CHECK_CEPH_FN(libhandle, ceph_ll_walk);
CHECK_CEPH_FN(libhandle, ceph_ll_getattr);
CHECK_CEPH_FN(libhandle, ceph_ll_setattr);
@@ -701,10 +692,7 @@ static struct dirent *vfs_ceph_get_fh_dirent(struct
vfs_ceph_fh *cfh)
static void vfs_ceph_put_fh_dirent(struct vfs_ceph_fh *cfh)
{
- if (cfh->de != NULL) {
- TALLOC_FREE(cfh->de);
- cfh->de = NULL;
- }
+ TALLOC_FREE(cfh->de);
}
static int vfs_ceph_release_fh(struct vfs_ceph_fh *cfh)
@@ -801,21 +789,6 @@ static void vfs_ceph_assign_fh_fd(struct vfs_ceph_fh *cfh)
/* Ceph low-level wrappers */
-static int vfs_ceph_ll_lookup_inode(const struct vfs_handle_struct *handle,
- uint64_t inoval,
- Inode **pout)
-{
- struct inodeno_t ino = {.val = inoval};
- struct vfs_ceph_config *config = NULL;
-
- SMB_VFS_HANDLE_GET_DATA(handle, config, struct vfs_ceph_config,
- return -ENOMEM);
-
- DBG_DEBUG("[CEPH] ceph_ll_lookup_inode: ino=%" PRIu64 "\n", inoval);
-
- return config->ceph_ll_lookup_inode_fn(config->mount, ino, pout);
-}
-
static int vfs_ceph_ll_walk(const struct vfs_handle_struct *handle,
const char *name,
struct Inode **pin,
@@ -826,10 +799,31 @@ static int vfs_ceph_ll_walk(const struct
vfs_handle_struct *handle,
struct UserPerm *uperm = NULL;
int ret = -1;
struct vfs_ceph_config *config = NULL;
+ const char *cwd = NULL;
+ size_t cwdlen;
SMB_VFS_HANDLE_GET_DATA(handle, config, struct vfs_ceph_config,
return -ENOMEM);
+ cwd = config->ceph_getcwd_fn(config->mount);
+ cwdlen = strlen(cwd);
+
+ /*
+ * ceph_ll_walk() always operate on "name" relative to current working
+ * directory even if it starts with a '/' i.e, absolute path is never
+ * honoured. But why?? For now stick to the current behaviour and ensure
+ * that the "name" is always relative when it contains current working
+ * directory path with an exception to "/".
+ */
+ if ((strcmp(cwd, "/") != 0) &&
+ (strncmp(name, cwd, cwdlen) == 0)) {
+ if (name[cwdlen] == '/') {
+ name += cwdlen + 1;
+ } else if (name[cwdlen] == '\0') {
+ name = ".";
+ }
+ }
+
DBG_DEBUG("[CEPH] ceph_ll_walk: name=%s\n", name);
uperm = vfs_ceph_userperm_new(config, handle->conn);
@@ -1824,74 +1818,30 @@ static int64_t vfs_ceph_ll_nonblocking_readv_writev(
/* Ceph Inode-refernce get/put wrappers */
static int vfs_ceph_iget(const struct vfs_handle_struct *handle,
- uint64_t ino,
const char *name,
unsigned int flags,
struct vfs_ceph_iref *iref)
{
struct Inode *inode = NULL;
int ret = -1;
+ struct ceph_statx stx = {.stx_ino = 0};
- if (ino > CEPH_INO_ROOT) {
- /* get-by-ino */
- ret = vfs_ceph_ll_lookup_inode(handle, ino, &inode);
- if (ret != 0) {
- return ret;
- }
- } else {
- /* get-by-path */
- struct ceph_statx stx = {.stx_ino = 0};
-
- ret = vfs_ceph_ll_walk(handle,
- name,
- &inode,
- &stx,
- CEPH_STATX_INO,
- flags);
- if (ret != 0) {
- return ret;
- }
- ino = stx.stx_ino;
+ ret = vfs_ceph_ll_walk(handle,
+ name,
+ &inode,
+ &stx,
+ CEPH_STATX_INO,
+ flags);
+ if (ret != 0) {
+ return ret;
}
iref->inode = inode;
- iref->ino = ino;
+ iref->ino = stx.stx_ino;
iref->owner = true;
DBG_DEBUG("[CEPH] iget: %s ino=%" PRIu64 "\n", name, iref->ino);
return 0;
}
-static int vfs_ceph_iget_by_fname(const struct vfs_handle_struct *handle,
- const struct smb_filename *smb_fname,
- struct vfs_ceph_iref *iref)
-{
- const char *name = smb_fname->base_name;
- const char *cwd = NULL;
- int ret = -1;
- struct vfs_ceph_config *config = NULL;
-
- SMB_VFS_HANDLE_GET_DATA(handle, config, struct vfs_ceph_config,
- return -ENOMEM);
-
- cwd = config->ceph_getcwd_fn(config->mount);
- if (!strcmp(name, cwd)) {
- ret = vfs_ceph_iget(handle, 0, "./", 0, iref);
- } else {
- ret = vfs_ceph_iget(handle, 0, name, 0, iref);
- }
- return ret;
-}
-
-static int vfs_ceph_igetl(const struct vfs_handle_struct *handle,
- const struct smb_filename *smb_fname,
- struct vfs_ceph_iref *iref)
-{
- return vfs_ceph_iget(handle,
- 0,
- smb_fname->base_name,
- AT_SYMLINK_NOFOLLOW,
- iref);
-}
-
static int vfs_ceph_igetd(struct vfs_handle_struct *handle,
const struct files_struct *dirfsp,
struct vfs_ceph_iref *iref)
@@ -1910,25 +1860,16 @@ static int vfs_ceph_igetd(struct vfs_handle_struct
*handle,
/* case-2: resolve by current work-dir */
if (fsp_get_pathref_fd(dirfsp) == AT_FDCWD) {
- return vfs_ceph_iget(handle, 0, ".", 0, iref);
+ return vfs_ceph_iget(handle, ".", 0, iref);
}
/* case-3: resolve by parent dir and name */
return vfs_ceph_iget(handle,
- dirfsp->file_id.inode,
dirfsp->fsp_name->base_name,
AT_SYMLINK_NOFOLLOW,
iref);
}
-static int vfs_ceph_igetf(struct vfs_handle_struct *handle,
- const struct files_struct *fsp,
- struct vfs_ceph_iref *iref)
-{
- return vfs_ceph_iget(
- handle, fsp->file_id.inode, fsp->fsp_name->base_name, 0, iref);
-}
-
static void vfs_ceph_iput(const struct vfs_handle_struct *handle,
struct vfs_ceph_iref *iref)
{
@@ -1994,7 +1935,7 @@ static int vfs_ceph_statvfs(struct vfs_handle_struct
*handle,
struct vfs_ceph_iref iref = {0};
int ret;
- ret = vfs_ceph_iget_by_fname(handle, smb_fname, &iref);
+ ret = vfs_ceph_iget(handle, smb_fname->base_name, 0, &iref);
if (ret != 0) {
goto out;
}
@@ -2935,7 +2876,7 @@ static int vfs_ceph_stat(struct vfs_handle_struct *handle,
goto out;
}
- result = vfs_ceph_iget_by_fname(handle, smb_fname, &iref);
+ result = vfs_ceph_iget(handle, smb_fname->base_name, 0, &iref);
if (result != 0) {
goto out;
}
@@ -3031,7 +2972,10 @@ static int vfs_ceph_lstat(struct vfs_handle_struct
*handle,
goto out;
}
- result = vfs_ceph_igetl(handle, smb_fname, &iref);
+ result = vfs_ceph_iget(handle,
+ smb_fname->base_name,
+ AT_SYMLINK_NOFOLLOW,
+ &iref);
if (result != 0) {
goto out;
}
@@ -3169,7 +3113,10 @@ static int vfs_ceph_lchown(struct vfs_handle_struct
*handle,
uid,
gid);
- result = vfs_ceph_igetl(handle, smb_fname, &iref);
+ result = vfs_ceph_iget(handle,
+ smb_fname->base_name,
+ AT_SYMLINK_NOFOLLOW,
+ &iref);
if (result != 0) {
goto out;
}
@@ -3686,7 +3633,7 @@ static ssize_t vfs_ceph_fgetxattr(struct
vfs_handle_struct *handle,
} else {
struct vfs_ceph_iref iref = {0};
- ret = vfs_ceph_igetf(handle, fsp, &iref);
+ ret = vfs_ceph_iget(handle, fsp->fsp_name->base_name, 0, &iref);
if (ret != 0) {
goto out;
}
@@ -3732,7 +3679,7 @@ static ssize_t vfs_ceph_flistxattr(struct
vfs_handle_struct *handle,
} else {
struct vfs_ceph_iref iref = {0};
- ret = vfs_ceph_igetf(handle, fsp, &iref);
+ ret = vfs_ceph_iget(handle, fsp->fsp_name->base_name, 0, &iref);
if (ret != 0) {
goto out;
}
@@ -3771,7 +3718,7 @@ static int vfs_ceph_fremovexattr(struct vfs_handle_struct
*handle,
} else {
struct vfs_ceph_iref iref = {0};
- ret = vfs_ceph_igetf(handle, fsp, &iref);
+ ret = vfs_ceph_iget(handle, fsp->fsp_name->base_name, 0, &iref);
if (ret != 0) {
goto out;
}
@@ -3817,7 +3764,7 @@ static int vfs_ceph_fsetxattr(struct vfs_handle_struct
*handle,
} else {
struct vfs_ceph_iref iref = {0};
- ret = vfs_ceph_igetf(handle, fsp, &iref);
+ ret = vfs_ceph_iget(handle, fsp->fsp_name->base_name, 0, &iref);
if (ret != 0) {
goto out;
}
--
Samba Shared Repository
