svn commit: r329966 - stable/11/sys/compat/linuxkpi/common/include/linux

[Hans Petter Selasky]

Author: hselasky
Date: Sun Feb 25 10:30:36 2018
New Revision: 329966
URL: https://svnweb.freebsd.org/changeset/base/329966

Log:
  MFC r329510:
  Refactor dentry structure into its own header file in the LinuxKPI similary
  to Linux. No functional change. Implement d_inode() helper function.
  
  Submitted by:	Johannes Lundberg <johalun0 at gmail.com>
  Sponsored by:	Mellanox Technologies
  Sponsored by:	Limelight Networks

Added:
  stable/11/sys/compat/linuxkpi/common/include/linux/dcache.h
     - copied unchanged from r329510, head/sys/compat/linuxkpi/common/include/linux/dcache.h
Modified:
  stable/11/sys/compat/linuxkpi/common/include/linux/fs.h
Directory Properties:
  stable/11/   (props changed)

Copied: stable/11/sys/compat/linuxkpi/common/include/linux/dcache.h (from r329510, head/sys/compat/linuxkpi/common/include/linux/dcache.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/11/sys/compat/linuxkpi/common/include/linux/dcache.h	Sun Feb 25 10:30:36 2018	(r329966, copy of r329510, head/sys/compat/linuxkpi/common/include/linux/dcache.h)
@@ -0,0 +1,46 @@
+/*-
+ * Copyright (c) 2017 Limelight Networks, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice unmodified, this list of conditions, and the following
+ *    disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef __LINUX_DCACHE_H
+#define	__LINUX_DCACHE_H
+
+struct vnode;
+struct pfs_node;
+
+struct dentry {
+	struct vnode *d_inode;
+	struct pfs_node *d_pfs_node;	/* FreeBSD specific field */
+};
+
+static inline struct vnode *
+d_inode(const struct dentry *dentry)
+{
+	return (dentry->d_inode);
+}
+
+#endif /* __LINUX_DCACHE_H */

Modified: stable/11/sys/compat/linuxkpi/common/include/linux/fs.h
==============================================================================
--- stable/11/sys/compat/linuxkpi/common/include/linux/fs.h	Sun Feb 25 10:29:43 2018	(r329965)
+++ stable/11/sys/compat/linuxkpi/common/include/linux/fs.h	Sun Feb 25 10:30:36 2018	(r329966)
@@ -42,6 +42,7 @@
 #include <linux/wait.h>
 #include <linux/semaphore.h>
 #include <linux/spinlock.h>
+#include <linux/dcache.h>
 
 struct module;
 struct kiocb;
@@ -64,11 +65,6 @@ struct pfs_node;
 
 
 typedef struct files_struct *fl_owner_t;
-
-struct dentry {
-	struct inode	*d_inode;
-	struct pfs_node	*d_pfs_node;
-};
 
 struct file_operations;