From 640926b917967b675cf3e7bd44aed1a70d8c6824 Mon Sep 17 00:00:00 2001
From: Pranith Kumar K <pkarampu@redhat.com>
Date: Sat, 9 May 2020 09:27:20 +0530
Subject: debug/error-gen: Don't return EBADF for loc fops

The following crash happens when EBADF is returned
for some of the loc operations. EBADF should be returned only
for fd based fops

(data=0x7ff1700606e8) at
/home/jenkins/root/workspace/centos7-regression/xlators/cluster/dht/src/dht-helper.c:502
	loc = {path = 0x0, name = 0x0, inode = 0x0, parent = 0x0, gfid = '\000'
<repeats 15 times>, pargfid = '\000' <repeats 15 times>}
        ret = -1
        frame = 0x7ff1700606e8
        local = 0x7ff170049208
        fd = 0x0
        this = 0x7ff17c01d720
        subvol = 0x7ff17c0197f0
        __FUNCTION__ = "dht_check_and_open_fd_on_subvol_task"
/home/jenkins/root/workspace/centos7-regression/libglusterfs/src/syncop.c:279
        task = 0x7ff17c0b4920

Fixes: #1230
Change-Id: I24c11a8820a3c8b4070127e69c520e2c61e70930
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
---
 xlators/debug/error-gen/src/error-gen.c | 42 ++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 22 deletions(-)

(limited to 'xlators/debug/error-gen/src/error-gen.c')

diff --git a/xlators/debug/error-gen/src/error-gen.c b/xlators/debug/error-gen/src/error-gen.c
index ff993f7b5e5..0158e8d8546 100644
--- a/xlators/debug/error-gen/src/error-gen.c
+++ b/xlators/debug/error-gen/src/error-gen.c
@@ -31,9 +31,9 @@
 sys_error_t error_no_list[] = {
     [GF_FOP_LOOKUP] = {.error_no_count = 4,
                        .error_no = {ENOENT, ENOTDIR, ENAMETOOLONG, EAGAIN}},
-    [GF_FOP_STAT] = {.error_no_count = 7,
-                     .error_no = {EACCES, EBADF, EFAULT, ENAMETOOLONG, ENOENT,
-                                  ENOMEM, ENOTDIR}},
+    [GF_FOP_STAT] = {.error_no_count = 6,
+                     .error_no = {EACCES, EFAULT, ENAMETOOLONG, ENOENT, ENOMEM,
+                                  ENOTDIR}},
     [GF_FOP_READLINK] = {.error_no_count = 8,
                          .error_no = {EACCES, EFAULT, EINVAL, EIO, ENAMETOOLONG,
                                       ENOENT, ENOMEM, ENOTDIR}},
@@ -79,21 +79,20 @@ sys_error_t error_no_list[] = {
     [GF_FOP_WRITE] = {.error_no_count = 7,
                       .error_no = {EINVAL, EBADF, EFAULT, EISDIR, ENAMETOOLONG,
                                    ENOSPC, GF_ERROR_SHORT_WRITE}},
-    [GF_FOP_STATFS] = {.error_no_count = 10,
-                       .error_no = {EACCES, EBADF, EFAULT, EINTR, EIO,
-                                    ENAMETOOLONG, ENOENT, ENOMEM, ENOSYS,
-                                    ENOTDIR}},
+    [GF_FOP_STATFS] = {.error_no_count = 9,
+                       .error_no = {EACCES, EFAULT, EINTR, EIO, ENAMETOOLONG,
+                                    ENOENT, ENOMEM, ENOSYS, ENOTDIR}},
     [GF_FOP_FLUSH] = {.error_no_count = 5,
                       .error_no = {EACCES, EFAULT, ENAMETOOLONG, ENOSYS,
                                    ENOENT}},
     [GF_FOP_FSYNC] = {.error_no_count = 4,
                       .error_no = {EBADF, EIO, EROFS, EINVAL}},
-    [GF_FOP_SETXATTR] = {.error_no_count = 4,
-                         .error_no = {EACCES, EBADF, EINTR, ENAMETOOLONG}},
-    [GF_FOP_GETXATTR] = {.error_no_count = 4,
-                         .error_no = {EACCES, EBADF, ENAMETOOLONG, EINTR}},
-    [GF_FOP_REMOVEXATTR] = {.error_no_count = 4,
-                            .error_no = {EACCES, EBADF, ENAMETOOLONG, EINTR}},
+    [GF_FOP_SETXATTR] = {.error_no_count = 3,
+                         .error_no = {EACCES, EINTR, ENAMETOOLONG}},
+    [GF_FOP_GETXATTR] = {.error_no_count = 3,
+                         .error_no = {EACCES, ENAMETOOLONG, EINTR}},
+    [GF_FOP_REMOVEXATTR] = {.error_no_count = 3,
+                            .error_no = {EACCES, ENAMETOOLONG, EINTR}},
     [GF_FOP_FSETXATTR] = {.error_no_count = 4,
                           .error_no = {EACCES, EBADF, EINTR, ENAMETOOLONG}},
     [GF_FOP_FGETXATTR] = {.error_no_count = 4,
@@ -125,26 +124,25 @@ sys_error_t error_no_list[] = {
                                      ENOENT}},
     [GF_FOP_FXATTROP] = {.error_no_count = 4,
                          .error_no = {EBADF, EIO, EROFS, EINVAL}},
-    [GF_FOP_INODELK] = {.error_no_count = 4,
-                        .error_no = {EACCES, EBADF, EINTR, ENAMETOOLONG}},
+    [GF_FOP_INODELK] = {.error_no_count = 3,
+                        .error_no = {EACCES, EINTR, ENAMETOOLONG}},
     [GF_FOP_FINODELK] = {.error_no_count = 4,
                          .error_no = {EACCES, EBADF, EINTR, ENAMETOOLONG}},
-    [GF_FOP_ENTRYLK] = {.error_no_count = 4,
-                        .error_no = {EACCES, EBADF, ENAMETOOLONG, EINTR}},
+    [GF_FOP_ENTRYLK] = {.error_no_count = 3,
+                        .error_no = {EACCES, ENAMETOOLONG, EINTR}},
     [GF_FOP_FENTRYLK] = {.error_no_count = 10,
                          .error_no = {EACCES, EEXIST, EFAULT, EISDIR, EMFILE,
                                       ENAMETOOLONG, ENFILE, ENODEV, ENOENT,
                                       ENOMEM}},
-    [GF_FOP_SETATTR] = {.error_no_count = 11,
+    [GF_FOP_SETATTR] = {.error_no_count = 10,
                         .error_no = {EACCES, EFAULT, EIO, ENAMETOOLONG, ENOENT,
-                                     ENOMEM, ENOTDIR, EPERM, EROFS, EBADF,
-                                     EIO}},
+                                     ENOMEM, ENOTDIR, EPERM, EROFS, EIO}},
     [GF_FOP_FSETATTR] = {.error_no_count = 11,
                          .error_no = {EACCES, EFAULT, EIO, ENAMETOOLONG, ENOENT,
                                       ENOMEM, ENOTDIR, EPERM, EROFS, EBADF,
                                       EIO}},
-    [GF_FOP_GETSPEC] = {.error_no_count = 4,
-                        .error_no = {EACCES, EBADF, ENAMETOOLONG, EINTR}}};
+    [GF_FOP_GETSPEC] = {.error_no_count = 3,
+                        .error_no = {EACCES, ENAMETOOLONG, EINTR}}};
 
 int
 generate_rand_no(int op_no)
-- 
cgit