From: Eduardo Habkost <ehabkost@redhat.com>
To: Avi Kivity <avi@redhat.com>
Cc: kvm@vger.kernel.org, Eduardo Habkost <ehabkost@redhat.com>
Subject: [PATCH 2/3] Use native anon_inodes on RHEL5 if available
Date: Fri, 23 Jan 2009 16:41:34 -0200 [thread overview]
Message-ID: <1232736095-26244-3-git-send-email-ehabkost@redhat.com> (raw)
In-Reply-To: <1232736095-26244-1-git-send-email-ehabkost@redhat.com>
Seom RHEL5 kernel versions include anon_inodes. Detect this case and
use the native anon_inodes implementation when available.
This patch also applies to the maint/2.6.29 branch.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
kernel/anon_inodes.c | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/kernel/anon_inodes.c b/kernel/anon_inodes.c
index 510303f..135adae 100644
--- a/kernel/anon_inodes.c
+++ b/kernel/anon_inodes.c
@@ -21,7 +21,14 @@
#include <asm/uaccess.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
+/* anon_inodes on RHEL >= 5.2 is equivalent to 2.6.27 version */
+#ifdef RHEL_RELEASE_CODE
+# if (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(5,2)) && defined(CONFIG_ANON_INODES)
+# define RHEL_ANON_INODES
+# endif
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23) && !defined(RHEL_ANON_INODES)
static struct vfsmount *anon_inode_mnt __read_mostly;
static struct inode *anon_inode_inode;
@@ -228,7 +235,7 @@ void kvm_exit_anon_inodes(void)
#undef anon_inode_getfd
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) && !defined(RHEL_ANON_INODES)
int kvm_anon_inode_getfd(const char *name,
const struct file_operations *fops,
@@ -245,7 +252,7 @@ int kvm_anon_inode_getfd(const char *name,
return fd;
}
-#elif LINUX_VERSION_CODE == KERNEL_VERSION(2,6,26)
+#elif LINUX_VERSION_CODE == KERNEL_VERSION(2,6,26) && !defined(RHEL_ANON_INODES)
int kvm_anon_inode_getfd(const char *name,
const struct file_operations *fops,
--
1.6.1
next prev parent reply other threads:[~2009-01-23 18:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-23 18:41 [PATCH 0/3] kvm-userspace build and compat fixes Eduardo Habkost
2009-01-23 18:41 ` [PATCH 1/3] kvm: qemu: don't fail building when pc-bios dir is empty Eduardo Habkost
2009-01-26 14:46 ` Marcelo Tosatti
2009-01-26 15:57 ` Eduardo Habkost
2009-01-26 16:12 ` Marcelo Tosatti
2009-01-23 18:41 ` Eduardo Habkost [this message]
2009-01-23 18:41 ` [PATCH 3/3] compat code fixes for RHEL5 kernels Eduardo Habkost
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=1232736095-26244-3-git-send-email-ehabkost@redhat.com \
--to=ehabkost@redhat.com \
--cc=avi@redhat.com \
--cc=kvm@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.