Skip to content

Commit

Permalink
Btrfs: update stale comments referencing vmtruncate()
Browse files Browse the repository at this point in the history
Commit a41ad39 ("Btrfs: convert to the new truncate sequence")
changed btrfs_setsize() to call truncate_setsize() instead of
vmtruncate() but didn't update the comment above it. truncate_setsize()
never fails (the IS_SWAPFILE() check happens elsewhere), so remove the
comment.

Additionally, the comment above btrfs_page_mkwrite() references
vmtruncate(), but truncate_setsize() does the size write and page
locking now.

Signed-off-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: David Sterba <dsterba@suse.com>
  • Loading branch information
Omar Sandoval authored and David Sterba committed May 28, 2018
1 parent c442793 commit d1342aa
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions fs/btrfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -5369,7 +5369,6 @@ static int btrfs_setsize(struct inode *inode, struct iattr *attr)
if (ret)
return ret;

/* we don't support swapfiles, so vmtruncate shouldn't fail */
truncate_setsize(inode, newsize);

/* Disable nonlocked read DIO to avoid the end less truncate */
Expand Down Expand Up @@ -9044,8 +9043,8 @@ static void btrfs_invalidatepage(struct page *page, unsigned int offset,
*
* We are not allowed to take the i_mutex here so we have to play games to
* protect against truncate races as the page could now be beyond EOF. Because
* vmtruncate() writes the inode size before removing pages, once we have the
* page lock we can determine safely if the page is beyond EOF. If it is not
* truncate_setsize() writes the inode size before removing pages, once we have
* the page lock we can determine safely if the page is beyond EOF. If it is not
* beyond EOF, then the page is guaranteed safe against truncation until we
* unlock the page.
*/
Expand Down

0 comments on commit d1342aa

Please sign in to comment.