Thomas Betker 17f9501631 Revert "jffs2: Fix lock acquisition order bug in jffs2_write_begin" ... commit 157078f64b8a9cd7011b6b900b2f2498df850748 upstream. This reverts commit 5ffd3412ae ("jffs2: Fix lock acquisition order bug in jffs2_write_begin"). The commit modified jffs2_write_begin() to remove a deadlock with jffs2_garbage_collect_live(), but this introduced new deadlocks found by multiple users. page_lock() actually has to be called before mutex_lock(&c->alloc_sem) or mutex_lock(&f->sem) because jffs2_write_end() and jffs2_readpage() are called with the page locked, and they acquire c->alloc_sem and f->sem, resp. In other words, the lock order in jffs2_write_begin() was correct, and it is the jffs2_garbage_collect_live() path that has to be changed. Revert the commit to get rid of the new deadlocks, and to clear the way for a better fix of the original deadlock. Reported-by: Deng Chao <deng.chao1@zte.com.cn> Reported-by: Ming Liu <liu.ming50@gmail.com> Reported-by: wangzaiwei <wangzaiwei@top-vision.cn> Signed-off-by: Thomas Betker <thomas.betker@rohde-schwarz.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2016-03-09 15:34:53 -08:00
..
9p	9p: ->evict_inode() should kick out ->i_data, not ->i_mapping	2015-12-08 14:51:16 -05:00
adfs
affs	fs/affs: make root lookup from blkdev logical size	2015-09-10 13:29:01 -07:00
afs
autofs4
befs
bfs
btrfs	Btrfs: fix loading of orphan roots leading to BUG_ON	2016-03-09 15:34:53 -08:00
cachefiles	FS-Cache: Add missing initialization of ret in cachefiles_write_page()	2015-11-16 20:38:43 -05:00
ceph	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client	2015-11-13 09:24:40 -08:00
cifs	Fix cifs_uniqueid_to_ino_t() function for s390x	2016-03-09 15:34:50 -08:00
coda	fs/coda: fix readlink buffer overflow	2015-09-10 13:29:01 -07:00
configfs	configfs: allow dynamic group creation	2015-11-20 16:17:32 -08:00
cramfs
debugfs	debugfs: fix refcount imbalance in start_creating	2015-11-11 02:04:44 -05:00
devpts	pty: make sure super_block is still valid in final /dev/tty close	2016-02-25 12:01:14 -08:00
dlm	net: rename SOCK_ASYNC_NOSPACE and SOCK_ASYNC_WAITDATA	2015-12-01 15:45:05 -05:00
ecryptfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2015-11-07 13:05:44 -08:00
efivarfs	efi: Make efivarfs entries immutable by default	2016-03-03 15:07:09 -08:00
efs
exofs	osd fs: __r4w_get_page rely on PageUptodate for uptodate	2015-12-12 10:15:34 -08:00
exportfs
ext2	ext2, ext4: warn when mounting with dax enabled	2015-11-16 09:43:54 -08:00
ext4	ext4: fix bh->b_state corruption	2016-03-03 15:07:08 -08:00
f2fs	Merge branch 'for-linus-3' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2015-11-13 18:02:30 -08:00
fat	fat: fix fake_offset handling on error path	2015-11-20 16:17:32 -08:00
freevxfs	freevxfs: Grammar s/an negative/a negative/	2015-08-07 13:59:24 +02:00
fscache	FS-Cache: Handle a write to the page immediately beyond the EOF marker	2015-11-11 02:11:02 -05:00
fuse	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse	2015-12-11 10:56:41 -08:00
gfs2	Merge branch 'for-linus-3' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2015-11-13 18:02:30 -08:00
hfs	hfs: fix B-tree corruption after insertion at position 0	2015-09-10 13:29:01 -07:00
hfsplus	xattr handlers: Pass handler to operations instead of flags	2015-11-13 20:34:32 -05:00
hostfs	uml: fix hostfs mknod()	2016-03-03 15:07:12 -08:00
hpfs	hpfs: don't truncate the file when delete fails	2016-03-03 15:07:30 -08:00
hugetlbfs	fs/hugetlbfs/inode.c: fix bugs in hugetlb_vmtruncate_list()	2016-02-25 12:01:22 -08:00
isofs
jbd2	Ext4 bug fixes for v4.4, including fixes for post-2038 time encodings,	2015-12-07 10:25:00 -08:00
jffs2	Revert "jffs2: Fix lock acquisition order bug in jffs2_write_begin"	2016-03-09 15:34:53 -08:00
jfs	fs/jfs: remove unnecessary new_valid_dev() checks	2015-11-09 15:11:24 -08:00
kernfs	kernfs: implement kernfs_path_len()	2015-08-18 15:49:15 -07:00
lockd	Mainly smaller bugfixes and cleanup. We're still finding some bugs from	2015-11-11 20:11:28 -08:00
logfs	mm, fs: introduce mapping_gfp_constraint()	2015-11-06 17:50:42 -08:00
minix
ncpfs	ncpfs: don't allow negative timeouts	2015-11-20 16:17:32 -08:00
nfs	NFSv4: Fix a dentry leak on alias use	2016-03-03 15:07:28 -08:00
nfs_common	lockd: NLM grace period shouldn't block NFSv4 opens	2015-08-13 10:22:06 -04:00
nfsd	nfsd: don't hold ls_mutex across a layout recall	2015-12-16 11:49:58 -05:00
nilfs2	Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2015-11-11 09:45:24 -08:00
nls
notify	inotify: actually check for invalid bits in sys_inotify_add_watch()	2015-11-05 19:34:48 -08:00
ntfs	mm, fs: introduce mapping_gfp_constraint()	2015-11-06 17:50:42 -08:00
ocfs2	ocfs2: unlock inode if deleting inode from orphan fails	2016-03-03 15:07:10 -08:00
omfs
openpromfs
overlayfs	ovl: setattr: check permissions before copy-up	2016-02-25 12:01:24 -08:00
proc	numa: fix /proc/<pid>/numa_maps for hugetlbfs on s390	2016-02-25 12:01:22 -08:00
pstore	pstore: fix code comment to match code	2015-11-02 13:41:52 -08:00
qnx4
qnx6
quota	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2015-09-05 20:34:28 -07:00
ramfs	mm, fs: obey gfp_mapping for add_to_page_cache()	2015-10-16 11:42:28 -07:00
reiserfs	Merge branch 'for-linus-3' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2015-11-13 18:02:30 -08:00
romfs
squashfs	squashfs: xattr simplifications	2015-11-13 20:34:33 -05:00
sysfs	platform/chrome: Branch for v4.4	2015-11-13 21:53:18 -08:00
sysv	fix sysvfs symlinks	2015-11-23 21:11:08 -05:00
tracefs	tracefs: Fix refcount imbalance in start_creating()	2015-11-04 22:13:45 -05:00
ubifs	Merge branch 'for-linus-3' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2015-11-13 18:02:30 -08:00
udf	udf: Check output buffer length when converting name to CS0	2016-02-25 12:01:18 -08:00
ufs	fix ufs write vs readpage race when writing into a hole	2015-09-09 10:43:12 -07:00
xfs	xfs: log mount failures don't wait for buffers to be released	2016-02-25 12:01:24 -08:00
aio.c	mm: move ->mremap() from file_operations to vm_operations_struct	2015-09-04 16:54:41 -07:00
anon_inodes.c
attr.c
bad_inode.c
binfmt_aout.c
binfmt_elf.c	Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2015-11-11 09:45:24 -08:00
binfmt_elf_fdpic.c	libnvdimm for 4.4:	2015-11-10 12:07:22 -08:00
binfmt_em86.c
binfmt_flat.c
binfmt_misc.c
binfmt_script.c
block_dev.c	block: detach bdev inode from its wb in __blkdev_put()	2015-12-04 11:02:17 -07:00
buffer.c	vfs: remove unused wrapper block_page_mkwrite()	2015-11-11 02:19:33 -05:00
char_dev.c	fs/char_dev.c: fix incorrect documentation for unregister_chrdev_region	2015-08-05 13:49:35 -07:00
compat.c
compat_binfmt_elf.c
compat_ioctl.c	i2c-dev: Fix typo in ioctl name reference	2015-10-23 23:26:43 +02:00
coredump.c	coredump: change zap_threads() and zap_process() to use for_each_thread()	2015-11-06 17:50:42 -08:00
dax.c	dax: disable pmd mappings	2015-11-16 23:54:45 -08:00
dcache.c	use ->d_seq to get coherency between ->d_inode and ->d_flags	2016-03-09 15:34:49 -08:00
dcookies.c
direct-io.c	block: fix use-after-free in dio_bio_complete	2016-03-03 15:07:28 -08:00
drop_caches.c	inode: convert inode_sb_list_lock to per-sb	2015-08-17 18:39:46 -04:00
eventfd.c
eventpoll.c
exec.c
fcntl.c
fhandle.c
file.c	vfs: clear remainder of 'full_fds_bits' in dup_fd()	2015-11-05 23:05:32 -08:00
file_table.c	fs, file table: reinit files_stat.max_files after deferred memory initialisation	2015-08-07 04:39:40 +03:00
filesystems.c
fs-writeback.c	writeback: flush inode cgroup wb switches instead of pinning super_block	2016-03-09 15:34:52 -08:00
fs_pin.c
fs_struct.c
inode.c	fs: fix inode.c kernel-doc warning	2015-11-11 02:18:27 -05:00
internal.h	inode: rename i_wb_list to i_io_list	2015-08-17 23:38:10 -04:00
ioctl.c
Kconfig	dax: disable pmd mappings	2015-11-16 23:54:45 -08:00
Kconfig.binfmt
libfs.c	fs: Set the size of empty dirs to 0.	2015-08-12 15:28:45 -05:00
locks.c	locks: fix unlock when fcntl_setlk races with a close	2016-03-03 15:07:12 -08:00
Makefile	ext4: promote ext4 over ext2 in the default probe order	2015-10-15 10:33:21 -04:00
mbcache.c
mount.h
mpage.c	mm, fs: introduce mapping_gfp_constraint()	2015-11-06 17:50:42 -08:00
namei.c	do_last(): ELOOP failure exit should be done after leaving RCU mode	2016-03-03 15:07:30 -08:00
namespace.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace	2015-09-01 16:13:25 -07:00
no-block.c
nsfs.c	fs/seq_file: convert int seq_vprint/seq_printf/etc... returns to void	2015-09-11 15:21:34 -07:00
open.c
pipe.c	fs/pipe.c: return error code rather than 0 in pipe_write()	2015-11-11 02:18:26 -05:00
pnode.c
pnode.h	mnt: Clarify and correct the disconnect logic in umount_tree	2015-07-22 20:33:27 -05:00
posix_acl.c	xattr handlers: Pass handler to operations instead of flags	2015-11-13 20:34:32 -05:00
proc_namespace.c
read_write.c
readdir.c
select.c
seq_file.c	fs, seqfile: always allow oom killer	2015-11-06 17:50:42 -08:00
signalfd.c	signalfd: fix information leak in signalfd_copyinfo	2015-08-07 04:39:40 +03:00
splice.c	vfs: Avoid softlockups with sendfile(2)	2015-11-23 21:15:30 -05:00
stack.c
stat.c	fs/stat.c: remove unnecessary new_valid_dev() check	2015-11-09 15:11:24 -08:00
statfs.c
super.c	writeback: flush inode cgroup wb switches instead of pinning super_block	2016-03-09 15:34:52 -08:00
sync.c	fs/sync.c: make sync_file_range(2) use WB_SYNC_NONE writeback	2015-11-06 17:50:42 -08:00
timerfd.c	timerfd: Handle relative timers with CONFIG_TIME_LOW_RES proper	2016-02-25 12:01:25 -08:00
userfaultfd.c	userfaultfd: revert "userfaultfd: waitqueue: add nr wake parameter to __wake_up_locked_key"	2015-09-22 15:09:53 -07:00
utimes.c
xattr.c	9p: xattr simplifications	2015-11-13 20:34:33 -05:00