From patchwork Thu Oct 13 02:55:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Qiang X-Patchwork-Id: 681581 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3svb3c0dcRz9t0w for ; Thu, 13 Oct 2016 13:56:44 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=qyt8yQZu; dkim-atps=neutral Received: from localhost ([::1]:37259 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1buWCH-0004jo-3o for incoming@patchwork.ozlabs.org; Wed, 12 Oct 2016 22:56:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42452) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1buWBf-0004Rm-PA for qemu-devel@nongnu.org; Wed, 12 Oct 2016 22:56:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1buWBb-00084e-L4 for qemu-devel@nongnu.org; Wed, 12 Oct 2016 22:56:02 -0400 Received: from mail-lf0-x242.google.com ([2a00:1450:4010:c07::242]:35671) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1buWBb-00084N-CN for qemu-devel@nongnu.org; Wed, 12 Oct 2016 22:55:59 -0400 Received: by mail-lf0-x242.google.com with SMTP id x79so10187401lff.2 for ; Wed, 12 Oct 2016 19:55:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:from:to:cc:subject:date; bh=pTbtLKOD2y8o9B5i6TngXD+vW01wKc8ldrE/OqiQN34=; b=qyt8yQZuUWER6gBHhigMb/619s4mksZNRYRu2yjTsf3XIHeBGbJMFH8tQCO/aDLDKO d/LMhuPngtu1oJNMiD7/OR4gblaUUt3M+2fm5eJpJap27dBfYxWNovFxl1FmoRQu3lc1 0mmYB2/KavWwUPSZUgsON606vaHzWhYCfdh0FfqWtYLCF7Y9quYhn0f4yKB8RT6vMB+y T5LaRip8G7tWaIqPOWz+U/CfSGZSQXWV0RqmYCdI5Bcog36M0lmaAM+q28KeQMAFE2aF PKpzgRzLAnGBa+7GGcbnV9nvKCyaDfyxIqtd/r5c+QspAuOsp7l/6nLhUEueOpeAFLA8 QFdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:from:to:cc:subject:date; bh=pTbtLKOD2y8o9B5i6TngXD+vW01wKc8ldrE/OqiQN34=; b=PD7fJNKziEDMmuV/2pYLU5XqhfWPBwADbheOvlWuc9xwEkP1fR531Blf1jnA7qUFff NDt9XYC8P8HRZubSsOCSwGFvE2wB18X21gef55889dqGEDW5CEgvPPpnuUy9H1tkAuID c5jfLucHlSoy36z1Shh+wAW/AbKZJtgKhhHN+P2Ospi8Si66b+pWLqg4Bd+/PWk7+Hf7 hAEqsPMXneIbo+CHrHltM3pgvJRHSnk31PTZVJFWkLlFSM5GjnPh/Z0xJFWWVbzhodLx G+4pOYI4DVpfQkTMyePIIZV8tdWEsvM4AsJ6sDQ/1AenX52ia6gGZMtJEKxjGB5ZjdwA MjEg== X-Gm-Message-State: AA6/9Rltfn8BO6eJOZY+LT98E+wg7kyt+7rF4HhKOpBhItPuMAaiuhQ9nEG/nZnSyFvZtg== X-Received: by 10.194.0.205 with SMTP id 13mr5220787wjg.87.1476327358504; Wed, 12 Oct 2016 19:55:58 -0700 (PDT) Received: from localhost.localdomain.localdomain ([104.192.110.250]) by smtp.gmail.com with ESMTPSA id ma5sm18201829wjb.47.2016.10.12.19.55.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Oct 2016 19:55:58 -0700 (PDT) Message-ID: <57fef7be.857bc20a.4ca2.95a9@mx.google.com> X-Google-Original-Message-ID: <1476327342-5991-1-git-send-email-Qiang(liqiang6-s@360.cn)> From: Li Qiang X-Google-Original-From: Li Qiang(liqiang6-s@360.cn) To: groug@kaod.org, qemu-devel@nongnu.org Date: Wed, 12 Oct 2016 19:55:42 -0700 X-Mailer: git-send-email 1.8.3.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c07::242 Subject: [Qemu-devel] [PATCH] 9pfs: add xattrwalk_fid field in V9fsFidState struct X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Li Qiang Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Li Qiang Currently, 9pfs sets the fs.xattr.copied_len field in V9fsFidState to -1 to indicate a xattr walk fid. As the fs.xattr.copied_len is also used to account for copied bytes, this may cause confusion. This patch add a bool variable to represent the xattr walk fid. Signed-off-by: Li Qiang --- hw/9pfs/9p.c | 7 ++++--- hw/9pfs/9p.h | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index 8c7488f..9625296 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -325,7 +325,7 @@ static int v9fs_xattr_fid_clunk(V9fsPDU *pdu, V9fsFidState *fidp) { int retval = 0; - if (fidp->fs.xattr.copied_len == -1) { + if (fidp->xattrwalk_fid) { /* getxattr/listxattr fid */ goto free_value; } @@ -3181,7 +3181,7 @@ static void v9fs_xattrwalk(void *opaque) */ xattr_fidp->fs.xattr.len = size; xattr_fidp->fid_type = P9_FID_XATTR; - xattr_fidp->fs.xattr.copied_len = -1; + xattr_fidp->xattrwalk_fid = true; if (size) { xattr_fidp->fs.xattr.value = g_malloc(size); err = v9fs_co_llistxattr(pdu, &xattr_fidp->path, @@ -3214,7 +3214,7 @@ static void v9fs_xattrwalk(void *opaque) */ xattr_fidp->fs.xattr.len = size; xattr_fidp->fid_type = P9_FID_XATTR; - xattr_fidp->fs.xattr.copied_len = -1; + xattr_fidp->xattrwalk_fid = true; if (size) { xattr_fidp->fs.xattr.value = g_malloc(size); err = v9fs_co_lgetxattr(pdu, &xattr_fidp->path, @@ -3269,6 +3269,7 @@ static void v9fs_xattrcreate(void *opaque) /* Make the file fid point to xattr */ xattr_fidp = file_fidp; xattr_fidp->fid_type = P9_FID_XATTR; + xattr_fidp->xattrwalk_fid = false; xattr_fidp->fs.xattr.copied_len = 0; xattr_fidp->fs.xattr.len = size; xattr_fidp->fs.xattr.flags = flags; diff --git a/hw/9pfs/9p.h b/hw/9pfs/9p.h index 22198f6..7e1e70b 100644 --- a/hw/9pfs/9p.h +++ b/hw/9pfs/9p.h @@ -214,6 +214,7 @@ struct V9fsFidState uid_t uid; int ref; int clunked; + bool xattrwalk_fid; V9fsFidState *next; V9fsFidState *rclm_lst; };