From f3976e3733e97a0e96f5fc6349d1e82b25116043 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Fri, 11 Aug 2023 22:22:59 -0400 Subject: Update bcachefs sources to b0788c47d9 bcachefs: Fix check_version_upgrade() --- libbcachefs/fs-io.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'libbcachefs/fs-io.c') diff --git a/libbcachefs/fs-io.c b/libbcachefs/fs-io.c index e846d1eb..963c7971 100644 --- a/libbcachefs/fs-io.c +++ b/libbcachefs/fs-io.c @@ -3,7 +3,6 @@ #include "bcachefs.h" #include "alloc_foreground.h" -//#include "bkey_buf.h" #include "btree_update.h" #include "buckets.h" #include "clock.h" @@ -13,7 +12,6 @@ #include "fs.h" #include "fs-io.h" #include "fs-io-buffered.h" -//#include "fs-io-direct.h" #include "fs-io-pagecache.h" #include "fsck.h" #include "inode.h" @@ -264,7 +262,7 @@ static int __bch2_truncate_folio(struct bch_inode_info *inode, folio = __filemap_get_folio(mapping, index, FGP_LOCK|FGP_CREAT, GFP_KERNEL); - if (unlikely(IS_ERR_OR_NULL(folio))) { + if (IS_ERR_OR_NULL(folio)) { ret = -ENOMEM; goto out; } -- cgit v1.2.3