The patch titled
ufs: remove incorrect unlock_kernel from failure path in ufs_symlink()
has been removed from the -mm tree. Its filename is
ufs-remove-incorrect-unlock_kernel-from-failure-path-in-ufs_symlink.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: ufs: remove incorrect unlock_kernel from failure path in ufs_symlink()
From: Josh Triplett <josht@xxxxxxxxxx>
ufs_symlink, in one of its error paths, calls unlock_kernel without ever
having called lock_kernel(); fix this by creating and jumping to a new
label out_notlocked rather than the out label used after calling
lock_kernel().
Signed-off-by: Josh Triplett <josh@xxxxxxxxxxxxxxx>
Cc: Evgeniy Dushistov <dushistov@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/ufs/namei.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN fs/ufs/namei.c~ufs-remove-incorrect-unlock_kernel-from-failure-path-in-ufs_symlink fs/ufs/namei.c
--- a/fs/ufs/namei.c~ufs-remove-incorrect-unlock_kernel-from-failure-path-in-ufs_symlink
+++ a/fs/ufs/namei.c
@@ -129,7 +129,7 @@ static int ufs_symlink (struct inode * d
struct inode * inode;
if (l > sb->s_blocksize)
- goto out;
+ goto out_notlocked;
lock_kernel();
inode = ufs_new_inode(dir, S_IFLNK | S_IRWXUGO);
@@ -155,6 +155,7 @@ static int ufs_symlink (struct inode * d
err = ufs_add_nondir(dentry, inode);
out:
unlock_kernel();
+out_notlocked:
return err;
out_fail:
_
Patches currently in -mm which might be from josht@xxxxxxxxxx are
origin.patch
git-nfs.patch
xfs-add-lock-annotations-to-xfs_trans_update_ail-and-xfs_trans_delete_ail.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
fs-add-lock-annotation-to-grab_super.patch
rcu-add-lock-annotations-to-rcu_bh_torture_read_lockunlock.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
