The patch titled
sysfs: implement sysfs_dirent active reference and immediate disconnect (lockdep fix)
has been added to the -mm tree. Its filename is
sysfs-implement-sysfs_dirent-active-reference-and-immediate-disconnect-lockdep-fix.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: sysfs: implement sysfs_dirent active reference and immediate disconnect (lockdep fix)
From: Tejun Heo <htejun@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/sysfs/dir.c | 3 ++-
fs/sysfs/sysfs.h | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff -puN fs/sysfs/dir.c~sysfs-implement-sysfs_dirent-active-reference-and-immediate-disconnect-lockdep-fix fs/sysfs/dir.c
--- a/fs/sysfs/dir.c~sysfs-implement-sysfs_dirent-active-reference-and-immediate-disconnect-lockdep-fix
+++ a/fs/sysfs/dir.c
@@ -26,7 +26,8 @@ void release_sysfs_dirent(struct sysfs_d
* locked. If @sd is cursor for directory walk or being
* released prematurely, s_active has no reader or writer.
*/
- down_write_trylock(&sd->s_active);
+ if (!down_write_trylock(&sd->s_active))
+ rwsem_acquire(&sd->s_active.dep_map, 0, 0, _RET_IP_);
up_write(&sd->s_active);
if (sd->s_type & SYSFS_KOBJ_LINK)
diff -puN fs/sysfs/sysfs.h~sysfs-implement-sysfs_dirent-active-reference-and-immediate-disconnect-lockdep-fix fs/sysfs/sysfs.h
--- a/fs/sysfs/sysfs.h~sysfs-implement-sysfs_dirent-active-reference-and-immediate-disconnect-lockdep-fix
+++ a/fs/sysfs/sysfs.h
@@ -187,6 +187,7 @@ static inline void sysfs_put_active_two(
static inline void sysfs_deactivate(struct sysfs_dirent *sd)
{
down_write(&sd->s_active);
+ rwsem_release(&sd->s_active.dep_map, 1, _RET_IP_);
}
static inline int sysfs_is_shadowed_inode(struct inode *inode)
_
Patches currently in -mm which might be from htejun@xxxxxxxxx are
origin.patch
revert-gregkh-driver-sysfs-crash-debugging.patch
sysfs-fix-i_ino-handling-in-sysfs.patch
sysfs-fix-error-handling-in-binattr-write.patch
sysfs-move-release_sysfs_dirent-to-dirc.patch
sysfs-flatten-cleanup-paths-in-sysfs_add_link-and-create_dir.patch
sysfs-consolidate-sysfs_dirent-creation-functions.patch
sysfs-add-sysfs_dirent-s_parent.patch
sysfs-add-sysfs_dirent-s_name.patch
sysfs-make-sysfs_dirent-s_element-a-union.patch
sysfs-implement-kobj_sysfs_assoc_lock.patch
sysfs-reimplement-symlink-using-sysfs_dirent-tree.patch
sysfs-implement-bin_buffer.patch
sysfs-implement-sysfs_dirent-active-reference-and-immediate-disconnect.patch
sysfs-implement-sysfs_dirent-active-reference-and-immediate-disconnect-update.patch
sysfs-implement-sysfs_dirent-active-reference-and-immediate-disconnect-lockdep-fix.patch
sysfs-kill-attribute-file-orphaning.patch
sysfs-kill-unnecessary-attribute-owner.patch
sysfs-kill-unnecessary-attribute-owner-update.patch
sysfs-kill-unnecessary-attribute-owner-update-fix.patch
sysfs-kill-unnecessary-attribute-owner-vs-gregkh-driver-uio.patch
git-libata-all.patch
sata_nv-add-back-some-verbosity-into-adma-error_handler.patch
optional-led-trigger-for-libata.patch
drivers-ata-pata_cmd640c-fix-build-with-config_pm=n.patch
git-scsi-misc.patch
introduce-config_has_dma.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
