summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXu Wang <vulab@iscas.ac.cn>2021-11-05 13:37:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2021-11-06 13:30:34 -0700
commit363dc512b666a235769482cc73869f899785a1f6 (patch)
tree5c8ee2e1eef8bdcedd546033b26804ab2f23ad12
parent20b7fee738d65e50ca00e325ae27ee3efaa819f6 (diff)
downloadlinux-stable-363dc512b666a235769482cc73869f899785a1f6.tar.gz
linux-stable-363dc512b666a235769482cc73869f899785a1f6.tar.bz2
linux-stable-363dc512b666a235769482cc73869f899785a1f6.zip
mm/swapfile: remove needless request_queue NULL pointer check
The request_queue pointer returned from bdev_get_queue() shall never be NULL, so the null check is unnecessary, just remove it. Link: https://lkml.kernel.org/r/20210917082111.33923-1-vulab@iscas.ac.cn Signed-off-by: Xu Wang <vulab@iscas.ac.cn> Acked-by: David Hildenbrand <david@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/swapfile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c
index 22d10f713848..42027d213fd2 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -3118,7 +3118,7 @@ static bool swap_discardable(struct swap_info_struct *si)
{
struct request_queue *q = bdev_get_queue(si->bdev);
- if (!q || !blk_queue_discard(q))
+ if (!blk_queue_discard(q))
return false;
return true;