D48860.id150538.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D48860.id150538.diff
View Options

	Index: sys/compat/linuxkpi/common/include/linux/fs.h
	===================================================================
	--- sys/compat/linuxkpi/common/include/linux/fs.h
	+++ sys/compat/linuxkpi/common/include/linux/fs.h
	@@ -264,17 +264,17 @@
	return (f);
	}

	-struct linux_file * linux67_get_file_rcu(struct linux_file **f);
	+struct linux_file * linux_get_file_rcu(struct linux_file **f);
	struct linux_file * get_file_active(struct linux_file **f);
	-#if defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 60700
	-#define get_file_rcu(f) linux67_get_file_rcu(f)
	-#else
	+#if defined(LINUXKPI_VERSION) && LINUXKPI_VERSION < 60700
	static inline bool
	get_file_rcu(struct linux_file *f)
	{
	return (refcount_acquire_if_not_zero(
	f->_file == NULL ? &f->f_count : &f->_file->f_count));
	}
	+#else
	+#define get_file_rcu(f) linux_get_file_rcu(f)
	#endif

	static inline struct inode *
	Index: sys/compat/linuxkpi/common/src/linux_compat.c
	===================================================================
	--- sys/compat/linuxkpi/common/src/linux_compat.c
	+++ sys/compat/linuxkpi/common/src/linux_compat.c
	@@ -1105,7 +1105,7 @@
	}

	struct linux_file *
	-linux67_get_file_rcu(struct linux_file **f)
	+linux_get_file_rcu(struct linux_file **f)
	{
	struct linux_file *file1;