]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #61940 into wip-jcollin-testing-20251107.120120-reef wip-jcollin-testing-20251107.120120-reef testing/wip-jcollin-testing-20251107.120120-reef
authorJos Collin <jcollin@redhat.com>
Fri, 7 Nov 2025 12:01:26 +0000 (17:31 +0530)
committerJos Collin <jcollin@redhat.com>
Fri, 7 Nov 2025 12:01:26 +0000 (17:31 +0530)
* refs/pull/61940/head:
qa: test file create on damaged directory
mds: do not path traverse a damaged dirfrag
mds: use system error codes instead of CEPHFS_EXX
mds,client: change result field handling in the MClientReply message
mds: prepare infra to replace CEPHFS_EXXX codes to system codes
pybind/cephfs: switch CEPHFS_E error codes to system error codes
PendingReleaseNotes: add note on client/mds error codes

1  2 
PendingReleaseNotes
src/client/Client.cc
src/mds/MDSDaemon.cc
src/mds/MDSRank.cc
src/mds/Server.cc
src/test/libcephfs/suidsgid.cc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index ce9f5eef295820b0b1b01a1f8747246b22b6c0bf,2ca38349a720a155ee405aa29ecda1c998a266b3..78369dabcf84648bc78144a7f1d3441a96cb92ed
@@@ -140,20 -139,9 +140,20 @@@ void run_change_mode_test_case(
    char c_dir[1024];
    sprintf(c_dir, "/mode_test_%d", getpid());
    ASSERT_EQ(0, ceph_mkdirs(admin, c_dir, 0700));
-   ASSERT_EQ(ceph_chmod(cmount, c_dir, 0777), -CEPHFS_EPERM);
+   ASSERT_EQ(ceph_chmod(cmount, c_dir, 0777), -EPERM);
  }
  
 +static void run_set_sgid_suid_test_case(int old_suid_sgid,
 +                                      int new_suid_sgid,
 +                                      int expected_result)
 +{
 +  char c_dir[1024];
 +  sprintf(c_dir, "/mode_test_%d", getpid());
 +  const int mode = 0766;
 +  ASSERT_EQ(ceph_mkdirs(admin, c_dir, mode | old_suid_sgid), 0);
 +  ASSERT_EQ(ceph_chmod(cmount, c_dir, mode | new_suid_sgid), expected_result);
 +}
 +
  TEST(SuidsgidTest, WriteClearSetuid) {
    ASSERT_EQ(0, ceph_create(&admin, NULL));
    ASSERT_EQ(0, ceph_conf_read_file(admin, NULL));