Skip to content

Commit

Permalink
fuse: don't BUG on no write file
Browse files Browse the repository at this point in the history
Don't bug if there's no writable files found for page writeback.  If ever
this is triggered, a WARN_ON helps debugging it much better then a BUG_ON.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
  • Loading branch information
Miklos Szeredi committed Oct 1, 2013
1 parent cca2437 commit 7252342
Showing 1 changed file with 12 additions and 5 deletions.
17 changes: 12 additions & 5 deletions fs/fuse/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -1505,12 +1505,14 @@ static void fuse_writepage_end(struct fuse_conn *fc, struct fuse_req *req)
static struct fuse_file *fuse_write_file(struct fuse_conn *fc,
struct fuse_inode *fi)
{
struct fuse_file *ff;
struct fuse_file *ff = NULL;

spin_lock(&fc->lock);
BUG_ON(list_empty(&fi->write_files));
ff = list_entry(fi->write_files.next, struct fuse_file, write_entry);
fuse_file_get(ff);
if (!WARN_ON(list_empty(&fi->write_files))) {
ff = list_entry(fi->write_files.next, struct fuse_file,
write_entry);
fuse_file_get(ff);
}
spin_unlock(&fc->lock);

return ff;
Expand All @@ -1524,6 +1526,7 @@ static int fuse_writepage_locked(struct page *page)
struct fuse_inode *fi = get_fuse_inode(inode);
struct fuse_req *req;
struct page *tmp_page;
int error = -ENOMEM;

set_page_writeback(page);

Expand All @@ -1536,7 +1539,11 @@ static int fuse_writepage_locked(struct page *page)
if (!tmp_page)
goto err_free;

error = -EIO;
req->ff = fuse_write_file(fc, fi);
if (!req->ff)
goto err_free;

fuse_write_fill(req, req->ff, page_offset(page), 0);

copy_highpage(tmp_page, page);
Expand Down Expand Up @@ -1566,7 +1573,7 @@ static int fuse_writepage_locked(struct page *page)
fuse_request_free(req);
err:
end_page_writeback(page);
return -ENOMEM;
return error;
}

static int fuse_writepage(struct page *page, struct writeback_control *wbc)
Expand Down

0 comments on commit 7252342

Please sign in to comment.