From: David Woodhouse <dwmw2@infradead.org>
To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org
Subject: [PATCH 7/8] SPARC: Use <asm-generic/statfs.h>
Date: Wed, 03 Sep 2008 10:38:22 +0100 [thread overview]
Message-ID: <1220434702.2985.67.camel@pmac.infradead.org> (raw)
In-Reply-To: <1220275314.2982.83.camel@pmac.infradead.org>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---
arch/sparc/include/asm/statfs.h | 8 ++---
arch/sparc/include/asm/statfs_32.h | 6 ----
arch/sparc/include/asm/statfs_64.h | 54 ------------------------------------
3 files changed, 3 insertions(+), 65 deletions(-)
delete mode 100644 arch/sparc/include/asm/statfs_32.h
delete mode 100644 arch/sparc/include/asm/statfs_64.h
diff --git a/arch/sparc/include/asm/statfs.h b/arch/sparc/include/asm/statfs.h
index 5e937a7..55e607a 100644
--- a/arch/sparc/include/asm/statfs.h
+++ b/arch/sparc/include/asm/statfs.h
@@ -1,8 +1,6 @@
#ifndef ___ASM_SPARC_STATFS_H
#define ___ASM_SPARC_STATFS_H
-#if defined(__sparc__) && defined(__arch64__)
-#include <asm/statfs_64.h>
-#else
-#include <asm/statfs_32.h>
-#endif
+
+#include <asm-generic/statfs.h>
+
#endif
diff --git a/arch/sparc/include/asm/statfs_32.h b/arch/sparc/include/asm/statfs_32.h
deleted file mode 100644
index 304520f..0000000
--- a/arch/sparc/include/asm/statfs_32.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _SPARC_STATFS_H
-#define _SPARC_STATFS_H
-
-#include <asm-generic/statfs.h>
-
-#endif
diff --git a/arch/sparc/include/asm/statfs_64.h b/arch/sparc/include/asm/statfs_64.h
deleted file mode 100644
index 79b3c89..0000000
--- a/arch/sparc/include/asm/statfs_64.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef _SPARC64_STATFS_H
-#define _SPARC64_STATFS_H
-
-#ifndef __KERNEL_STRICT_NAMES
-
-#include <linux/types.h>
-
-typedef __kernel_fsid_t fsid_t;
-
-#endif
-
-struct statfs {
- long f_type;
- long f_bsize;
- long f_blocks;
- long f_bfree;
- long f_bavail;
- long f_files;
- long f_ffree;
- __kernel_fsid_t f_fsid;
- long f_namelen;
- long f_frsize;
- long f_spare[5];
-};
-
-struct statfs64 {
- long f_type;
- long f_bsize;
- long f_blocks;
- long f_bfree;
- long f_bavail;
- long f_files;
- long f_ffree;
- __kernel_fsid_t f_fsid;
- long f_namelen;
- long f_frsize;
- long f_spare[5];
-};
-
-struct compat_statfs64 {
- __u32 f_type;
- __u32 f_bsize;
- __u64 f_blocks;
- __u64 f_bfree;
- __u64 f_bavail;
- __u64 f_files;
- __u64 f_ffree;
- __kernel_fsid_t f_fsid;
- __u32 f_namelen;
- __u32 f_frsize;
- __u32 f_spare[5];
-};
-
-#endif
--
1.5.5.1
--
David Woodhouse Open Source Technology Centre
David.Woodhouse@intel.com Intel Corporation
next prev parent reply other threads:[~2008-09-03 9:38 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-01 13:21 [RFC] Unify asm/statfs.h David Woodhouse
2008-09-03 9:37 ` [PATCH 1/8] Make <asm-generic/statfs.h> suitable for 64-bit platforms David Woodhouse
2008-09-03 9:37 ` [PATCH 2/8] ARM: Use <asm-generic/statfs.h> David Woodhouse
2008-09-03 9:38 ` [PATCH 3/8] IA64: " David Woodhouse
2008-09-03 9:38 ` [PATCH 4/8] x86_64: " David Woodhouse
2008-09-06 15:58 ` Ingo Molnar
2008-09-03 9:38 ` [PATCH 5/8] PARISC: " David Woodhouse
2008-09-03 9:38 ` [PATCH 6/8] PowerPC: " David Woodhouse
2008-09-03 9:38 ` David Woodhouse [this message]
2008-09-03 9:38 ` [PATCH 8/8] S390: Update comments about why we don't use <asm-generic/statfs.h> David Woodhouse
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1220434702.2985.67.camel@pmac.infradead.org \
--to=dwmw2@infradead.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).