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

Commit ed0d523a authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs into aio-base

parents 7a074e96 4faa9996

fs/affs/namei.c

+9 −6
Original line number Diff line number Diff line
@@ -201,14 +201,16 @@ affs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags) 
	struct super_block *sb = dir->i_sb;

	struct buffer_head *bh;

	struct inode *inode = NULL;

	struct dentry *res;



	pr_debug("%s(\"%pd\")\n", __func__, dentry);



	affs_lock_dir(dir);

	bh = affs_find_entry(dir, dentry);

	if (IS_ERR(bh)) {

		affs_unlock_dir(dir);

	if (IS_ERR(bh))

		return ERR_CAST(bh);

	}

	if (bh) {

		u32 ino = bh->b_blocknr;
@@ -222,11 +224,12 @@ affs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags) 
		}

		affs_brelse(bh);

		inode = affs_iget(sb, ino);

		if (IS_ERR(inode))

			return ERR_CAST(inode);

	}

	d_add(dentry, inode);

	return NULL;

	res = d_splice_alias(inode, dentry);

	if (!IS_ERR_OR_NULL(res))

		res->d_fsdata = dentry->d_fsdata;

	affs_unlock_dir(dir);

	return res;

}



int

fs/aio.c

+3 −4
Original line number Diff line number Diff line
@@ -639,9 +639,8 @@ static void free_ioctx_users(struct percpu_ref *ref) 
	while (!list_empty(&ctx->active_reqs)) {

		req = list_first_entry(&ctx->active_reqs,

				       struct aio_kiocb, ki_list);



		list_del_init(&req->ki_list);

		kiocb_cancel(req);

		list_del_init(&req->ki_list);

	}



	spin_unlock_irq(&ctx->ctx_lock);
@@ -1074,7 +1073,7 @@ static struct kioctx *lookup_ioctx(unsigned long ctx_id) 


	ctx = rcu_dereference(table->table[id]);

	if (ctx && ctx->user_id == ctx_id) {

		percpu_ref_get(&ctx->users);

		if (percpu_ref_tryget_live(&ctx->users))

			ret = ctx;

	}

out:

fs/befs/linuxvfs.c

+5 −12
Original line number Diff line number Diff line
@@ -198,23 +198,16 @@ befs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags) 


	if (ret == BEFS_BT_NOT_FOUND) {

		befs_debug(sb, "<--- %s %pd not found", __func__, dentry);

		d_add(dentry, NULL);

		return ERR_PTR(-ENOENT);



		inode = NULL;

	} else if (ret != BEFS_OK || offset == 0) {

		befs_error(sb, "<--- %s Error", __func__);

		return ERR_PTR(-ENODATA);

	}



		inode = ERR_PTR(-ENODATA);

	} else {

		inode = befs_iget(dir->i_sb, (ino_t) offset);

	if (IS_ERR(inode))

		return ERR_CAST(inode);



	d_add(dentry, inode);



	}

	befs_debug(sb, "<--- %s", __func__);



	return NULL;

	return d_splice_alias(inode, dentry);

}



static int

fs/btrfs/inode.c

+4 −12
Original line number Diff line number Diff line
@@ -6579,8 +6579,7 @@ static int btrfs_mknod(struct inode *dir, struct dentry *dentry, 
		goto out_unlock_inode;

	} else {

		btrfs_update_inode(trans, root, inode);

		unlock_new_inode(inode);

		d_instantiate(dentry, inode);

		d_instantiate_new(dentry, inode);

	}



out_unlock:
@@ -6656,8 +6655,7 @@ static int btrfs_create(struct inode *dir, struct dentry *dentry, 
		goto out_unlock_inode;



	BTRFS_I(inode)->io_tree.ops = &btrfs_extent_io_ops;

	unlock_new_inode(inode);

	d_instantiate(dentry, inode);

	d_instantiate_new(dentry, inode);



out_unlock:

	btrfs_end_transaction(trans);
@@ -6802,12 +6800,7 @@ static int btrfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) 
	if (err)

		goto out_fail_inode;



	d_instantiate(dentry, inode);

	/*

	 * mkdir is special.  We're unlocking after we call d_instantiate

	 * to avoid a race with nfsd calling d_instantiate.

	 */

	unlock_new_inode(inode);

	d_instantiate_new(dentry, inode);

	drop_on_err = 0;



out_fail:
@@ -10250,8 +10243,7 @@ static int btrfs_symlink(struct inode *dir, struct dentry *dentry, 
		goto out_unlock_inode;

	}



	unlock_new_inode(inode);

	d_instantiate(dentry, inode);

	d_instantiate_new(dentry, inode);



out_unlock:

	btrfs_end_transaction(trans);

fs/cachefiles/namei.c

+10 −0
Original line number Diff line number Diff line
@@ -572,6 +572,11 @@ int cachefiles_walk_to_object(struct cachefiles_object *parent, 
			if (ret < 0)

				goto create_error;



			if (unlikely(d_unhashed(next))) {

				dput(next);

				inode_unlock(d_inode(dir));

				goto lookup_again;

			}

			ASSERT(d_backing_inode(next));



			_debug("mkdir -> %p{%p{ino=%lu}}",
@@ -764,6 +769,7 @@ struct dentry *cachefiles_get_directory(struct cachefiles_cache *cache, 
	/* search the current directory for the element name */

	inode_lock(d_inode(dir));



retry:

	start = jiffies;

	subdir = lookup_one_len(dirname, dir, strlen(dirname));

	cachefiles_hist(cachefiles_lookup_histogram, start);
@@ -793,6 +799,10 @@ struct dentry *cachefiles_get_directory(struct cachefiles_cache *cache, 
		if (ret < 0)

			goto mkdir_error;



		if (unlikely(d_unhashed(subdir))) {

			dput(subdir);

			goto retry;

		}

		ASSERT(d_backing_inode(subdir));



		_debug("mkdir -> %p{%p{ino=%lu}}",