Skip to content

Commit

Permalink
Merge tag 'configfs-for-4.8' of git://git.infradead.org/users/hch/con…
Browse files Browse the repository at this point in the history
…figfs

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
  • Loading branch information
torvalds committed Jul 29, 2016
2 parents b0c4e2a + 3dc3afa commit a54809f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions fs/configfs/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit a54809f

Please sign in to comment.