diff options
| author | Darrick J. Wong <djwong@kernel.org> | 2021-03-22 09:51:51 -0700 |
|---|---|---|
| committer | Darrick J. Wong <djwong@kernel.org> | 2021-03-25 16:59:55 -0700 |
| commit | de48956f07a3dc992b33fd2794d64142f93e4b9a (patch) | |
| tree | f90cd43b383e404fd7f18546e9950f4255cf22c5 /fs/xfs/xfs_ioctl.c | |
| parent | 09ad1f2843dad8283cea79f4f50e22e1007302e9 (diff) | |
xfs: fix scrub and remount-ro protection when running scrubrandom-fixes-5.13_2021-03-25
While running a new fstest that races a readonly remount with scrub
running in repair mode, I observed the kernel tripping over debugging
assertions in the log quiesce code that were checking that the CIL was
empty. When the sysadmin runs scrub in repair mode, the scrub code
allocates real transactions (with reservations) to change things, but
doesn't increment the superblock writers count to block a readonly
remount attempt while it is running.
We don't require the userspace caller to have a writable file descriptor
to run repairs, so we have to call mnt_want_write_file to obtain freeze
protection and increment the writers count. It's ok to remove the call
to sb_start_write for the dry-run case because commit 8321ddb2fa29
removed the behavior where scrub and fsfreeze fight over the buffer LRU.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Diffstat (limited to 'fs/xfs/xfs_ioctl.c')
| -rw-r--r-- | fs/xfs/xfs_ioctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index 99dfe89a8d08..562b57b7a4a3 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -1846,7 +1846,7 @@ out_free: STATIC int xfs_ioc_scrub_metadata( - struct xfs_inode *ip, + struct file *filp, void __user *arg) { struct xfs_scrub_metadata scrub; @@ -1858,7 +1858,7 @@ xfs_ioc_scrub_metadata( if (copy_from_user(&scrub, arg, sizeof(scrub))) return -EFAULT; - error = xfs_scrub_metadata(ip, &scrub); + error = xfs_scrub_metadata(filp, &scrub); if (error) return error; @@ -2157,7 +2157,7 @@ xfs_file_ioctl( return xfs_ioc_getfsmap(ip, arg); case XFS_IOC_SCRUB_METADATA: - return xfs_ioc_scrub_metadata(ip, arg); + return xfs_ioc_scrub_metadata(filp, arg); case XFS_IOC_FD_TO_HANDLE: case XFS_IOC_PATH_TO_HANDLE: |