From: Gunnar Beutner <gunnar@beutner.name>
Date: Sun, 24 Apr 2011 08:19:28 +0000 (+0200)
Subject: Renamed 'struct fid' for NFS
X-Git-Tag: zfs-0.8.0-rc1~152^2~461
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d4b7c17a0820a1bf48a7a3fd9dfb6e87b0306dd;p=zfs

Renamed 'struct fid' for NFS

Renamed 'struct fid' because its name conflicts with another
struct in the Linux kernel headers.  The fid_t typedef remains
unchanged intentionally.
---

diff --git a/include/sys/vfs.h b/include/sys/vfs.h
index 9399afbef..88ca21d52 100644
--- a/include/sys/vfs.h
+++ b/include/sys/vfs.h
@@ -35,7 +35,7 @@
 
 #define	MAXFIDSZ	64
 
-typedef struct fid {
+typedef struct spl_fid {
 	union {
 		long fid_pad;
 		struct {