From patchwork Fri Nov 4 11:34:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 9412535 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 435B16022E for ; Fri, 4 Nov 2016 11:34:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3ADA72ADB1 for ; Fri, 4 Nov 2016 11:34:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2F98C2ADBA; Fri, 4 Nov 2016 11:34:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DE4442ADB1 for ; Fri, 4 Nov 2016 11:34:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761742AbcKDLeo (ORCPT ); Fri, 4 Nov 2016 07:34:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45624 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761679AbcKDLel (ORCPT ); Fri, 4 Nov 2016 07:34:41 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1DAA781253; Fri, 4 Nov 2016 11:34:41 +0000 (UTC) Received: from tlielax.poochiereds.net (ovpn-116-47.rdu2.redhat.com [10.10.116.47]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uA4BYXuT000712; Fri, 4 Nov 2016 07:34:40 -0400 From: Jeff Layton To: ceph-devel@vger.kernel.org Cc: idryomov@gmail.com, zyan@redhat.com, sage@redhat.com Subject: [RFC PATCH 08/10] ceph: add sync parameter to send_cap_msg Date: Fri, 4 Nov 2016 07:34:31 -0400 Message-Id: <1478259273-3471-9-git-send-email-jlayton@redhat.com> In-Reply-To: <1478259273-3471-1-git-send-email-jlayton@redhat.com> References: <1478259273-3471-1-git-send-email-jlayton@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 04 Nov 2016 11:34:41 +0000 (UTC) Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP So we can request an MDS log flush on a cap message when we know that we'll be waiting on the result. Signed-off-by: Jeff Layton --- fs/ceph/caps.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index 452f5024589f..e92c6ce53af6 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c @@ -999,7 +999,7 @@ struct cap_msg_args { kuid_t uid; kgid_t gid; umode_t mode; - bool inline_data; + bool inline_data, sync; }; /* @@ -1090,7 +1090,7 @@ static int send_cap_msg(struct cap_msg_args *arg) ceph_encode_timespec(p, &arg->btime); p += sizeof(struct ceph_timespec); ceph_encode_64(&p, arg->change_attr); - ceph_encode_8(&p, 0); + ceph_encode_8(&p, arg->sync); ceph_con_send(&arg->session->s_con, msg); return 0; @@ -1223,6 +1223,7 @@ static int __send_cap(struct ceph_mds_client *mdsc, struct ceph_cap *cap, arg.mode = inode->i_mode; arg.inline_data = ci->i_inline_version != CEPH_INLINE_NONE; + arg.sync = false; spin_unlock(&ci->i_ceph_lock); @@ -1278,6 +1279,7 @@ static inline int __send_flush_snap(struct inode *inode, arg.mode = capsnap->mode; arg.inline_data = capsnap->inline_data; + arg.sync = false; return send_cap_msg(&arg); }