From d80763495f24d6067feb3a13fd10d12554d99252 Mon Sep 17 00:00:00 2001 From: liqiang Date: Fri, 18 Aug 2023 17:28:57 +0800 Subject: [PATCH] fix some issues Signed-off-by: liqiang --- qtfs/ipc/uds_main.c | 3 +-- qtfs/qtfs/sb.c | 9 +++++++-- qtfs/qtfs_common/user_engine.c | 8 ++++---- qtfs/qtinfo/qtinfo.c | 2 +- qtfs/rexec/rexec.c | 4 ++-- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/qtfs/ipc/uds_main.c b/qtfs/ipc/uds_main.c index cea0b1a..d559d01 100644 --- a/qtfs/ipc/uds_main.c +++ b/qtfs/ipc/uds_main.c @@ -190,7 +190,7 @@ void uds_main_loop(int efd, struct uds_thread_arg *arg) uds_event_pre_hook(p_event_var); for (int i = 0; i < n; i++) { udsevt = (struct uds_event *)evts[i].data.ptr; - uds_log("event fd:%d events:%d tofree:%d", udsevt->fd, evts[i].events, udsevt->tofree); + uds_log("event fd:%d events:%d tofree:%u", udsevt->fd, evts[i].events, udsevt->tofree); if (udsevt->handler == NULL) { uds_err("bad event, fd:%d handler is NULL.", udsevt->fd); continue; @@ -414,7 +414,6 @@ void uds_del_event(struct uds_event *evt) } uds_event_delete(p_uds_var->efd[hash], evt->fd); free(evt); - evt = NULL; return; } diff --git a/qtfs/qtfs/sb.c b/qtfs/qtfs/sb.c index faafa76..f7fdfe8 100644 --- a/qtfs/qtfs/sb.c +++ b/qtfs/qtfs/sb.c @@ -1571,7 +1571,7 @@ int qtfs_dentry_revalidate(struct dentry *dentry, unsigned int flags) struct qtfs_conn_var_s *pvar = NULL; struct qtreq_getattr *req; struct qtrsp_getattr *rsp; - struct inode *inode = dentry->d_inode; + struct inode *inode = NULL; if (dentry && dentry->d_inode) { if (jiffies_to_msecs(jiffies - dentry->d_time) < 2000) return 1; @@ -1596,7 +1596,12 @@ int qtfs_dentry_revalidate(struct dentry *dentry, unsigned int flags) return 0; } - if (!inode || inode->i_ino != rsp->stat.ino || inode->i_mode != rsp->stat.mode) { + inode = dentry->d_inode; + if (inode == NULL) { + qtfs_conn_put_param(pvar); + return 0; + } + if (inode->i_ino != rsp->stat.ino || inode->i_mode != rsp->stat.mode) { if (inode->i_nlink > 0) drop_nlink(inode); qtfs_conn_put_param(pvar); diff --git a/qtfs/qtfs_common/user_engine.c b/qtfs/qtfs_common/user_engine.c index 31947b2..3337c34 100644 --- a/qtfs/qtfs_common/user_engine.c +++ b/qtfs/qtfs_common/user_engine.c @@ -183,7 +183,7 @@ static void *qtfs_engine_kthread(void *arg) continue; } ret = ioctl(qtfs_fd, QTFS_IOCTL_EXIT, 0); - engine_out("qtfs engine send QTFS_IOCTL_EXIT to kernel, get return value:%d.", ret); + engine_out("qtfs engine send QTFS_IOCTL_EXIT to kernel, get return value:%ld.", ret); engine_run = 0; break; } @@ -229,7 +229,7 @@ static void *qtfs_engine_epoll_thread(void *data) } } end: - engine_out("qtfs server epoll thread exit, ret:%d.", ret); + engine_out("qtfs server epoll thread exit, ret:%ld.", ret); return NULL; } @@ -354,7 +354,7 @@ static int qtfs_engine_check_port(unsigned short port, char *scid) } int sockfd = socket(AF_INET, SOCK_STREAM, 0); if (sockfd < 0) { - engine_err("socket error, fd:%", sockfd); + engine_err("socket error, fd:%d", sockfd); return -1; } bzero(&sin, sizeof(sin)); @@ -389,7 +389,7 @@ static int qtfs_engine_check_port(unsigned short port, char *scid) int sock_fd = socket(saddr.svm_family, SOCK_STREAM, 0); if (bind(sock_fd, (struct sockaddr *)&saddr, sizeof(saddr)) < 0) { - engine_err("cid:%u port:%u bind failed, errno:%d.", cid, port, errno); + engine_err("cid:%ld port:%u bind failed, errno:%d.", cid, port, errno); close(sock_fd); return -1; } diff --git a/qtfs/qtinfo/qtinfo.c b/qtfs/qtinfo/qtinfo.c index 93dbd6b..4c915ae 100644 --- a/qtfs/qtinfo/qtinfo.c +++ b/qtfs/qtinfo/qtinfo.c @@ -511,7 +511,7 @@ static void qtinfo_opt_z_bytype(int fd, unsigned int type) ret = ioctl(fd, QTFS_IOCTL_WL_GET, &head); if (ret != QTOK) break; - qtinfo_out(" [index:%d][path:%s]", index, head.path); + qtinfo_out(" [index:%u][path:%s]", index, head.path); } return; } diff --git a/qtfs/rexec/rexec.c b/qtfs/rexec/rexec.c index a214a74..060abc5 100644 --- a/qtfs/rexec/rexec.c +++ b/qtfs/rexec/rexec.c @@ -577,14 +577,14 @@ static int rexec_handshake_init(int efd, int connfd) { char *hs_read = getenv("REXEC_HANDSHAKE_RD"); if (hs_read == NULL) { - rexec_log("handshake not in effect, read:%lx", hs_read); + rexec_log("handshake not in effect."); return 0; } g_rexec.rexec_hs_fd[PIPE_READ] = atoi(hs_read); char *hs_write = getenv("REXEC_HANDSHAKE_WR"); if (hs_write == NULL) { - rexec_log("handshake not in effect, wirte:%lx", hs_write); + rexec_log("handshake not in effect, read:%s", hs_read); g_rexec.rexec_hs_fd[PIPE_READ] = -1; return 0; } -- Gitee