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

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

Merge tag 'configfs-for-4.8' of git://git.infradead.org/users/hch/configfs

Pull configfs update from Christoph Hellwig:
 "A simple error handling fix from Tal Shorer"

* tag 'configfs-for-4.8' of git://git.infradead.org/users/hch/configfs:
  configfs: don't set buffer_needs_fill to zero if show() returns error
parents b0c4e2ac 3dc3afad
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -80,11 +80,11 @@ static int fill_read_buffer(struct dentry * dentry, struct configfs_buffer * buf

	count = attr->show(item, buffer->page);

	buffer->needs_read_fill = 0;
	BUG_ON(count > (ssize_t)SIMPLE_ATTR_SIZE);
	if (count >= 0)
	if (count >= 0) {
		buffer->needs_read_fill = 0;
		buffer->count = count;
	else
	} else
		ret = count;
	return ret;
}