From patchwork Tue Jun 14 21:02:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boaz Harrosh X-Patchwork-Id: 880102 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5EL25Mf011700 for ; Tue, 14 Jun 2011 21:02:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751346Ab1FNVC4 (ORCPT ); Tue, 14 Jun 2011 17:02:56 -0400 Received: from daytona.panasas.com ([67.152.220.89]:36569 "EHLO daytona.panasas.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752540Ab1FNVCz (ORCPT ); Tue, 14 Jun 2011 17:02:55 -0400 Received: from yafyuf.citi.umich.edu ([172.17.33.117]) by daytona.panasas.com with Microsoft SMTPSVC(6.0.3790.4675); Tue, 14 Jun 2011 17:02:55 -0400 From: Boaz Harrosh To: Benny Halevy , open-osd , NFS list Subject: [PATCH 2/8] exofs: pnfs-tree: Remove pnfs-osd private definitions Date: Tue, 14 Jun 2011 17:02:54 -0400 Message-Id: <1308085374-12516-1-git-send-email-bharrosh@panasas.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <4DF7CA2F.7030407@panasas.com> References: <4DF7CA2F.7030407@panasas.com> X-OriginalArrivalTime: 14 Jun 2011 21:02:55.0131 (UTC) FILETIME=[6E7326B0:01CC2AD6] 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 (demeter2.kernel.org [140.211.167.43]); Tue, 14 Jun 2011 21:02:56 +0000 (UTC) Now that pnfs-osd has hit mainline we can remove exofs's private header. (And the FIXME comment) Signed-off-by: Boaz Harrosh --- fs/exofs/exofs.h | 6 +----- fs/exofs/pnfs.h | 45 --------------------------------------------- 2 files changed, 1 insertions(+), 50 deletions(-) delete mode 100644 fs/exofs/pnfs.h diff --git a/fs/exofs/exofs.h b/fs/exofs/exofs.h index c965806..e103dbd 100644 --- a/fs/exofs/exofs.h +++ b/fs/exofs/exofs.h @@ -36,13 +36,9 @@ #include #include #include +#include #include "common.h" -/* FIXME: Remove once pnfs hits mainline - * #include - */ -#include "pnfs.h" - #define EXOFS_ERR(fmt, a...) printk(KERN_ERR "exofs: " fmt, ##a) #ifdef CONFIG_EXOFS_DEBUG diff --git a/fs/exofs/pnfs.h b/fs/exofs/pnfs.h deleted file mode 100644 index c52e988..0000000 --- a/fs/exofs/pnfs.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2008, 2009 - * Boaz Harrosh - * - * This file is part of exofs. - * - * exofs is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License version 2 as published by the Free - * Software Foundation. - * - */ - -/* FIXME: Remove this file once pnfs hits mainline */ - -#ifndef __EXOFS_PNFS_H__ -#define __EXOFS_PNFS_H__ - -#if ! defined(__PNFS_OSD_XDR_H__) - -enum pnfs_iomode { - IOMODE_READ = 1, - IOMODE_RW = 2, - IOMODE_ANY = 3, -}; - -/* Layout Structure */ -enum pnfs_osd_raid_algorithm4 { - PNFS_OSD_RAID_0 = 1, - PNFS_OSD_RAID_4 = 2, - PNFS_OSD_RAID_5 = 3, - PNFS_OSD_RAID_PQ = 4 /* Reed-Solomon P+Q */ -}; - -struct pnfs_osd_data_map { - u32 odm_num_comps; - u64 odm_stripe_unit; - u32 odm_group_width; - u32 odm_group_depth; - u32 odm_mirror_cnt; - u32 odm_raid_algorithm; -}; - -#endif /* ! defined(__PNFS_OSD_XDR_H__) */ - -#endif /* __EXOFS_PNFS_H__ */