Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c83727a6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull VFS fixes from Al Viro:
 "Fixes for this cycle regression in overlayfs and a couple of
  long-standing (== all the way back to 2.6.12, at least) bugs"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  freeing unlinked file indefinitely delayed
  fix a braino in ovl_d_select_inode()
  9p: don't leave a half-initialized inode sitting around
parents 7fbb58a0 75a6f82a

fs/9p/vfs_inode.c

+1 −2
Original line number Diff line number Diff line
@@ -540,8 +540,7 @@ static struct inode *v9fs_qid_iget(struct super_block *sb, 
	unlock_new_inode(inode);

	return inode;

error:

	unlock_new_inode(inode);

	iput(inode);

	iget_failed(inode);

	return ERR_PTR(retval);



}

fs/9p/vfs_inode_dotl.c

+1 −2
Original line number Diff line number Diff line
@@ -149,8 +149,7 @@ static struct inode *v9fs_qid_iget_dotl(struct super_block *sb, 
	unlock_new_inode(inode);

	return inode;

error:

	unlock_new_inode(inode);

	iput(inode);

	iget_failed(inode);

	return ERR_PTR(retval);



}

fs/dcache.c

+5 −2
Original line number Diff line number Diff line
@@ -642,7 +642,7 @@ static inline bool fast_dput(struct dentry *dentry) 


	/*

	 * If we have a d_op->d_delete() operation, we sould not

	 * let the dentry count go to zero, so use "put__or_lock".

	 * let the dentry count go to zero, so use "put_or_lock".

	 */

	if (unlikely(dentry->d_flags & DCACHE_OP_DELETE))

		return lockref_put_or_lock(&dentry->d_lockref);
@@ -697,7 +697,7 @@ static inline bool fast_dput(struct dentry *dentry) 
	 */

	smp_rmb();

	d_flags = ACCESS_ONCE(dentry->d_flags);

	d_flags &= DCACHE_REFERENCED | DCACHE_LRU_LIST;

	d_flags &= DCACHE_REFERENCED | DCACHE_LRU_LIST | DCACHE_DISCONNECTED;



	/* Nothing to do? Dropping the reference was all we needed? */

	if (d_flags == (DCACHE_REFERENCED | DCACHE_LRU_LIST) && !d_unhashed(dentry))
@@ -776,6 +776,9 @@ void dput(struct dentry *dentry) 
	if (unlikely(d_unhashed(dentry)))

		goto kill_it;



	if (unlikely(dentry->d_flags & DCACHE_DISCONNECTED))

		goto kill_it;



	if (unlikely(dentry->d_flags & DCACHE_OP_DELETE)) {

		if (dentry->d_op->d_delete(dentry))

			goto kill_it;

fs/overlayfs/inode.c

+3 −0
Original line number Diff line number Diff line
@@ -343,6 +343,9 @@ struct inode *ovl_d_select_inode(struct dentry *dentry, unsigned file_flags) 
	struct path realpath;

	enum ovl_path_type type;



	if (d_is_dir(dentry))

		return d_backing_inode(dentry);



	type = ovl_path_real(dentry, &realpath);

	if (ovl_open_need_copy_up(file_flags, type, realpath.dentry)) {

		err = ovl_want_write(dentry);