[Devel,RHEL7,COMMIT] btrfs: compilation fix in btrfs_wq_run_delayed_node()

Submitted by Konstantin Khorenko on Jan. 10, 2017, 9:28 a.m.

Details

Message ID 201701100928.v0A9S0u4026188@finist_cl7.x64_64.work.ct
State New
Series "btrfs: compilation fix in btrfs_wq_run_delayed_node()"
Headers show

Commit Message

Konstantin Khorenko Jan. 10, 2017, 9:28 a.m.
The commit is pushed to "branch-rh7-3.10.0-514.vz7.27.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-514.vz7.27.7
------>
commit 37c6c24e6b345c3f59a61143354c05e83a0c5d57
Author: Konstantin Khorenko <khorenko@virtuozzo.com>
Date:   Tue Jan 10 13:22:00 2017 +0400

    btrfs: compilation fix in btrfs_wq_run_delayed_node()
    
    RHEL7.3 has "fs_info" instead of "root" argument in
    btrfs_wq_run_delayed_node() => need to correct the patch accordingly:
      902694e ("ms/btrfs: limit async_work allocation and worker func duration")
    
    Fixes: 902694e ("ms/btrfs: limit async_work allocation and worker func
    duration")
    
    Signed-off-by: Konstantin Khorenko <khorenko@virtuozzo.com>
---
 fs/btrfs/delayed-inode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index 8ded5dc..8d92ae6 100644
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -1393,7 +1393,7 @@  static int btrfs_wq_run_delayed_node(struct btrfs_delayed_root *delayed_root,
 	struct btrfs_async_delayed_work *async_work;
 
 	if (atomic_read(&delayed_root->items) < BTRFS_DELAYED_BACKGROUND ||
-	    btrfs_workqueue_normal_congested(root->fs_info->delayed_workers))
+	    btrfs_workqueue_normal_congested(fs_info->delayed_workers))
 		return 0;
 
 	async_work = kmalloc(sizeof(*async_work), GFP_NOFS);