From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755310AbbBUAND (ORCPT ); Fri, 20 Feb 2015 19:13:03 -0500 Received: from ipmail06.adl2.internode.on.net ([150.101.137.129]:42149 "EHLO ipmail06.adl2.internode.on.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755156AbbBUANB (ORCPT ); Fri, 20 Feb 2015 19:13:01 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2BYCwBHzedUPDkjLHlbgwZShxCpbBIGBZJFhXMEAoEaRAEBAQEBAQUBAQEBODuEUBwjGCQ0BSUDBy2ILtQsGIVsiXkdhBUFhWKNSoVkgRyDFYYhghODD4M+hCQqMYJDAQEB Date: Sat, 21 Feb 2015 11:12:28 +1100 From: Dave Chinner To: torvalds@linux-foundation.org Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, xfs@oss.sgi.com Subject: [GIT PULL] xfs: PNFS block layout support for 3.20-rc1 Message-ID: <20150221001228.GS4251@dastard> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, Can you please pull the updates from the tree below? It contains the changes to XFS needed to support the PNFS block layout server that you pulled in through Bruce's NFS server tree merge. I originally thought that I'd need to merge changes into the NFS server side, but Bruce had already picked them up and so this is purely changes to the fs/xfs/ codebase. It should merge cleanly with your current tree - if it doesn't then I've probably done something wrong. -Dave. The following changes since commit bad962662dbc60e76ec1baae34af56b1ba2dfa5f: Merge branch 'xfs-misc-fixes-for-3.20-4' into for-next (2015-02-10 09:24:25 +1100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git tags/xfs-pnfs-for-linus-3.20-rc1 for you to fetch changes up to 781355c6e5ae87908de27dec3380a34918c33eee: xfs: recall pNFS layouts on conflicting access (2015-02-16 11:59:50 +1100) ---------------------------------------------------------------- xfs: pnfs block layout support for 3.20-rc1 This update contains the implementation of the PNFS server export methods that enable use of XFS filesystems as a block layout target. ---------------------------------------------------------------- Christoph Hellwig (2): xfs: implement pNFS export operations xfs: recall pNFS layouts on conflicting access fs/xfs/Makefile | 1 + fs/xfs/xfs_export.c | 6 + fs/xfs/xfs_file.c | 14 ++- fs/xfs/xfs_fsops.c | 6 + fs/xfs/xfs_ioctl.c | 9 +- fs/xfs/xfs_iops.c | 13 ++- fs/xfs/xfs_iops.h | 1 + fs/xfs/xfs_mount.h | 11 ++ fs/xfs/xfs_pnfs.c | 322 +++++++++++++++++++++++++++++++++++++++++++++++++++ fs/xfs/xfs_pnfs.h | 18 +++ 10 files changed, 393 insertions(+), 8 deletions(-) create mode 100644 fs/xfs/xfs_pnfs.c create mode 100644 fs/xfs/xfs_pnfs.h -- Dave Chinner david@fromorbit.com