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

Commit abb5a14f 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 misc bits and pieces.

  There are several single-topic branches left after this (rename2
  series from Miklos, current_time series from Deepa Dinamani, xattr
  series from Andreas, uaccess stuff from from me) and I'd prefer to
  send those separately"

* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (39 commits)
  proc: switch auxv to use of __mem_open()
  hpfs: support FIEMAP
  cifs: get rid of unused arguments of CIFSSMBWrite()
  posix_acl: uapi header split
  posix_acl: xattr representation cleanups
  fs/aio.c: eliminate redundant loads in put_aio_ring_file
  fs/internal.h: add const to ns_dentry_operations declaration
  compat: remove compat_printk()
  fs/buffer.c: make __getblk_slow() static
  proc: unsigned file descriptors
  fs/file: more unsigned file descriptors
  fs: compat: remove redundant check of nr_segs
  cachefiles: Fix attempt to read i_blocks after deleting file [ver #2]
  cifs: don't use memcpy() to copy struct iov_iter
  get rid of separate multipage fault-in primitives
  fs: Avoid premature clearing of capabilities
  fs: Give dentry to inode_change_ok() instead of inode
  fuse: Propagate dentry down to inode_change_ok()
  ceph: Propagate dentry down to inode_change_ok()
  xfs: Propagate dentry down to inode_change_ok()
  ...
parents 911f9dab e55f1d1d

Documentation/filesystems/porting

+2 −2
Original line number Diff line number Diff line
@@ -287,8 +287,8 @@ implementing on-disk size changes. Start with a copy of the old inode_setattr 
and vmtruncate, and the reorder the vmtruncate + foofs_vmtruncate sequence to

be in order of zeroing blocks using block_truncate_page or similar helpers,

size update and on finally on-disk truncation which should not fail.

inode_change_ok now includes the size checks for ATTR_SIZE and must be called

in the beginning of ->setattr unconditionally.

setattr_prepare (which used to be inode_change_ok) now includes the size checks

for ATTR_SIZE and must be called in the beginning of ->setattr unconditionally.



[mandatory]

arch/parisc/kernel/cache.c

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ void flush_dcache_page(struct page *page) 
				      != (addr & (SHM_COLOUR - 1))) {

			__flush_cache_page(mpnt, addr, page_to_phys(page));

			if (old_addr)

				printk(KERN_ERR "INEQUIVALENT ALIASES 0x%lx and 0x%lx in file %s\n", old_addr, addr, mpnt->vm_file ? (char *)mpnt->vm_file->f_path.dentry->d_name.name : "(null)");

				printk(KERN_ERR "INEQUIVALENT ALIASES 0x%lx and 0x%lx in file %pD\n", old_addr, addr, mpnt->vm_file);

			old_addr = addr;

		}

	}

drivers/gpu/drm/armada/armada_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ int armada_gem_pwrite_ioctl(struct drm_device *dev, void *data, 
	if (!access_ok(VERIFY_READ, ptr, args->size))

		return -EFAULT;



	ret = fault_in_multipages_readable(ptr, args->size);

	ret = fault_in_pages_readable(ptr, args->size);

	if (ret)

		return ret;

drivers/gpu/drm/drm_debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -104,8 +104,8 @@ int drm_debugfs_create_files(const struct drm_info_list *files, int count, 
		ent = debugfs_create_file(files[i].name, S_IFREG | S_IRUGO,

					  root, tmp, &drm_debugfs_fops);

		if (!ent) {

			DRM_ERROR("Cannot create /sys/kernel/debug/dri/%s/%s\n",

				  root->d_name.name, files[i].name);

			DRM_ERROR("Cannot create /sys/kernel/debug/dri/%pd/%s\n",

				  root, files[i].name);

			kfree(tmp);

			ret = -1;

			goto fail;

drivers/gpu/drm/i915/i915_gem.c

+3 −3
Original line number Diff line number Diff line
@@ -675,7 +675,7 @@ i915_gem_gtt_pread(struct drm_device *dev, 


	mutex_unlock(&dev->struct_mutex);

	if (likely(!i915.prefault_disable)) {

		ret = fault_in_multipages_writeable(user_data, remain);

		ret = fault_in_pages_writeable(user_data, remain);

		if (ret) {

			mutex_lock(&dev->struct_mutex);

			goto out_unpin;
@@ -803,7 +803,7 @@ i915_gem_shmem_pread(struct drm_device *dev, 
		mutex_unlock(&dev->struct_mutex);



		if (likely(!i915.prefault_disable) && !prefaulted) {

			ret = fault_in_multipages_writeable(user_data, remain);

			ret = fault_in_pages_writeable(user_data, remain);

			/* Userspace is tricking us, but we've already clobbered

			 * its pages with the prefault and promised to write the

			 * data up to the first fault. Hence ignore any errors
@@ -1267,7 +1267,7 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data, 
		return -EFAULT;



	if (likely(!i915.prefault_disable)) {

		ret = fault_in_multipages_readable(u64_to_user_ptr(args->data_ptr),

		ret = fault_in_pages_readable(u64_to_user_ptr(args->data_ptr),

						   args->size);

		if (ret)

			return -EFAULT;