[1/9] cgroup, blkcg: Prepare some symbols for module and !CONFIG_CGROUP usages
diff mbox series

Message ID 20190615182453.843275-2-tj@kernel.org
State New
Headers show
Series
  • [1/9] cgroup, blkcg: Prepare some symbols for module and !CONFIG_CGROUP usages
Related show

Commit Message

Tejun Heo June 15, 2019, 6:24 p.m. UTC
btrfs is going to use css_put() and wbc helpers to improve cgroup
writeback support.  Add dummy css_get() definition and export wbc
helpers to prepare for module and !CONFIG_CGROUP builds.

Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: kbuild test robot <lkp@intel.com>
---
 block/blk-cgroup.c     | 1 +
 fs/fs-writeback.c      | 3 +++
 include/linux/cgroup.h | 1 +
 3 files changed, 5 insertions(+)

Comments

Jan Kara June 24, 2019, 4:39 p.m. UTC | #1
On Sat 15-06-19 11:24:45, Tejun Heo wrote:
> btrfs is going to use css_put() and wbc helpers to improve cgroup
> writeback support.  Add dummy css_get() definition and export wbc
> helpers to prepare for module and !CONFIG_CGROUP builds.
> 
> Signed-off-by: Tejun Heo <tj@kernel.org>
> Reported-by: kbuild test robot <lkp@intel.com>

Looks good to me. You can add:

Reviewed-by: Jan Kara <jack@suse.cz>

								Honza

> ---
>  block/blk-cgroup.c     | 1 +
>  fs/fs-writeback.c      | 3 +++
>  include/linux/cgroup.h | 1 +
>  3 files changed, 5 insertions(+)
> 
> diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
> index 617a2b3f7582..07600d3c9520 100644
> --- a/block/blk-cgroup.c
> +++ b/block/blk-cgroup.c
> @@ -46,6 +46,7 @@ struct blkcg blkcg_root;
>  EXPORT_SYMBOL_GPL(blkcg_root);
>  
>  struct cgroup_subsys_state * const blkcg_root_css = &blkcg_root.css;
> +EXPORT_SYMBOL_GPL(blkcg_root_css);
>  
>  static struct blkcg_policy *blkcg_policy[BLKCG_MAX_POLS];
>  
> diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
> index 36855c1f8daf..c29cff345b1f 100644
> --- a/fs/fs-writeback.c
> +++ b/fs/fs-writeback.c
> @@ -269,6 +269,7 @@ void __inode_attach_wb(struct inode *inode, struct page *page)
>  	if (unlikely(cmpxchg(&inode->i_wb, NULL, wb)))
>  		wb_put(wb);
>  }
> +EXPORT_SYMBOL_GPL(__inode_attach_wb);
>  
>  /**
>   * locked_inode_to_wb_and_lock_list - determine a locked inode's wb and lock it
> @@ -580,6 +581,7 @@ void wbc_attach_and_unlock_inode(struct writeback_control *wbc,
>  	if (unlikely(wb_dying(wbc->wb)))
>  		inode_switch_wbs(inode, wbc->wb_id);
>  }
> +EXPORT_SYMBOL_GPL(wbc_attach_and_unlock_inode);
>  
>  /**
>   * wbc_detach_inode - disassociate wbc from inode and perform foreign detection
> @@ -699,6 +701,7 @@ void wbc_detach_inode(struct writeback_control *wbc)
>  	wb_put(wbc->wb);
>  	wbc->wb = NULL;
>  }
> +EXPORT_SYMBOL_GPL(wbc_detach_inode);
>  
>  /**
>   * wbc_account_io - account IO issued during writeback
> diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
> index 81f58b4a5418..4cb5d5646986 100644
> --- a/include/linux/cgroup.h
> +++ b/include/linux/cgroup.h
> @@ -687,6 +687,7 @@ void cgroup_path_from_kernfs_id(const union kernfs_node_id *id,
>  struct cgroup_subsys_state;
>  struct cgroup;
>  
> +static inline void css_get(struct cgroup_subsys_state *css) {}
>  static inline void css_put(struct cgroup_subsys_state *css) {}
>  static inline int cgroup_attach_task_all(struct task_struct *from,
>  					 struct task_struct *t) { return 0; }
> -- 
> 2.17.1
>

Patch
diff mbox series

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 617a2b3f7582..07600d3c9520 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -46,6 +46,7 @@  struct blkcg blkcg_root;
 EXPORT_SYMBOL_GPL(blkcg_root);
 
 struct cgroup_subsys_state * const blkcg_root_css = &blkcg_root.css;
+EXPORT_SYMBOL_GPL(blkcg_root_css);
 
 static struct blkcg_policy *blkcg_policy[BLKCG_MAX_POLS];
 
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index 36855c1f8daf..c29cff345b1f 100644
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -269,6 +269,7 @@  void __inode_attach_wb(struct inode *inode, struct page *page)
 	if (unlikely(cmpxchg(&inode->i_wb, NULL, wb)))
 		wb_put(wb);
 }
+EXPORT_SYMBOL_GPL(__inode_attach_wb);
 
 /**
  * locked_inode_to_wb_and_lock_list - determine a locked inode's wb and lock it
@@ -580,6 +581,7 @@  void wbc_attach_and_unlock_inode(struct writeback_control *wbc,
 	if (unlikely(wb_dying(wbc->wb)))
 		inode_switch_wbs(inode, wbc->wb_id);
 }
+EXPORT_SYMBOL_GPL(wbc_attach_and_unlock_inode);
 
 /**
  * wbc_detach_inode - disassociate wbc from inode and perform foreign detection
@@ -699,6 +701,7 @@  void wbc_detach_inode(struct writeback_control *wbc)
 	wb_put(wbc->wb);
 	wbc->wb = NULL;
 }
+EXPORT_SYMBOL_GPL(wbc_detach_inode);
 
 /**
  * wbc_account_io - account IO issued during writeback
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 81f58b4a5418..4cb5d5646986 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -687,6 +687,7 @@  void cgroup_path_from_kernfs_id(const union kernfs_node_id *id,
 struct cgroup_subsys_state;
 struct cgroup;
 
+static inline void css_get(struct cgroup_subsys_state *css) {}
 static inline void css_put(struct cgroup_subsys_state *css) {}
 static inline int cgroup_attach_task_all(struct task_struct *from,
 					 struct task_struct *t) { return 0; }