|
 |
233933 |
From e44b75fdb86dcf759204816c873b4f9f4efbefa8 Mon Sep 17 00:00:00 2001
|
|
|
233933 |
From: Susant Palai <spalai@redhat.com>
|
|
|
233933 |
Date: Tue, 21 May 2019 16:17:09 +0530
|
|
|
233933 |
Subject: [PATCH 142/169] lock: check null value of dict to avoid log flooding
|
|
|
233933 |
|
|
|
233933 |
> updates: bz#1712322
|
|
|
233933 |
> Change-Id: I120a1d23506f9ebcf88c7ea2f2eff4978a61cf4a
|
|
|
233933 |
> Signed-off-by: Susant Palai <spalai@redhat.com>
|
|
|
233933 |
(backport of fix https://review.gluster.org/#/c/glusterfs/+/22756/)
|
|
|
233933 |
|
|
|
233933 |
BUG: bz#1704181
|
|
|
233933 |
Change-Id: I2a192236328ebb39666ffef1146df312c08a377d
|
|
|
233933 |
Signed-off-by: Susant Palai <spalai@redhat.com>
|
|
|
233933 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/171325
|
|
|
233933 |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
233933 |
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
|
233933 |
---
|
|
|
233933 |
xlators/features/locks/src/posix.c | 2 +-
|
|
|
233933 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
233933 |
|
|
|
233933 |
diff --git a/xlators/features/locks/src/posix.c b/xlators/features/locks/src/posix.c
|
|
|
233933 |
index 3f1c7a7..adb0df5 100644
|
|
|
233933 |
--- a/xlators/features/locks/src/posix.c
|
|
|
233933 |
+++ b/xlators/features/locks/src/posix.c
|
|
|
233933 |
@@ -121,7 +121,7 @@ fetch_pathinfo(xlator_t *, inode_t *, int32_t *, char **);
|
|
|
233933 |
|
|
|
233933 |
#define PL_CHECK_LOCK_ENFORCE_KEY(frame, dict, name, this, loc, fd, priv) \
|
|
|
233933 |
do { \
|
|
|
233933 |
- if (dict_get(dict, GF_ENFORCE_MANDATORY_LOCK) || \
|
|
|
233933 |
+ if ((dict && (dict_get(dict, GF_ENFORCE_MANDATORY_LOCK))) || \
|
|
|
233933 |
(name && (strcmp(name, GF_ENFORCE_MANDATORY_LOCK) == 0))) { \
|
|
|
233933 |
inode_t *__inode = (loc ? loc->inode : fd->inode); \
|
|
|
233933 |
pl_inode_t *__pl_inode = pl_inode_get(this, __inode, NULL); \
|
|
|
233933 |
--
|
|
|
233933 |
1.8.3.1
|
|
|
233933 |
|