]> www.infradead.org Git - nvme.git/commitdiff
xfs: don't bother returning errors from xfs_file_release
authorChristoph Hellwig <hch@lst.de>
Tue, 13 Aug 2024 07:39:36 +0000 (09:39 +0200)
committerChandan Babu R <chandanbabu@kernel.org>
Tue, 3 Sep 2024 04:37:38 +0000 (10:07 +0530)
While ->release returns int, the only caller ignores the return value.
As we're only doing cleanup work there isn't much of a point in
return a value to start with, so just document the situation instead.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandanbabu@kernel.org>
fs/xfs/xfs_file.c

index 11732fe1c657c995c328e8331af0209ecd5a2834..17dfbaca1c581cddfdd876fc372e9ec80b494a05 100644 (file)
@@ -1175,6 +1175,10 @@ xfs_dir_open(
        return error;
 }
 
+/*
+ * Don't bother propagating errors.  We're just doing cleanup, and the caller
+ * ignores the return value anyway.
+ */
 STATIC int
 xfs_file_release(
        struct inode            *inode,
@@ -1182,7 +1186,6 @@ xfs_file_release(
 {
        struct xfs_inode        *ip = XFS_I(inode);
        struct xfs_mount        *mp = ip->i_mount;
-       int                     error;
 
        /* If this is a read-only mount, don't generate I/O */
        if (xfs_is_readonly(mp))
@@ -1200,11 +1203,8 @@ xfs_file_release(
        if (!xfs_is_shutdown(mp) &&
            xfs_iflags_test_and_clear(ip, XFS_ITRUNCATED)) {
                xfs_iflags_clear(ip, XFS_IDIRTY_RELEASE);
-               if (ip->i_delayed_blks > 0) {
-                       error = filemap_flush(inode->i_mapping);
-                       if (error)
-                               return error;
-               }
+               if (ip->i_delayed_blks > 0)
+                       filemap_flush(inode->i_mapping);
        }
 
        /*
@@ -1238,14 +1238,14 @@ xfs_file_release(
                         * dirty close we will still remove the speculative
                         * allocation, but after that we will leave it in place.
                         */
-                       error = xfs_free_eofblocks(ip);
-                       if (!error && ip->i_delayed_blks)
+                       xfs_free_eofblocks(ip);
+                       if (ip->i_delayed_blks)
                                xfs_iflags_set(ip, XFS_IDIRTY_RELEASE);
                }
                xfs_iunlock(ip, XFS_IOLOCK_EXCL);
        }
 
-       return error;
+       return 0;
 }
 
 STATIC int