From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: linux-nfs-owner@vger.kernel.org Received: from mx1.redhat.com ([209.132.183.28]:56574 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753640Ab1LUUfZ (ORCPT ); Wed, 21 Dec 2011 15:35:25 -0500 From: Jeff Layton To: bfields@fieldses.org, steved@redhat.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH v3 05/10] nfsdcld: add remove functionality Date: Wed, 21 Dec 2011 15:35:17 -0500 Message-Id: <1324499722-10363-6-git-send-email-jlayton@redhat.com> In-Reply-To: <1324499722-10363-1-git-send-email-jlayton@redhat.com> References: <1324499722-10363-1-git-send-email-jlayton@redhat.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: Allow the kernel to ask for removal of a client record. Signed-off-by: Jeff Layton --- utils/nfsdcld/nfsdcld.c | 29 +++++++++++++++++++++++++++++ utils/nfsdcld/sqlite.c | 35 +++++++++++++++++++++++++++++++++++ utils/nfsdcld/sqlite.h | 1 + 3 files changed, 65 insertions(+), 0 deletions(-) diff --git a/utils/nfsdcld/nfsdcld.c b/utils/nfsdcld/nfsdcld.c index 8466868..885d79e 100644 --- a/utils/nfsdcld/nfsdcld.c +++ b/utils/nfsdcld/nfsdcld.c @@ -160,6 +160,32 @@ cld_not_implemented(struct cld_client *clnt) } static void +cld_remove(struct cld_client *clnt) +{ + int ret; + ssize_t bsize, wsize; + struct cld_msg *cmsg = &clnt->cl_msg; + + xlog(D_GENERAL, "%s: remove client record.", __func__); + + ret = sqlite_remove_client(cmsg->cm_u.cm_name.cn_id, + cmsg->cm_u.cm_name.cn_len); + + /* set up reply */ + cmsg->cm_status = ret ? -EREMOTEIO : ret; + + bsize = sizeof(*cmsg); + + xlog(D_GENERAL, "Doing downcall with status %d", cmsg->cm_status); + wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize); + if (wsize != bsize) { + xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m", + __func__, wsize); + cld_pipe_reopen(clnt); + } +} + +static void cldcb(int UNUSED(fd), short which, void *data) { ssize_t len; @@ -186,6 +212,9 @@ cldcb(int UNUSED(fd), short which, void *data) case Cld_Create: cld_create(clnt); break; + case Cld_Expire: + cld_remove(clnt); + break; default: xlog_warn("%s: command %u is not yet implemented", __func__, cmsg->cm_cmd); diff --git a/utils/nfsdcld/sqlite.c b/utils/nfsdcld/sqlite.c index 606d714..a90e112 100644 --- a/utils/nfsdcld/sqlite.c +++ b/utils/nfsdcld/sqlite.c @@ -250,3 +250,38 @@ out_err: sqlite3_finalize(stmt); return ret; } + +/* Remove a client record */ +int +sqlite_remove_client(const unsigned char *clname, const size_t namelen) +{ + int ret; + sqlite3_stmt *stmt = NULL; + + ret = sqlite3_prepare_v2(dbh, "DELETE FROM clients WHERE id==?", -1, + &stmt, NULL); + if (ret != SQLITE_OK) { + xlog(D_GENERAL, "Statement prepare failed: %s", + sqlite3_errmsg(dbh)); + goto out_err; + } + + ret = sqlite3_bind_blob(stmt, 1, (const void *)clname, namelen, + SQLITE_STATIC); + if (ret != SQLITE_OK) { + xlog(D_GENERAL, "Bind blob failed: %s", sqlite3_errmsg(dbh)); + goto out_err; + } + + ret = sqlite3_step(stmt); + if (ret == SQLITE_DONE) + ret = SQLITE_OK; + else + xlog(D_GENERAL, "Unexpected return code from delete: %s", + sqlite3_errmsg(dbh)); + +out_err: + xlog(D_GENERAL, "%s: returning %d", __func__, ret); + sqlite3_finalize(stmt); + return ret; +} diff --git a/utils/nfsdcld/sqlite.h b/utils/nfsdcld/sqlite.h index ba4c213..425f5ba 100644 --- a/utils/nfsdcld/sqlite.h +++ b/utils/nfsdcld/sqlite.h @@ -22,5 +22,6 @@ int sqlite_maindb_init(char *topdir); int sqlite_insert_client(const unsigned char *clname, const size_t namelen); +int sqlite_remove_client(const unsigned char *clname, const size_t namelen); #endif /* _SQLITE_H */ -- 1.7.1