Merge tag 'fscache-fixes-20141013' of... (1b5a5f59) · Commits · 戴 / test

fs/cachefiles/interface.c

+20 −13

Original line number	Original line	Diff line number	Diff line
	@@ -268,6 +268,12 @@ static void cachefiles_drop_object(struct fscache_object *_object)
	ASSERT((atomic_read(&object->usage) & 0xffff0000) != 0x6b6b0000);		ASSERT((atomic_read(&object->usage) & 0xffff0000) != 0x6b6b0000);
	#endif		#endif

			/* We need to tidy the object up if we did in fact manage to open it.
			* It's possible for us to get here before the object is fully
			* initialised if the parent goes away or the object gets retired
			* before we set it up.
			*/
			if (object->dentry) {
	/* delete retired objects */		/* delete retired objects */
	if (test_bit(FSCACHE_OBJECT_RETIRED, &object->fscache.flags) &&		if (test_bit(FSCACHE_OBJECT_RETIRED, &object->fscache.flags) &&
	_object != cache->cache.fsdef		_object != cache->cache.fsdef
	@@ -282,6 +288,7 @@ static void cachefiles_drop_object(struct fscache_object *_object)
	if (object->backer != object->dentry)		if (object->backer != object->dentry)
	dput(object->backer);		dput(object->backer);
	object->backer = NULL;		object->backer = NULL;
			}

	/* note that the object is now inactive */		/* note that the object is now inactive */
	if (test_bit(CACHEFILES_OBJECT_ACTIVE, &object->flags)) {		if (test_bit(CACHEFILES_OBJECT_ACTIVE, &object->flags)) {

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -189,7 +189,7 @@ try_again:
	/* an old object from a previous incarnation is hogging the slot - we		/* an old object from a previous incarnation is hogging the slot - we
	* need to wait for it to be destroyed */		* need to wait for it to be destroyed */
	wait_for_old_object:		wait_for_old_object:
	if (fscache_object_is_live(&object->fscache)) {		if (fscache_object_is_live(&xobject->fscache)) {
	pr_err("\n");		pr_err("\n");
	pr_err("Error: Unexpected object collision\n");		pr_err("Error: Unexpected object collision\n");
	cachefiles_printk_object(object, xobject);		cachefiles_printk_object(object, xobject);

+2 −14

Original line number	Original line	Diff line number	Diff line
	@@ -380,26 +380,14 @@ no_config:
	static int fscache_objlist_open(struct inode inode, struct file file)		static int fscache_objlist_open(struct inode inode, struct file file)
	{		{
	struct fscache_objlist_data *data;		struct fscache_objlist_data *data;
	struct seq_file *m;
	int ret;

	ret = seq_open(file, &fscache_objlist_ops);		data = __seq_open_private(file, &fscache_objlist_ops, sizeof(*data));
	if (ret < 0)		if (!data)
	return ret;

	m = file->private_data;

	/* buffer for key extraction */
	data = kmalloc(sizeof(struct fscache_objlist_data), GFP_KERNEL);
	if (!data) {
	seq_release(inode, file);
	return -ENOMEM;		return -ENOMEM;
	}

	/* get the configuration key */		/* get the configuration key */
	fscache_objlist_config(data);		fscache_objlist_config(data);

	m->private = data;
	return 0;		return 0;
	}		}