From patchwork Sat Mar 1 15:23:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yan, Zheng" X-Patchwork-Id: 3747381 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 39F009F381 for ; Sat, 1 Mar 2014 15:24:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6984620374 for ; Sat, 1 Mar 2014 15:24:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 755B320364 for ; Sat, 1 Mar 2014 15:24:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752993AbaCAPYG (ORCPT ); Sat, 1 Mar 2014 10:24:06 -0500 Received: from mga03.intel.com ([143.182.124.21]:51314 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752984AbaCAPYF (ORCPT ); Sat, 1 Mar 2014 10:24:05 -0500 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by azsmga101.ch.intel.com with ESMTP; 01 Mar 2014 07:24:04 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,568,1389772800"; d="scan'208";a="484155321" Received: from unknown (HELO zyan5-mobl.ccr.corp.intel.com) ([10.255.21.204]) by fmsmga001.fm.intel.com with ESMTP; 01 Mar 2014 07:23:36 -0800 From: "Yan, Zheng" To: ceph-devel@vger.kernel.org Cc: "Yan, Zheng" Subject: [PATCH 2/4] ceph: fix ceph_fh_to_parent() Date: Sat, 1 Mar 2014 23:23:29 +0800 Message-Id: <1393687411-2457-2-git-send-email-zheng.z.yan@intel.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1393687411-2457-1-git-send-email-zheng.z.yan@intel.com> References: <1393687411-2457-1-git-send-email-zheng.z.yan@intel.com> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP ceph_fh_to_parent() finds the inode that corresponds to the 'ino' field of struct ceph_nfs_confh. This is wrong, it should find the inode that corresponds to the 'parent_ino' field. Signed-off-by: Yan, Zheng --- fs/ceph/export.c | 38 +++++--------------------------------- 1 file changed, 5 insertions(+), 33 deletions(-) diff --git a/fs/ceph/export.c b/fs/ceph/export.c index 905d7f2..017af26 100644 --- a/fs/ceph/export.c +++ b/fs/ceph/export.c @@ -122,49 +122,21 @@ static struct dentry *ceph_fh_to_dentry(struct super_block *sb, } /* - * get parent, if possible. - * - * FIXME: we could do better by querying the mds to discover the - * parent. + * convert regular fh to parent */ static struct dentry *ceph_fh_to_parent(struct super_block *sb, - struct fid *fid, + struct fid *fid, int fh_len, int fh_type) { struct ceph_nfs_confh *cfh = (void *)fid->raw; - struct ceph_vino vino; - struct inode *inode; - struct dentry *dentry; - int err; - if (fh_type == 1) + if (fh_type != FILEID_INO32_GEN_PARENT) return ERR_PTR(-ESTALE); if (fh_len < sizeof(*cfh) / 4) return ERR_PTR(-ESTALE); - pr_debug("fh_to_parent %llx/%d\n", cfh->parent_ino, - cfh->parent_name_hash); - - vino.ino = cfh->ino; - vino.snap = CEPH_NOSNAP; - inode = ceph_find_inode(sb, vino); - if (!inode) - return ERR_PTR(-ESTALE); - - dentry = d_obtain_alias(inode); - if (IS_ERR(dentry)) { - pr_err("fh_to_parent %llx -- inode %p but ENOMEM\n", - cfh->ino, inode); - iput(inode); - return dentry; - } - err = ceph_init_dentry(dentry); - if (err < 0) { - iput(inode); - return ERR_PTR(err); - } - dout("fh_to_parent %llx %p dentry %p\n", cfh->ino, inode, dentry); - return dentry; + pr_debug("fh_to_parent %llx\n", cfh->parent_ino); + return __fh_to_dentry(sb, cfh->parent_ino); } const struct export_operations ceph_export_ops = {