Commit 5f739e4a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull misc vfs updates from Al Viro:
 "Assorted fixes (really no common topic here)"

* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  vfs: Make __vfs_write() static
  vfs: fix preadv64v2 and pwritev64v2 compat syscalls with offset == -1
  pipe: stop using ->can_merge
  splice: don't merge into linked buffers
  fs: move generic stat response attr handling to vfs_getattr_nosec
  orangefs: don't reinitialize result_mask in ->getattr
  fs/devpts: always delete dcache dentry-s in dput()
parents a667cb7a 12e1e7af

fs/devpts/inode.c

+1 −0
Original line number Diff line number Diff line
@@ -455,6 +455,7 @@ devpts_fill_super(struct super_block *s, void *data, int silent) 
	s->s_blocksize_bits = 10;

	s->s_magic = DEVPTS_SUPER_MAGIC;

	s->s_op = &devpts_sops;

	s->s_d_op = &simple_dentry_operations;

	s->s_time_gran = 1;



	error = -ENOMEM;

fs/orangefs/inode.c

+2 −5
Original line number Diff line number Diff line
@@ -261,11 +261,8 @@ int orangefs_getattr(const struct path *path, struct kstat *stat, 
		generic_fillattr(inode, stat);



		/* override block size reported to stat */

		if (request_mask & STATX_SIZE)

			stat->result_mask = STATX_BASIC_STATS;

		else

			stat->result_mask = STATX_BASIC_STATS &

			    ~STATX_SIZE;

		if (!(request_mask & STATX_SIZE))

			stat->result_mask &= ~STATX_SIZE;



		stat->attributes_mask = STATX_ATTR_IMMUTABLE |

		    STATX_ATTR_APPEND;

fs/pipe.c

+29 −3
Original line number Diff line number Diff line
@@ -225,8 +225,15 @@ void generic_pipe_buf_release(struct pipe_inode_info *pipe, 
}

EXPORT_SYMBOL(generic_pipe_buf_release);



/* New data written to a pipe may be appended to a buffer with this type. */

static const struct pipe_buf_operations anon_pipe_buf_ops = {

	.can_merge = 1,

	.confirm = generic_pipe_buf_confirm,

	.release = anon_pipe_buf_release,

	.steal = anon_pipe_buf_steal,

	.get = generic_pipe_buf_get,

};



static const struct pipe_buf_operations anon_pipe_buf_nomerge_ops = {

	.confirm = generic_pipe_buf_confirm,

	.release = anon_pipe_buf_release,

	.steal = anon_pipe_buf_steal,
@@ -234,13 +241,32 @@ static const struct pipe_buf_operations anon_pipe_buf_ops = { 
};



static const struct pipe_buf_operations packet_pipe_buf_ops = {

	.can_merge = 0,

	.confirm = generic_pipe_buf_confirm,

	.release = anon_pipe_buf_release,

	.steal = anon_pipe_buf_steal,

	.get = generic_pipe_buf_get,

};



/**

 * pipe_buf_mark_unmergeable - mark a &struct pipe_buffer as unmergeable

 * @buf:	the buffer to mark

 *

 * Description:

 *	This function ensures that no future writes will be merged into the

 *	given &struct pipe_buffer. This is necessary when multiple pipe buffers

 *	share the same backing page.

 */

void pipe_buf_mark_unmergeable(struct pipe_buffer *buf)

{

	if (buf->ops == &anon_pipe_buf_ops)

		buf->ops = &anon_pipe_buf_nomerge_ops;

}



static bool pipe_buf_can_merge(struct pipe_buffer *buf)

{

	return buf->ops == &anon_pipe_buf_ops;

}



static ssize_t

pipe_read(struct kiocb *iocb, struct iov_iter *to)

{
@@ -378,7 +404,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from) 
		struct pipe_buffer *buf = pipe->bufs + lastbuf;

		int offset = buf->offset + buf->len;



		if (buf->ops->can_merge && offset + chars <= PAGE_SIZE) {

		if (pipe_buf_can_merge(buf) && offset + chars <= PAGE_SIZE) {

			ret = pipe_buf_confirm(pipe, buf);

			if (ret)

				goto out;

fs/read_write.c

+8 −2
Original line number Diff line number Diff line
@@ -478,8 +478,8 @@ static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t 
	return ret;

}



ssize_t __vfs_write(struct file *file, const char __user *p, size_t count,

		    loff_t *pos)

static ssize_t __vfs_write(struct file *file, const char __user *p,

			   size_t count, loff_t *pos)

{

	if (file->f_op->write)

		return file->f_op->write(file, p, count, pos);
@@ -1238,6 +1238,9 @@ COMPAT_SYSCALL_DEFINE5(preadv64v2, unsigned long, fd, 
		const struct compat_iovec __user *,vec,

		unsigned long, vlen, loff_t, pos, rwf_t, flags)

{

	if (pos == -1)

		return do_compat_readv(fd, vec, vlen, flags);



	return do_compat_preadv64(fd, vec, vlen, pos, flags);

}

#endif
@@ -1344,6 +1347,9 @@ COMPAT_SYSCALL_DEFINE5(pwritev64v2, unsigned long, fd, 
		const struct compat_iovec __user *,vec,

		unsigned long, vlen, loff_t, pos, rwf_t, flags)

{

	if (pos == -1)

		return do_compat_writev(fd, vec, vlen, flags);



	return do_compat_pwritev64(fd, vec, vlen, pos, flags);

}

#endif

fs/splice.c

+4 −4
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ error: 
}



const struct pipe_buf_operations page_cache_pipe_buf_ops = {

	.can_merge = 0,

	.confirm = page_cache_pipe_buf_confirm,

	.release = page_cache_pipe_buf_release,

	.steal = page_cache_pipe_buf_steal,
@@ -156,7 +155,6 @@ static int user_page_pipe_buf_steal(struct pipe_inode_info *pipe, 
}



static const struct pipe_buf_operations user_page_pipe_buf_ops = {

	.can_merge = 0,

	.confirm = generic_pipe_buf_confirm,

	.release = page_cache_pipe_buf_release,

	.steal = user_page_pipe_buf_steal,
@@ -326,7 +324,6 @@ ssize_t generic_file_splice_read(struct file *in, loff_t *ppos, 
EXPORT_SYMBOL(generic_file_splice_read);



const struct pipe_buf_operations default_pipe_buf_ops = {

	.can_merge = 0,

	.confirm = generic_pipe_buf_confirm,

	.release = generic_pipe_buf_release,

	.steal = generic_pipe_buf_steal,
@@ -341,7 +338,6 @@ static int generic_pipe_buf_nosteal(struct pipe_inode_info *pipe, 


/* Pipe buffer operations for a socket and similar. */

const struct pipe_buf_operations nosteal_pipe_buf_ops = {

	.can_merge = 0,

	.confirm = generic_pipe_buf_confirm,

	.release = generic_pipe_buf_release,

	.steal = generic_pipe_buf_nosteal,
@@ -1606,6 +1602,8 @@ retry: 
			 */

			obuf->flags &= ~PIPE_BUF_FLAG_GIFT;



			pipe_buf_mark_unmergeable(obuf);



			obuf->len = len;

			opipe->nrbufs++;

			ibuf->offset += obuf->len;
@@ -1680,6 +1678,8 @@ static int link_pipe(struct pipe_inode_info *ipipe, 
		 */

		obuf->flags &= ~PIPE_BUF_FLAG_GIFT;



		pipe_buf_mark_unmergeable(obuf);



		if (obuf->len > len)

			obuf->len = len;

CRA Git | Maintained and supported by SUSTech CRA and CCSE