Commit 3c2de27d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull vfs updates from Al Viro:

 - Preparations of parallel lookups (the remaining main obstacle is the
   need to move security_d_instantiate(); once that becomes safe, the
   rest will be a matter of rather short series local to fs/*.c

 - preadv2/pwritev2 series from Christoph

 - assorted fixes

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (32 commits)
  splice: handle zero nr_pages in splice_to_pipe()
  vfs: show_vfsstat: do not ignore errors from show_devname method
  dcache.c: new helper: __d_add()
  don't bother with __d_instantiate(dentry, NULL)
  untangle fsnotify_d_instantiate() a bit
  uninline d_add()
  replace d_add_unique() with saner primitive
  quota: use lookup_one_len_unlocked()
  cifs_get_root(): use lookup_one_len_unlocked()
  nfs_lookup: don't bother with d_instantiate(dentry, NULL)
  kill dentry_unhash()
  ceph_fill_trace(): don't bother with d_instantiate(dn, NULL)
  autofs4: don't bother with d_instantiate(dentry, NULL) in ->lookup()
  configfs: move d_rehash() into configfs_create() for regular files
  ceph: don't bother with d_rehash() in splice_dentry()
  namei: teach lookup_slow() to skip revalidate
  namei: massage lookup_slow() to be usable by lookup_one_len_unlocked()
  lookup_one_len_unlocked(): use lookup_dcache()
  namei: simplify invalidation logics in lookup_dcache()
  namei: change calling conventions for lookup_{fast,slow} and follow_managed()
  ...
parents 51b3eae8 8b23a8ce

arch/x86/entry/syscalls/syscall_32.tbl

+2 −0
Original line number Diff line number Diff line
@@ -384,3 +384,5 @@ 
375	i386	membarrier		sys_membarrier

376	i386	mlock2			sys_mlock2

377	i386	copy_file_range		sys_copy_file_range

378	i386	preadv2			sys_preadv2

379	i386	pwritev2		sys_pwritev2

arch/x86/entry/syscalls/syscall_64.tbl

+2 −0
Original line number Diff line number Diff line
@@ -333,6 +333,8 @@ 
324	common	membarrier		sys_membarrier

325	common	mlock2			sys_mlock2

326	common	copy_file_range		sys_copy_file_range

327	64	preadv2			sys_preadv2

328	64	pwritev2		sys_pwritev2



#

# x32-specific system call numbers start at 512 to avoid cache impact

fs/autofs4/root.c

+0 −2
Original line number Diff line number Diff line
@@ -542,8 +542,6 @@ static struct dentry *autofs4_lookup(struct inode *dir, 
		ino->dentry = dentry;



		autofs4_add_active(dentry);



		d_instantiate(dentry, NULL);

	}

	return NULL;

}

fs/cachefiles/daemon.c

+10 −3
Original line number Diff line number Diff line
@@ -162,6 +162,8 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer, 
				      size_t buflen, loff_t *pos)

{

	struct cachefiles_cache *cache = file->private_data;

	unsigned long long b_released;

	unsigned f_released;

	char buffer[256];

	int n;
@@ -174,6 +176,8 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer, 
	cachefiles_has_space(cache, 0, 0);



	/* summarise */

	f_released = atomic_xchg(&cache->f_released, 0);

	b_released = atomic_long_xchg(&cache->b_released, 0);

	clear_bit(CACHEFILES_STATE_CHANGED, &cache->flags);



	n = snprintf(buffer, sizeof(buffer),
@@ -183,15 +187,18 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer, 
		     " fstop=%llx"

		     " brun=%llx"

		     " bcull=%llx"

		     " bstop=%llx",

		     " bstop=%llx"

		     " freleased=%x"

		     " breleased=%llx",

		     test_bit(CACHEFILES_CULLING, &cache->flags) ? '1' : '0',

		     (unsigned long long) cache->frun,

		     (unsigned long long) cache->fcull,

		     (unsigned long long) cache->fstop,

		     (unsigned long long) cache->brun,

		     (unsigned long long) cache->bcull,

		     (unsigned long long) cache->bstop

		     );

		     (unsigned long long) cache->bstop,

		     f_released,

		     b_released);



	if (n > buflen)

		return -EMSGSIZE;

fs/cachefiles/interface.c

+2 −9
Original line number Diff line number Diff line
@@ -291,15 +291,8 @@ static void cachefiles_drop_object(struct fscache_object *_object) 
	}



	/* note that the object is now inactive */

	if (test_bit(CACHEFILES_OBJECT_ACTIVE, &object->flags)) {

		write_lock(&cache->active_lock);

		if (!test_and_clear_bit(CACHEFILES_OBJECT_ACTIVE,

					&object->flags))

			BUG();

		rb_erase(&object->active_node, &cache->active_nodes);

		wake_up_bit(&object->flags, CACHEFILES_OBJECT_ACTIVE);

		write_unlock(&cache->active_lock);

	}

	if (test_bit(CACHEFILES_OBJECT_ACTIVE, &object->flags))

		cachefiles_mark_object_inactive(cache, object);



	dput(object->dentry);

	object->dentry = NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE