From patchwork Thu Nov 18 10:03:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Smets, Jan (Jan)" X-Patchwork-Id: 335481 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAI9xv0U009645 for ; Thu, 18 Nov 2010 10:03:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755805Ab0KRKDf (ORCPT ); Thu, 18 Nov 2010 05:03:35 -0500 Received: from smail2.alcatel.fr ([64.208.49.57]:43200 "EHLO smail2.alcatel.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754904Ab0KRKDe convert rfc822-to-8bit (ORCPT ); Thu, 18 Nov 2010 05:03:34 -0500 Received: from FRMRSSXCHHUB02.dc-m.alcatel-lucent.com (FRMRSSXCHHUB02.dc-m.alcatel-lucent.com [135.120.45.62]) by smail2.alcatel.fr (8.14.3/8.14.3/ICT) with ESMTP id oAIA3O5q018969 (version=TLSv1/SSLv3 cipher=RC4-MD5 bits=128 verify=NOT) for ; Thu, 18 Nov 2010 11:03:32 +0100 Received: from FRMRSSXCHMBSB1.dc-m.alcatel-lucent.com ([135.120.45.43]) by FRMRSSXCHHUB02.dc-m.alcatel-lucent.com ([135.120.45.62]) with mapi; Thu, 18 Nov 2010 11:03:26 +0100 From: "Smets, Jan (Jan)" To: "ceph-devel@vger.kernel.org" Date: Thu, 18 Nov 2010 11:03:24 +0100 Subject: FW: [ceph-commit] ceph-client.git branch master updated. v2.6.34-20640-ge99fe63 Thread-Topic: [ceph-commit] ceph-client.git branch master updated. v2.6.34-20640-ge99fe63 Thread-Index: AcuGtbVnfa3fYTZDTm2dZGnzVsXFOAAUg6vg Message-ID: <14C7F4F06DB5814AB0DE29716C4F6D671720BA1D@FRMRSSXCHMBSB1.dc-m.alcatel-lucent.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.64 on 155.132.188.80 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 18 Nov 2010 10:03:36 +0000 (UTC) diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c index 5f67728..7d447af 100644 --- a/fs/ceph/dir.c +++ b/fs/ceph/dir.c @@ -358,18 +358,22 @@ more: u64 pos = ceph_make_fpos(frag, off); struct ceph_mds_reply_inode *in = rinfo->dir_in[off - fi->offset].in; + struct ceph_vino vino; + ino_t ino; + dout("readdir off %d (%d/%d) -> %lld '%.*s' %p\n", off, off - fi->offset, rinfo->dir_nr, pos, rinfo->dir_dname_len[off - fi->offset], rinfo->dir_dname[off - fi->offset], in); BUG_ON(!in); ftype = le32_to_cpu(in->mode) >> 12; + vino.ino = le64_to_cpu(in->ino); + vino.snap = le64_to_cpu(in->snapid); + ino = ceph_vino_to_ino(vino); if (filldir(dirent, rinfo->dir_dname[off - fi->offset], rinfo->dir_dname_len[off - fi->offset], - pos, - le64_to_cpu(in->ino), - ftype) < 0) { + pos, ino, ftype) < 0) { dout("filldir stopping us...\n"); return 0; }