From 7dee043af5d9fce99611bca5863bf6ca28b741ba Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 16 Sep 2022 14:22:52 -0700 Subject: [PATCH] zfs_enter rework followup The zpl_fadvise() function was recently added and was not included in the initial patch. Update it accordingly. Signed-off-by: Brian Behlendorf Closes #13831 --- module/os/linux/zfs/zpl_file.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/os/linux/zfs/zpl_file.c b/module/os/linux/zfs/zpl_file.c index f6bdfd08b8..25fc6b2232 100644 --- a/module/os/linux/zfs/zpl_file.c +++ b/module/os/linux/zfs/zpl_file.c @@ -930,8 +930,8 @@ zpl_fadvise(struct file *filp, loff_t offset, loff_t len, int advice) if (offset < 0 || len < 0) return (-EINVAL); - ZFS_ENTER(zfsvfs); - ZFS_VERIFY_ZP(zp); + if ((error = zpl_enter_verify_zp(zfsvfs, zp, FTAG)) != 0) + return (error); switch (advice) { case POSIX_FADV_SEQUENTIAL: @@ -963,7 +963,7 @@ zpl_fadvise(struct file *filp, loff_t offset, loff_t len, int advice) break; } - ZFS_EXIT(zfsvfs); + zfs_exit(zfsvfs, FTAG); return (error); }