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

Commit 8b23a8ce authored by Al Viro's avatar Al Viro
Browse files

Merge branches 'work.lookups', 'work.misc' and 'work.preadv2' into for-next

parents f9381284 ed782b5a d6785d91 8e0b60b9

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
@@ -537,8 +537,6 @@ static struct dentry *autofs4_lookup(struct inode *dir, struct dentry *dentry, u 
		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;