From patchwork Sat Feb 16 17:06:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 2152211 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 69D23DF2A1 for ; Sat, 16 Feb 2013 17:07:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753828Ab3BPRG4 (ORCPT ); Sat, 16 Feb 2013 12:06:56 -0500 Received: from mail-qa0-f44.google.com ([209.85.216.44]:49520 "EHLO mail-qa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753786Ab3BPRGz (ORCPT ); Sat, 16 Feb 2013 12:06:55 -0500 Received: by mail-qa0-f44.google.com with SMTP id bv4so739351qab.3 for ; Sat, 16 Feb 2013 09:06:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:message-id:date:from:user-agent:mime-version:to:subject :references:in-reply-to:content-type:content-transfer-encoding :x-gm-message-state; bh=laZVR96h5IFMBUgldOrnAfrk23xU6wc2cpPCSTc9vks=; b=DvHULs4ncQDK6EdA/kFfZfshO1Z6muuZ7QZI9p7xFI9bXBmyaaozXPp7+kgQfYGWYC l4q7NvahcCSJI5x0ztMaGmJAeNAFe8KZdyoqEhv+FncHP7WLOFf9UFPSnJ+4xvYdDDPB yDJ+/0jGNXJVX+ZGTG1Z8UBAj1H234T7xtzcrz35rdOsDq2kTH5knzOLrNYmLTRVaZdv fk1uyZz0Eal08tNTnUEiQA9hLJCgAVsCDbKZanAD94fCVnBhzs6x/W3KcI2SOOJXOEsO PqHZQXJWss7yFgzjqr+jpcfDTW1QuGiczvuELxcaxAMWW/pci7p+bbGi9bwuCo2+m5uz 9clg== X-Received: by 10.49.127.145 with SMTP id ng17mr2561249qeb.25.1361034414698; Sat, 16 Feb 2013 09:06:54 -0800 (PST) Received: from [172.22.22.4] (c-71-195-31-37.hsd1.mn.comcast.net. [71.195.31.37]) by mx.google.com with ESMTPS id hr1sm20560957qeb.3.2013.02.16.09.06.53 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 16 Feb 2013 09:06:53 -0800 (PST) Message-ID: <511FBCAC.4090506@inktank.com> Date: Sat, 16 Feb 2013 11:06:52 -0600 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130106 Thunderbird/17.0.2 MIME-Version: 1.0 To: ceph-devel@vger.kernel.org Subject: [PATCH 2/2] libceph: update ceph_mds_state_name() and ceph_mds_op_name() References: <511FBC54.9060408@inktank.com> In-Reply-To: <511FBC54.9060408@inktank.com> X-Gm-Message-State: ALoCoQlqiedWFBdxKKvcizbgW256PpWHlrSk6kj+XYcE4Gv91UVixbKj/fSW82YierDg8zhVvrIj Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org Update ceph_mds_state_name() and ceph_mds_op_name() to include the newly-added definitions in "ceph_fs.h", and to match its counterpart in the user space code. Signed-off-by: Alex Elder --- fs/ceph/strings.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/ceph/strings.c b/fs/ceph/strings.c index cd5097d..89fa4a9 100644 --- a/fs/ceph/strings.c +++ b/fs/ceph/strings.c @@ -15,6 +15,7 @@ const char *ceph_mds_state_name(int s) case CEPH_MDS_STATE_BOOT: return "up:boot"; case CEPH_MDS_STATE_STANDBY: return "up:standby"; case CEPH_MDS_STATE_STANDBY_REPLAY: return "up:standby-replay"; + case CEPH_MDS_STATE_REPLAYONCE: return "up:oneshot-replay"; case CEPH_MDS_STATE_CREATING: return "up:creating"; case CEPH_MDS_STATE_STARTING: return "up:starting"; /* up and in */ @@ -50,10 +51,13 @@ const char *ceph_mds_op_name(int op) case CEPH_MDS_OP_LOOKUP: return "lookup"; case CEPH_MDS_OP_LOOKUPHASH: return "lookuphash"; case CEPH_MDS_OP_LOOKUPPARENT: return "lookupparent"; + case CEPH_MDS_OP_LOOKUPINO: return "lookupino"; case CEPH_MDS_OP_GETATTR: return "getattr"; case CEPH_MDS_OP_SETXATTR: return "setxattr"; case CEPH_MDS_OP_SETATTR: return "setattr"; case CEPH_MDS_OP_RMXATTR: return "rmxattr"; + case CEPH_MDS_OP_SETLAYOUT: return "setlayou"; + case CEPH_MDS_OP_SETDIRLAYOUT: return "setdirlayout"; case CEPH_MDS_OP_READDIR: return "readdir"; case CEPH_MDS_OP_MKNOD: return "mknod"; case CEPH_MDS_OP_LINK: return "link";