From nobody Mon Feb 9 23:04:22 2026 Received: from mail-ot1-f47.google.com (mail-ot1-f47.google.com [209.85.210.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2BDF01E0DE3; Mon, 21 Apr 2025 01:34:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745199288; cv=none; b=shTqhZSF/LsqvS3AzUOFRRqI5WNK9ty8AjXLhaRJ0borY30Kgn4BbT7sXZX4fwApdrXIGDoQ+DbZNOFKDb0qLTm4qUPuTHYvZ2e0jODc18a62qC7JGzrstwPww/CFzDLxxNgCorldmrk/q2tOhdCKmjolaoWO+sSwf6Rr/hdaA0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745199288; c=relaxed/simple; bh=xGy57wKMHcPHaHQmqC7PU7UgEP988xP7vfKFR5LKz6A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JtmlQUf5QSaj+dSe1rC/dOogxU79sWt5wkWBMON9Gk1Qpt4WecYCNlMvAvSQt+f2vPVYIVXOGZIJMh4W6hgxQpE1tKveFpaKXHWUaIHVqayEGOJsoR/tUXAnuVhQrXTj9FwCbHNwEvBe0gx7ktLz0vtAGsbr6P+9lMMQrxo0Cnc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=Groves.net; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=PtfeptV1; arc=none smtp.client-ip=209.85.210.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=Groves.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PtfeptV1" Received: by mail-ot1-f47.google.com with SMTP id 46e09a7af769-72b82c8230aso1089700a34.2; Sun, 20 Apr 2025 18:34:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745199284; x=1745804084; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=kGY/iAQALrENz7kCElkxfNZCIv66dIEClpF9MaGB4Dg=; b=PtfeptV1Cr92tV9d8Sl/8CYXhfRbu+QJlrvQeYf7INWEDHZA1VE8nPMgsoi7s2Aw90 k5NZwt5dNyAHAgpINE7a12MsdlgmRo1WQ+XItNwWjZxZRTcYDBGVYfqatZMTqHoXTGgJ MzbnaFIV434jusIGg4SG9G8JO/E/Khlm4R1EBXa/aBS3QeHElAOLP86EjIwoAltDbmpl 7ke/XAal5SWhwUwbBP3wtjS5dlOF+Ds5x9OszDUZyPLb0iWnICdVxvkUJuEc9k8gWrcB 4uLbbEfljT+OCN4SeYAW8ZxZZoIWZiaibw95kNgkVKWEqcJpuDmQgkRYSeWLNa3Wz4vn Eabw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745199284; x=1745804084; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=kGY/iAQALrENz7kCElkxfNZCIv66dIEClpF9MaGB4Dg=; b=l0IYcXNMDXzdDg4GHPPNMo9pC6bbdAk2FMQ88eC3Bp8e4k29ryv1vRzqMSeTSJ5gsn 1gfwIjoJlZRY0b//VIlO4UZQp6uIOVcgUhJukeWVhHTqdv++vp6x5IkoxA/AXlc/tZML AL//8uHBQSAd0s+lhPC5grPdORlvit6DfwaY7smnAhAphQp66lx9vCldK5/DrXeAqbUg 3vYowf6BGFu9GwElU9VyyGylycSm4keXm2I7nveUPBTK1Tjhz4vpTg16rBk9iyGGtvyb OcZZGLfO+DCigNOPb41ZM2a3LzST6d4laz6SFdTMfY/WYxB1RnSSrZHdiWhKYS8klrR8 lZsg== X-Forwarded-Encrypted: i=1; AJvYcCUjHYB4ftp+ukPG1Sgxkx6lAOtU+V/Ed0GtQSdna+VWyt+YofV9NzdP6OW9q/wOXcxILY9VRsxTzokesCrikg==@vger.kernel.org, AJvYcCVlrkJO6/1jCUsPU+XQZdeEK5zdMmanH9gtSBt7Eh5PALiIndYEgbKoe4OUGLKLeyMGEUBCdAr4sWB+@vger.kernel.org, AJvYcCWwt6YDuYE9/J4v2PG8+cMpdQRPSZMa3K4rFsF9VgkPPXTAbVfjdY30qmT1xnSK4GCRXcN6ik3E8hs=@vger.kernel.org, AJvYcCXI8xlbnqfSUgNpuh3VIg3YSg37lSh1VkEn77W4TqbYUpkC7kp6MOE2aRoQGObmtZp7375cgMNn8CQ65tlK@vger.kernel.org X-Gm-Message-State: AOJu0YwV+xcMCvH1Jj0sBbD82FOBiliswo1JRuU8JCWledxH8GRBDM3M SrM4CrJcYdXCrYonWiDRARqRJ99OKYumg5svV/hV2XPIc36UTs/W X-Gm-Gg: ASbGncv/tHEAxPGiCAQAdJUO1AwaRgHZ2clUmwhhkbijMJ2MNEELPpyes/zbCJb1Uw7 ik4g4kqUVA2n4BXA/CuotmHEsOXNLp9muOU27fSXUzxg7WK3+sxLF/SO9X9RSjf6SRIM172G1Qb hzd/ECnUiuw6s+xtfsH4tnFBLrFzTe5+IAt5FRNAtLYmwWldu6RQ/8JR2XxiiNaZwMBnc/kA53P zoYrx1vorKsqb2Z6PS75y2N5gZViQZng9vxD4eU+6dFpm687sUijztuPPaoUHOhXTLXm2FGTOJf Z3UvPd9HrOAm92ssFiqOFe4GoVE2ZPpdcxBUBZdkC8NfCHDuM+3nnbhVzj3p/gnYenSkyQ== X-Google-Smtp-Source: AGHT+IHi4NS1xMTqypMU3t1y5JPLpqGjkg0Jz7FECLjaMyt6sb+shrqrVp3uCCLvcJOP+hFAPH4l6Q== X-Received: by 2002:a05:6830:4709:b0:72b:992b:e41 with SMTP id 46e09a7af769-730063311a1mr6130128a34.23.1745199284265; Sun, 20 Apr 2025 18:34:44 -0700 (PDT) Received: from localhost.localdomain ([2603:8080:1500:3d89:a8f7:1b36:93ce:8dbf]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7300489cd44sm1267588a34.66.2025.04.20.18.34.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 20 Apr 2025 18:34:43 -0700 (PDT) Sender: John Groves From: John Groves X-Google-Original-From: John Groves To: John Groves , Dan Williams , Miklos Szeredi , Bernd Schubert Cc: John Groves , Jonathan Corbet , Vishal Verma , Dave Jiang , Matthew Wilcox , Jan Kara , Alexander Viro , Christian Brauner , "Darrick J . Wong" , Luis Henriques , Randy Dunlap , Jeff Layton , Kent Overstreet , Petr Vorel , Brian Foster , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, linux-fsdevel@vger.kernel.org, Amir Goldstein , Jonathan Cameron , Stefan Hajnoczi , Joanne Koong , Josef Bacik , Aravind Ramesh , Ajay Joshi , John Groves Subject: [RFC PATCH 16/19] famfs_fuse: Add holder_operations for dax notify_failure() Date: Sun, 20 Apr 2025 20:33:43 -0500 Message-Id: <20250421013346.32530-17-john@groves.net> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250421013346.32530-1-john@groves.net> References: <20250421013346.32530-1-john@groves.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" If we get a notify_failure() call on a daxdev, set its error flag and prevent further access to that device. Signed-off-by: John Groves --- fs/fuse/famfs.c | 154 ++++++++++++++++++++++++++++++++++------------- fs/fuse/file.c | 6 +- fs/fuse/fuse_i.h | 6 +- 3 files changed, 117 insertions(+), 49 deletions(-) diff --git a/fs/fuse/famfs.c b/fs/fuse/famfs.c index 8c12e8bd96b2..363031704c8d 100644 --- a/fs/fuse/famfs.c +++ b/fs/fuse/famfs.c @@ -20,6 +20,26 @@ #include "famfs_kfmap.h" #include "fuse_i.h" =20 +static void famfs_set_daxdev_err( + struct fuse_conn *fc, struct dax_device *dax_devp); + +static int +famfs_dax_notify_failure(struct dax_device *dax_devp, u64 offset, + u64 len, int mf_flags) +{ + struct fuse_conn *fc =3D dax_holder(dax_devp); + + famfs_set_daxdev_err(fc, dax_devp); + + return 0; +} + +static const struct dax_holder_operations famfs_fuse_dax_holder_ops =3D { + .notify_failure =3D famfs_dax_notify_failure, +}; + +/*************************************************************************= ****/ + /* * famfs_teardown() * @@ -169,6 +189,15 @@ famfs_fuse_get_daxdev(struct fuse_mount *fm, const u64= index) goto out; } =20 + err =3D fs_dax_get(daxdev->devp, fc, &famfs_fuse_dax_holder_ops); + if (err) { + up_write(&fc->famfs_devlist_sem); + pr_err("%s: fs_dax_get(%lld) failed\n", + __func__, (u64)daxdev->devno); + err =3D -EBUSY; + goto out; + } + daxdev->name =3D kstrdup(daxdev_out.name, GFP_KERNEL); wmb(); /* all daxdev fields must be visible before marking it valid */ daxdev->valid =3D 1; @@ -263,6 +292,38 @@ famfs_update_daxdev_table( return 0; } =20 +static void +famfs_set_daxdev_err( + struct fuse_conn *fc, + struct dax_device *dax_devp) +{ + int i; + + /* Gotta search the list by dax_devp; + * read lock because we're not adding or removing daxdev entries + */ + down_read(&fc->famfs_devlist_sem); + for (i =3D 0; i < fc->dax_devlist->nslots; i++) { + if (fc->dax_devlist->devlist[i].valid) { + struct famfs_daxdev *dd =3D &fc->dax_devlist->devlist[i]; + + if (dd->devp !=3D dax_devp) + continue; + + dd->error =3D true; + up_read(&fc->famfs_devlist_sem); + + pr_err("%s: memory error on daxdev %s (%d)\n", + __func__, dd->name, i); + goto done; + } + } + up_read(&fc->famfs_devlist_sem); + pr_err("%s: memory err on unrecognized daxdev\n", __func__); + +done: +} + /*************************************************************************= **/ =20 void @@ -610,10 +671,10 @@ famfs_file_init_dax( * offsets within a dax device. */ =20 -static ssize_t famfs_file_invalid(struct inode *inode); +static ssize_t famfs_file_bad(struct inode *inode); =20 static int -famfs_meta_to_dax_offset_v2(struct inode *inode, struct iomap *iomap, +famfs_interleave_fileofs_to_daxofs(struct inode *inode, struct iomap *ioma= p, loff_t file_offset, off_t len, unsigned int flags) { struct fuse_inode *fi =3D get_fuse_inode(inode); @@ -628,7 +689,7 @@ famfs_meta_to_dax_offset_v2(struct inode *inode, struct= iomap *iomap, goto err_out; } =20 - if (famfs_file_invalid(inode)) + if (famfs_file_bad(inode)) goto err_out; =20 iomap->offset =3D file_offset; @@ -649,6 +710,7 @@ famfs_meta_to_dax_offset_v2(struct inode *inode, struct= iomap *iomap, =20 /* Is the data is in this striped extent? */ if (local_offset < ext_size) { + struct famfs_daxdev *dd; u64 chunk_num =3D local_offset / chunk_size; u64 chunk_offset =3D local_offset % chunk_size; u64 stripe_num =3D chunk_num / nstrips; @@ -658,9 +720,11 @@ famfs_meta_to_dax_offset_v2(struct inode *inode, struc= t iomap *iomap, u64 strip_dax_ofs =3D fei->ie_strips[strip_num].ext_offset; u64 strip_devidx =3D fei->ie_strips[strip_num].dev_index; =20 - if (!fc->dax_devlist->devlist[strip_devidx].valid) { - pr_err("%s: daxdev=3D%lld invalid\n", __func__, - strip_devidx); + dd =3D &fc->dax_devlist->devlist[strip_devidx]; + if (!dd->valid || dd->error) { + pr_err("%s: daxdev=3D%lld %s\n", __func__, + strip_devidx, + dd->valid ? "error" : "invalid"); goto err_out; } iomap->addr =3D strip_dax_ofs + strip_offset; @@ -695,9 +759,9 @@ famfs_meta_to_dax_offset_v2(struct inode *inode, struct= iomap *iomap, } =20 /** - * famfs_meta_to_dax_offset() - Resolve (file, offset, len) to (daxdev, of= fset, len) + * famfs_fileofs_to_daxofs() - Resolve (file, offset, len) to (daxdev, off= set, len) * - * This function is called by famfs_iomap_begin() to resolve an offset in a + * This function is called by famfs_fuse_iomap_begin() to resolve an offse= t in a * file to an offset in a dax device. This is upcalled from dax from calls= to * both * dax_iomap_fault() and dax_iomap_rw(). Dax finishes the job reso= lving * a fault to a specific physical page (the fault case) or doing a memcpy @@ -717,7 +781,7 @@ famfs_meta_to_dax_offset_v2(struct inode *inode, struct= iomap *iomap, * Return values: 0. (info is returned in a modified @iomap struct) */ static int -famfs_meta_to_dax_offset(struct inode *inode, struct iomap *iomap, +famfs_fileofs_to_daxofs(struct inode *inode, struct iomap *iomap, loff_t file_offset, off_t len, unsigned int flags) { struct fuse_inode *fi =3D get_fuse_inode(inode); @@ -731,12 +795,13 @@ famfs_meta_to_dax_offset(struct inode *inode, struct = iomap *iomap, goto err_out; } =20 - if (famfs_file_invalid(inode)) + if (famfs_file_bad(inode)) goto err_out; =20 if (meta->fm_extent_type =3D=3D INTERLEAVED_EXTENT) - return famfs_meta_to_dax_offset_v2(inode, iomap, file_offset, - len, flags); + return famfs_interleave_fileofs_to_daxofs(inode, iomap, + file_offset, + len, flags); =20 iomap->offset =3D file_offset; =20 @@ -757,10 +822,14 @@ famfs_meta_to_dax_offset(struct inode *inode, struct = iomap *iomap, */ if (local_offset < dax_ext_len) { loff_t ext_len_remainder =3D dax_ext_len - local_offset; + struct famfs_daxdev *dd; + + dd =3D &fc->dax_devlist->devlist[daxdev_idx]; =20 - if (!fc->dax_devlist->devlist[daxdev_idx].valid) { - pr_err("%s: daxdev=3D%lld invalid\n", __func__, - daxdev_idx); + if (!dd->valid || dd->error) { + pr_err("%s: daxdev=3D%lld %s\n", __func__, + daxdev_idx, + dd->valid ? "error" : "invalid"); goto err_out; } =20 @@ -808,7 +877,7 @@ famfs_meta_to_dax_offset(struct inode *inode, struct io= map *iomap, } =20 /** - * famfs_iomap_begin() - Handler for iomap_begin upcall from dax + * famfs_fuse_iomap_begin() - Handler for iomap_begin upcall from dax * * This function is pretty simple because files are * * never partially allocated @@ -824,7 +893,7 @@ famfs_meta_to_dax_offset(struct inode *inode, struct io= map *iomap, * @srcmap: */ static int -famfs_iomap_begin(struct inode *inode, loff_t offset, loff_t length, +famfs_fuse_iomap_begin(struct inode *inode, loff_t offset, loff_t length, unsigned int flags, struct iomap *iomap, struct iomap *srcmap) { struct fuse_inode *fi =3D get_fuse_inode(inode); @@ -835,21 +904,21 @@ famfs_iomap_begin(struct inode *inode, loff_t offset,= loff_t length, =20 WARN_ON(size !=3D meta->file_size); =20 - return famfs_meta_to_dax_offset(inode, iomap, offset, length, flags); + return famfs_fileofs_to_daxofs(inode, iomap, offset, length, flags); } =20 /* Note: We never need a special set of write_iomap_ops because famfs never * performs allocation on write. */ const struct iomap_ops famfs_iomap_ops =3D { - .iomap_begin =3D famfs_iomap_begin, + .iomap_begin =3D famfs_fuse_iomap_begin, }; =20 /********************************************************************* * vm_operations */ static vm_fault_t -__famfs_filemap_fault(struct vm_fault *vmf, unsigned int pe_size, +__famfs_fuse_filemap_fault(struct vm_fault *vmf, unsigned int pe_size, bool write_fault) { struct inode *inode =3D file_inode(vmf->vma->vm_file); @@ -886,25 +955,25 @@ famfs_is_write_fault(struct vm_fault *vmf) static vm_fault_t famfs_filemap_fault(struct vm_fault *vmf) { - return __famfs_filemap_fault(vmf, 0, famfs_is_write_fault(vmf)); + return __famfs_fuse_filemap_fault(vmf, 0, famfs_is_write_fault(vmf)); } =20 static vm_fault_t famfs_filemap_huge_fault(struct vm_fault *vmf, unsigned int pe_size) { - return __famfs_filemap_fault(vmf, pe_size, famfs_is_write_fault(vmf)); + return __famfs_fuse_filemap_fault(vmf, pe_size, famfs_is_write_fault(vmf)= ); } =20 static vm_fault_t famfs_filemap_page_mkwrite(struct vm_fault *vmf) { - return __famfs_filemap_fault(vmf, 0, true); + return __famfs_fuse_filemap_fault(vmf, 0, true); } =20 static vm_fault_t famfs_filemap_pfn_mkwrite(struct vm_fault *vmf) { - return __famfs_filemap_fault(vmf, 0, true); + return __famfs_fuse_filemap_fault(vmf, 0, true); } =20 static vm_fault_t @@ -926,16 +995,23 @@ const struct vm_operations_struct famfs_file_vm_ops = =3D { * file_operations */ =20 -/* Reject I/O to files that aren't in a valid state */ +/** + * famfs_file_bad() - Check for files that aren't in a valid state + * + * @inode - inode + * + * Returns: 0=3Dsuccess + * -errno=3Dfailure + */ static ssize_t -famfs_file_invalid(struct inode *inode) +famfs_file_bad(struct inode *inode) { struct fuse_inode *fi =3D get_fuse_inode(inode); struct famfs_file_meta *meta =3D fi->famfs_meta; size_t i_size =3D i_size_read(inode); =20 if (!meta) { - pr_debug("%s: un-initialized famfs file\n", __func__); + pr_err("%s: un-initialized famfs file\n", __func__); return -EIO; } if (meta->error) { @@ -956,7 +1032,7 @@ famfs_file_invalid(struct inode *inode) } =20 static ssize_t -famfs_rw_prep(struct kiocb *iocb, struct iov_iter *ubuf) +famfs_fuse_rw_prep(struct kiocb *iocb, struct iov_iter *ubuf) { struct inode *inode =3D iocb->ki_filp->f_mapping->host; size_t i_size =3D i_size_read(inode); @@ -964,7 +1040,7 @@ famfs_rw_prep(struct kiocb *iocb, struct iov_iter *ubu= f) size_t max_count; ssize_t rc; =20 - rc =3D famfs_file_invalid(inode); + rc =3D famfs_file_bad(inode); if (rc) return rc; =20 @@ -980,11 +1056,11 @@ famfs_rw_prep(struct kiocb *iocb, struct iov_iter *u= buf) } =20 ssize_t -famfs_dax_read_iter(struct kiocb *iocb, struct iov_iter *to) +famfs_fuse_read_iter(struct kiocb *iocb, struct iov_iter *to) { ssize_t rc; =20 - rc =3D famfs_rw_prep(iocb, to); + rc =3D famfs_fuse_rw_prep(iocb, to); if (rc) return rc; =20 @@ -997,20 +1073,12 @@ famfs_dax_read_iter(struct kiocb *iocb, struct iov_i= ter *to) return rc; } =20 -/** - * famfs_dax_write_iter() - * - * We need our own write-iter in order to prevent append - * - * @iocb: - * @from: iterator describing the user memory source for the write - */ ssize_t -famfs_dax_write_iter(struct kiocb *iocb, struct iov_iter *from) +famfs_fuse_write_iter(struct kiocb *iocb, struct iov_iter *from) { ssize_t rc; =20 - rc =3D famfs_rw_prep(iocb, from); + rc =3D famfs_fuse_rw_prep(iocb, from); if (rc) return rc; =20 @@ -1021,12 +1089,12 @@ famfs_dax_write_iter(struct kiocb *iocb, struct iov= _iter *from) } =20 int -famfs_file_mmap(struct file *file, struct vm_area_struct *vma) +famfs_fuse_mmap(struct file *file, struct vm_area_struct *vma) { struct inode *inode =3D file_inode(file); ssize_t rc; =20 - rc =3D famfs_file_invalid(inode); + rc =3D famfs_file_bad(inode); if (rc) return (int)rc; =20 diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 11201195924d..47b3d76acb38 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -1778,7 +1778,7 @@ static ssize_t fuse_file_read_iter(struct kiocb *iocb= , struct iov_iter *to) if (FUSE_IS_VIRTIO_DAX(fi)) return fuse_dax_read_iter(iocb, to); if (fuse_file_famfs(fi)) - return famfs_dax_read_iter(iocb, to); + return famfs_fuse_read_iter(iocb, to); =20 /* FOPEN_DIRECT_IO overrides FOPEN_PASSTHROUGH */ if (ff->open_flags & FOPEN_DIRECT_IO) @@ -1802,7 +1802,7 @@ static ssize_t fuse_file_write_iter(struct kiocb *ioc= b, struct iov_iter *from) if (FUSE_IS_VIRTIO_DAX(fi)) return fuse_dax_write_iter(iocb, from); if (fuse_file_famfs(fi)) - return famfs_dax_write_iter(iocb, from); + return famfs_fuse_write_iter(iocb, from); =20 /* FOPEN_DIRECT_IO overrides FOPEN_PASSTHROUGH */ if (ff->open_flags & FOPEN_DIRECT_IO) @@ -2648,7 +2648,7 @@ static int fuse_file_mmap(struct file *file, struct v= m_area_struct *vma) if (FUSE_IS_VIRTIO_DAX(fi)) return fuse_dax_mmap(file, vma); if (fuse_file_famfs(fi)) - return famfs_file_mmap(file, vma); + return famfs_fuse_mmap(file, vma); =20 /* * If inode is in passthrough io mode, because it has some file open diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index 4c4c4f0ff280..702c1849720c 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -1561,9 +1561,9 @@ extern void fuse_sysctl_unregister(void); int famfs_file_init_dax(struct fuse_mount *fm, struct inode *inode, void *fmap_buf, size_t fmap_size); -ssize_t famfs_dax_write_iter(struct kiocb *iocb, struct iov_iter *from); -ssize_t famfs_dax_read_iter(struct kiocb *iocb, struct iov_iter *to); -int famfs_file_mmap(struct file *file, struct vm_area_struct *vma); +ssize_t famfs_fuse_write_iter(struct kiocb *iocb, struct iov_iter *from); +ssize_t famfs_fuse_read_iter(struct kiocb *iocb, struct iov_iter *to); +int famfs_fuse_mmap(struct file *file, struct vm_area_struct *vma); void __famfs_meta_free(void *map); void famfs_teardown(struct fuse_conn *fc); #endif --=20 2.49.0