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

Commit 7367ab91 authored by Al Viro's avatar Al Viro
Browse files

Merge branch 'for-linus' into work.iov_iter

parents bc61384d 03cc0789

fs/namei.c

+6 −4
Original line number Diff line number Diff line
@@ -1740,15 +1740,17 @@ static int walk_component(struct nameidata *nd, int flags) 
					  nd->flags);

		if (IS_ERR(path.dentry))

			return PTR_ERR(path.dentry);

		if (unlikely(d_is_negative(path.dentry))) {

			dput(path.dentry);

			return -ENOENT;

		}



		path.mnt = nd->path.mnt;

		err = follow_managed(&path, nd);

		if (unlikely(err < 0))

			return err;



		if (unlikely(d_is_negative(path.dentry))) {

			path_to_nameidata(&path, nd);

			return -ENOENT;

		}



		seq = 0;	/* we are already out of RCU mode */

		inode = d_backing_inode(path.dentry);

	}

fs/splice.c

+3 −0
Original line number Diff line number Diff line
@@ -1143,6 +1143,9 @@ static long do_splice_to(struct file *in, loff_t *ppos, 
	if (unlikely(ret < 0))

		return ret;



	if (unlikely(len > MAX_RW_COUNT))

		len = MAX_RW_COUNT;



	if (in->f_op->splice_read)

		splice_read = in->f_op->splice_read;

	else