[01/10] tty/sysrq: emergency_thaw_all does not depend on CONFIG_BLOCK
diff mbox series

Message ID 20200620071644.463185-2-hch@lst.de
State New
Headers show
Series
  • [01/10] tty/sysrq: emergency_thaw_all does not depend on CONFIG_BLOCK
Related show

Commit Message

Christoph Hellwig June 20, 2020, 7:16 a.m. UTC
We can also thaw non-block file systems.  Remove the CONFIG_BLOCK in
sysrq.c after making the prototype available unconditionally.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/tty/sysrq.c | 2 --
 include/linux/fs.h  | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

Comments

Greg Kroah-Hartman June 20, 2020, 7:21 a.m. UTC | #1
On Sat, Jun 20, 2020 at 09:16:35AM +0200, Christoph Hellwig wrote:
> We can also thaw non-block file systems.  Remove the CONFIG_BLOCK in
> sysrq.c after making the prototype available unconditionally.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  drivers/tty/sysrq.c | 2 --
>  include/linux/fs.h  | 2 +-
>  2 files changed, 1 insertion(+), 3 deletions(-)
> 

Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Bart Van Assche June 21, 2020, 2:54 a.m. UTC | #2
On 2020-06-20 00:16, Christoph Hellwig wrote:
> We can also thaw non-block file systems.  Remove the CONFIG_BLOCK in
> sysrq.c after making the prototype available unconditionally.

Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Johannes Thumshirn June 22, 2020, 8:48 a.m. UTC | #3
Looks good,
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>

Patch
diff mbox series

diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
index 7c95afa905a083..a8e39b2cdd5526 100644
--- a/drivers/tty/sysrq.c
+++ b/drivers/tty/sysrq.c
@@ -403,7 +403,6 @@  static const struct sysrq_key_op sysrq_moom_op = {
 	.enable_mask	= SYSRQ_ENABLE_SIGNAL,
 };
 
-#ifdef CONFIG_BLOCK
 static void sysrq_handle_thaw(int key)
 {
 	emergency_thaw_all();
@@ -414,7 +413,6 @@  static const struct sysrq_key_op sysrq_thaw_op = {
 	.action_msg	= "Emergency Thaw of all frozen filesystems",
 	.enable_mask	= SYSRQ_ENABLE_SIGNAL,
 };
-#endif
 
 static void sysrq_handle_kill(int key)
 {
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 3f881a892ea746..7f40dbafbf6d49 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2593,7 +2593,6 @@  extern void invalidate_bdev(struct block_device *);
 extern void iterate_bdevs(void (*)(struct block_device *, void *), void *);
 extern int sync_blockdev(struct block_device *bdev);
 extern struct super_block *freeze_bdev(struct block_device *);
-extern void emergency_thaw_all(void);
 extern void emergency_thaw_bdev(struct super_block *sb);
 extern int thaw_bdev(struct block_device *bdev, struct super_block *sb);
 extern int fsync_bdev(struct block_device *);
@@ -2633,6 +2632,7 @@  static inline bool sb_is_blkdev_sb(struct super_block *sb)
 	return false;
 }
 #endif
+void emergency_thaw_all(void);
 extern int sync_filesystem(struct super_block *);
 extern const struct file_operations def_blk_fops;
 extern const struct file_operations def_chr_fops;