From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752934Ab0ENAH5 (ORCPT ); Thu, 13 May 2010 20:07:57 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:57212 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752735Ab0ENAHx (ORCPT ); Thu, 13 May 2010 20:07:53 -0400 Date: Fri, 14 May 2010 10:07:52 +1000 From: Stephen Rothwell To: Sage Weil Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Cheng Renquan Subject: linux-next: manual merge of the ceph tree with Linus' tree Message-Id: <20100514100752.4ea815a1.sfr@canb.auug.org.au> X-Mailer: Sylpheed 3.0.2 (GTK+ 2.20.1; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Sage, Today's linux-next merge of the ceph tree got a conflict in fs/ceph/caps.c between commit f818a73674c5d197f66b636a46d7d578d7258129 ("ceph: fix cap removal races") from Linus' tree and commit 9f2a2a1faa0fd990d4930605583a67d7dff28bff ("ceph: use ceph_sb_to_client instead of ceph_client") from the ceph tree. Just context changes. I fixed it up (see below) and can carry the fix for a while. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc fs/ceph/caps.c index d940053,1747db0..0000000 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c @@@ -867,8 -864,8 +867,9 @@@ void __ceph_remove_cap(struct ceph_cap { struct ceph_mds_session *session = cap->session; struct ceph_inode_info *ci = cap->ci; - struct ceph_mds_client *mdsc = &ceph_client(ci->vfs_inode.i_sb)->mdsc; + struct ceph_mds_client *mdsc = + &ceph_sb_to_client(ci->vfs_inode.i_sb)->mdsc; + int removed = 0; dout("__ceph_remove_cap %p from %p\n", cap, &ci->vfs_inode);