c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-02-04 22:34:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Skip ro check for snaps when multi-mount

Browse Source 
Skip ro check for snapshots since they are always ro regardless if ro
flag is passed by mount or not. This allows multi-mounting snapshots
without requiring to specify ro flag.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Chunwei Chen <david.chen@nutanix.com>
Closes #16299
This commit is contained in:
Chunwei Chen 2024-08-19 09:42:17 -07:00 committed by GitHub
parent 77a797a382
commit 06a7b123ac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
module/os/linux/zfs/zpl_super.c
View File

@ -292,6 +292,7 @@ zpl_mount_impl(struct file_system_type *fs_type, int flags, zfs_mnt_t *zm)
{ {
struct super_block *s; struct super_block *s;
objset_t *os; objset_t *os;
boolean_t issnap = B_FALSE;
int err; int err;
err = dmu_objset_hold(zm->mnt_osname, FTAG, &os); err = dmu_objset_hold(zm->mnt_osname, FTAG, &os);
@ -323,6 +324,7 @@ zpl_mount_impl(struct file_system_type *fs_type, int flags, zfs_mnt_t *zm)
if (zpl_enter(zfsvfs, FTAG) == 0) { if (zpl_enter(zfsvfs, FTAG) == 0) {
if (os != zfsvfs->z_os) if (os != zfsvfs->z_os)
err = -SET_ERROR(EBUSY); err = -SET_ERROR(EBUSY);
issnap = zfsvfs->z_issnap;
zpl_exit(zfsvfs, FTAG); zpl_exit(zfsvfs, FTAG);
} else { } else {
err = -SET_ERROR(EBUSY); err = -SET_ERROR(EBUSY);
@ -346,7 +348,11 @@ zpl_mount_impl(struct file_system_type *fs_type, int flags, zfs_mnt_t *zm)
return (ERR_PTR(err)); return (ERR_PTR(err));
} }
s->s_flags |= SB_ACTIVE; s->s_flags |= SB_ACTIVE;
} else if ((flags ^ s->s_flags) & SB_RDONLY) { } else if (!issnap && ((flags ^ s->s_flags) & SB_RDONLY)) {
/*
* Skip ro check for snap since snap is always ro regardless
* ro flag is passed by mount or not.
*/
deactivate_locked_super(s); deactivate_locked_super(s);
return (ERR_PTR(-EBUSY)); return (ERR_PTR(-EBUSY));
} }