[folded-merged] writeback-safer-lock-nesting-v4.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: writeback-safer-lock-nesting-v4
has been removed from the -mm tree.  Its filename was
     writeback-safer-lock-nesting-v4.patch

This patch was dropped because it was folded into writeback-safer-lock-nesting.patch

------------------------------------------------------
From: Greg Thelen <gthelen@xxxxxxxxxx>
Subject: writeback-safer-lock-nesting-v4

Link: http://lkml.kernel.org/r/20180411084653.254724-1-gthelen@xxxxxxxxxx
Fixes: 682aa8e1a6a1 ("writeback: implement unlocked_inode_to_wb transaction and use it for stat updates")
Cc: stable@xxxxxxxxxxxxxxx # v4.2+
Reported-by: Wang Long <wanglong19@xxxxxxxxxxx>
Signed-off-by: Greg Thelen <gthelen@xxxxxxxxxx>
Acked-by: Michal Hocko <mhocko@xxxxxxxx>
Acked-by: Wang Long <wanglong19@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 fs/fs-writeback.c           |    2 +-
 include/linux/backing-dev.h |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff -puN fs/fs-writeback.c~writeback-safer-lock-nesting-v4 fs/fs-writeback.c
--- a/fs/fs-writeback.c~writeback-safer-lock-nesting-v4
+++ a/fs/fs-writeback.c
@@ -745,7 +745,7 @@ int inode_congested(struct inode *inode,
 	 */
 	if (inode && inode_to_wb_is_valid(inode)) {
 		struct bdi_writeback *wb;
-		struct wb_lock_cookie lock_cookie;
+		struct wb_lock_cookie lock_cookie = {};
 		bool congested;
 
 		wb = unlocked_inode_to_wb_begin(inode, &lock_cookie);
diff -puN include/linux/backing-dev.h~writeback-safer-lock-nesting-v4 include/linux/backing-dev.h
--- a/include/linux/backing-dev.h~writeback-safer-lock-nesting-v4
+++ a/include/linux/backing-dev.h
@@ -373,7 +373,6 @@ unlocked_inode_to_wb_begin(struct inode
 	if (unlikely(cookie->locked))
 		xa_lock_irqsave(&inode->i_mapping->i_pages, cookie->flags);
 
-
 	/*
 	 * Protected by either !I_WB_SWITCH + rcu_read_lock() or the i_pages
 	 * lock.  inode_to_wb() will bark.  Deref directly.
_

Patches currently in -mm which might be from gthelen@xxxxxxxxxx are

writeback-safer-lock-nesting.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux