fs: remove __vfs_write (53ad8626) · Commits · 戴 / test

fs/read_write.c

+22 −24

Original line number	Diff line number	Diff line
		@@ -488,17 +488,6 @@ static ssize_t new_sync_write(struct file filp, const char __user buf, size_t
		return ret;
		}

		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);
		else if (file->f_op->write_iter)
		return new_sync_write(file, p, count, pos);
		else
		return -EINVAL;
		}

		/* caller is responsible for file_start_write/file_end_write */
		ssize_t __kernel_write(struct file file, const void buf, size_t count, loff_t *pos)
		{
		@@ -516,7 +505,12 @@ ssize_t __kernel_write(struct file file, const void buf, size_t count, loff_t
		p = (__force const char __user *)buf;
		if (count > MAX_RW_COUNT)
		count = MAX_RW_COUNT;
		ret = __vfs_write(file, p, count, pos);
		if (file->f_op->write)
		ret = file->f_op->write(file, p, count, pos);
		else if (file->f_op->write_iter)
		ret = new_sync_write(file, p, count, pos);
		else
		ret = -EINVAL;
		set_fs(old_fs);
		if (ret > 0) {
		fsnotify_modify(file);
		@@ -554,19 +548,23 @@ ssize_t vfs_write(struct file file, const char __user buf, size_t count, loff_
		return -EFAULT;

		ret = rw_verify_area(WRITE, file, pos, count);
		if (!ret) {
		if (ret)
		return ret;
		if (count > MAX_RW_COUNT)
		count = MAX_RW_COUNT;
		file_start_write(file);
		ret = __vfs_write(file, buf, count, pos);
		if (file->f_op->write)
		ret = file->f_op->write(file, buf, count, pos);
		else if (file->f_op->write_iter)
		ret = new_sync_write(file, buf, count, pos);
		else
		ret = -EINVAL;
		if (ret > 0) {
		fsnotify_modify(file);
		add_wchar(current, ret);
		}
		inc_syscw(current);
		file_end_write(file);
		}

		return ret;
		}

Admin message