From patchwork Sun May 22 23:59:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benny Halevy X-Patchwork-Id: 807372 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 p4MNuc9u000460 for ; Sun, 22 May 2011 23:59:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754340Ab1EVX7Z (ORCPT ); Sun, 22 May 2011 19:59:25 -0400 Received: from daytona.panasas.com ([67.152.220.89]:43540 "EHLO daytona.panasas.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753853Ab1EVX7Z (ORCPT ); Sun, 22 May 2011 19:59:25 -0400 Received: from lt.bhalevy.com.com ([172.17.33.45]) by daytona.panasas.com with Microsoft SMTPSVC(6.0.3790.4675); Sun, 22 May 2011 19:59:23 -0400 From: Benny Halevy To: Trond Myklebust Cc: Boaz Harrosh , linux-nfs@vger.kernel.org Subject: [PATCH v5 24/38] SQUASHME: Revert "pnfs: per mount layout driver private data" Date: Mon, 23 May 2011 02:59:00 +0300 Message-Id: <1306108740-28804-1-git-send-email-bhalevy@panasas.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <4DD99F9B.2040406@panasas.com> References: <4DD99F9B.2040406@panasas.com> X-OriginalArrivalTime: 22 May 2011 23:59:24.0090 (UTC) FILETIME=[4675D1A0:01CC18DC] Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sun, 22 May 2011 23:59:26 +0000 (UTC) This reverts commit 52aebd8e7a43cf487403048c49e9eccd829a78ab. --- include/linux/nfs_fs_sb.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h index 66e031f..87694ca 100644 --- a/include/linux/nfs_fs_sb.h +++ b/include/linux/nfs_fs_sb.h @@ -143,7 +143,6 @@ struct nfs_server { filesystem */ struct pnfs_layoutdriver_type *pnfs_curr_ld; /* Active layout driver */ struct rpc_wait_queue roc_rpcwaitq; - void *pnfs_ld_data; /* Per-mount data */ /* the following fields are protected by nfs_client->cl_lock */ struct rb_root state_owners;