The patch titled
nfs: release dentry_lock in an error path of nfs_path
has been removed from the -mm tree. Its filename is
release-dentry_lock-in-an-error-path-of-nfs_path.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: nfs: release dentry_lock in an error path of nfs_path
From: Josh Triplett <josht@xxxxxxxxxx>
In one of the error paths of nfs_path, it may return with dentry_lock still
held; fix this by adding and using a new error path Elong_unlock which
unlocks dentry_lock.
Signed-off-by: Josh Triplett <josh@xxxxxxxxxxxxxxx>
Cc: Trond Myklebust <trond.myklebust@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/nfs/namespace.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff -puN fs/nfs/namespace.c~release-dentry_lock-in-an-error-path-of-nfs_path fs/nfs/namespace.c
--- a/fs/nfs/namespace.c~release-dentry_lock-in-an-error-path-of-nfs_path
+++ a/fs/nfs/namespace.c
@@ -56,7 +56,7 @@ char *nfs_path(const char *base, const s
namelen = dentry->d_name.len;
buflen -= namelen + 1;
if (buflen < 0)
- goto Elong;
+ goto Elong_unlock;
end -= namelen;
memcpy(end, dentry->d_name.name, namelen);
*--end = '/';
@@ -73,6 +73,8 @@ char *nfs_path(const char *base, const s
end -= namelen;
memcpy(end, base, namelen);
return end;
+Elong_unlock:
+ spin_unlock(&dcache_lock);
Elong:
return ERR_PTR(-ENAMETOOLONG);
}
_
Patches currently in -mm which might be from josht@xxxxxxxxxx are
git-nfs.patch
xfs-add-lock-annotations-to-xfs_trans_update_ail-and-xfs_trans_delete_ail.patch
remove-incorrect-unlock_kernel-from-allocation.patch
remove-incorrect-unlock_kernel-from-failure-path-in.patch
add-entry-for-efs-filesystem-to-maintainers-as-orphan.patch
ufs-remove-incorrect-unlock_kernel-from-failure-path-in-ufs_symlink.patch
efi-add-lock-annotations-for-efi_call_phys_prelog-and-efi_call_phys_epilog.patch
mbcache-add-lock-annotation-for-__mb_cache_entry_release_unlock.patch
afs-add-lock-annotations-to-afs_proc_cell_servers_startstop.patch
fuse-add-lock-annotations-to-request_end-and-fuse_read_interrupt.patch
hugetlbfs-add-lock-annotation-to-hugetlbfs_forget_inode.patch
jbd-add-lock-annotation-to-jbd_sync_bh.patch
fix-typo-in-maintainers-s-devics-devices.patch
fs-add-lock-annotation-to-grab_super.patch
rcu-add-lock-annotations-to-rcu_bh_torture_read_lockunlock.patch
freevxfs-add-missing-lock_kernel-to-vxfs_readdir.patch
timer-fix-tvec_bases-initializer.patch
timer-add-lock-annotation-to-lock_timer_base.patch
nfsd-add-lock-annotations-to-e_start-and-e_stop.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
