[Devel] [PATCH RHEL7 COMMIT] fs/nfs/direct.c: include virtinfo.h

Konstantin Khorenko khorenko at odin.com
Thu May 7 09:28:08 PDT 2015


The commit is pushed to "branch-rh7-3.10.0-123.1.2-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-123.1.2.vz7.4.10
------>
commit 0ef72f340a5723158ef8bf65b59c0ab3b309a819
Author: Kir Kolyshkin <kir at openvz.org>
Date:   Thu May 7 20:28:08 2015 +0400

    fs/nfs/direct.c: include virtinfo.h
    
    This was found while tring to compile the kernel with a stock
    config (i.e. no CONFIG_BEANCOUNTERS, CONFIG_VE etc.) and
    boot it on IBM Power8.
    
    =============================================================
    
    In case CONFIG_BC_IO_ACCOUNTING is defined, virtinfo.h
    is included via task_io_accounting_ops.h that includes
    bc/io_acct.h that includes virtinfo.h.
    
    In case CONFIG_BC_IO_ACCOUNTING is not defined, we are screwed.
    
    Signed-off-by: Kir Kolyshkin <kir at openvz.org>
---
 fs/nfs/direct.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index ba20720..c43539b 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -51,7 +51,7 @@
 #include <linux/nfs_fs.h>
 #include <linux/nfs_page.h>
 #include <linux/sunrpc/clnt.h>
-#include <linux/task_io_accounting_ops.h>
+#include <linux/virtinfo.h>
 
 #include <asm/uaccess.h>
 #include <linux/atomic.h>



More information about the Devel mailing list