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

Merge tag 'pull-work.lseek' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull vfs lseek updates from Al Viro:
 "Jason's lseek series.

  Saner handling of 'lseek should fail with ESPIPE' - this gets rid of
  the magical no_llseek thing and makes checks consistent.

  In particular, the ad-hoc "can we do splice via internal pipe" checks
  got saner (and somewhat more permissive, which is what Jason had been
  after, AFAICT)"

* tag 'pull-work.lseek' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fs: remove no_llseek
  fs: check FMODE_LSEEK to control internal pipe splicing
  vfio: do not set FMODE_LSEEK flag
  dma-buf: remove useless FMODE_LSEEK flag
  fs: do not compare against ->llseek
  fs: clear or set FMODE_LSEEK based on llseek function
parents d9395512 868941b1

Documentation/filesystems/porting.rst

+8 −0
Original line number Diff line number Diff line
@@ -914,3 +914,11 @@ Calling conventions for file_open_root() changed; now it takes struct path * 
instead of passing mount and dentry separately.  For callers that used to

pass <mnt, mnt->mnt_root> pair (i.e. the root of given mount), a new helper

is provided - file_open_root_mnt().  In-tree users adjusted.



---



**mandatory**



no_llseek is gone; don't set .llseek to that - just leave it NULL instead.

Checks for "does that file have llseek(2), or should it fail with ESPIPE"

should be done by looking at FMODE_LSEEK in file->f_mode.

drivers/dma-buf/dma-buf.c

+0 −1
Original line number Diff line number Diff line
@@ -549,7 +549,6 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info) 
		goto err_dmabuf;

	}



	file->f_mode |= FMODE_LSEEK;

	dmabuf->file = file;



	mutex_init(&dmabuf->lock);

drivers/gpu/drm/drm_file.c

+1 −2
Original line number Diff line number Diff line
@@ -552,8 +552,7 @@ EXPORT_SYMBOL(drm_release_noglobal); 
 * Since events are used by the KMS API for vblank and page flip completion this

 * means all modern display drivers must use it.

 *

 * @offset is ignored, DRM events are read like a pipe. Therefore drivers also

 * must set the &file_operation.llseek to no_llseek(). Polling support is

 * @offset is ignored, DRM events are read like a pipe. Polling support is

 * provided by drm_poll().

 *

 * This function will only ever read a full event. Therefore userspace must

drivers/vfio/vfio.c

+1 −1
Original line number Diff line number Diff line
@@ -1132,7 +1132,7 @@ static struct file *vfio_device_open(struct vfio_device *device) 
	 * Appears to be missing by lack of need rather than

	 * explicitly prevented.  Now there's need.

	 */

	filep->f_mode |= (FMODE_LSEEK | FMODE_PREAD | FMODE_PWRITE);

	filep->f_mode |= (FMODE_PREAD | FMODE_PWRITE);



	if (device->group->type == VFIO_NO_IOMMU)

		dev_warn(device->dev, "vfio-noiommu device opened by user "

fs/coredump.c

+2 −2
Original line number Diff line number Diff line
@@ -816,9 +816,9 @@ static int __dump_skip(struct coredump_params *cprm, size_t nr) 
{

	static char zeroes[PAGE_SIZE];

	struct file *file = cprm->file;

	if (file->f_op->llseek && file->f_op->llseek != no_llseek) {

	if (file->f_mode & FMODE_LSEEK) {

		if (dump_interrupted() ||

		    file->f_op->llseek(file, nr, SEEK_CUR) < 0)

		    vfs_llseek(file, nr, SEEK_CUR) < 0)

			return 0;

		cprm->pos += nr;

		return 1;