Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Fix snapshot automount behavior when concurrent or fail 

When concurrent threads accessing the snapdir, one will succeed the user
helper mount while others will get EBUSY. However, the original code treats
those EBUSY threads as success and goes on to do zfsctl_snapshot_add, which
causes repeated avl_add and thus panic.

Also, if the snapshot is already mounted somewhere else, a thread accessing
the snapdir will also get EBUSY from user helper mount. And it will cause
strange things as doing follow_down_one will fail and then follow_up will jump
up to the mountpoint of the filesystem and confuse the hell out of VFS.

The patch fix both behavior by returning 0 immediately for the EBUSY threads.
Note, this will have a side effect for the second case where the VFS will
retry several times before returning ELOOP.

Signed-off-by: Chunwei Chen <david.chen@osnexus.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #4018
This commit is contained in:
Chunwei Chen 2015-11-16 16:39:52 -08:00 committed by Ned Bass
parent 279e27db23
commit c5e30a0ff9
1 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
module/zfs/zfs_ctldir.c
View File

@ -1059,6 +1059,7 @@ zfsctl_snapshot_mount(struct path *path, int flags)
char *argv[] = { "/bin/sh", "-c", NULL, NULL }; char *argv[] = { "/bin/sh", "-c", NULL, NULL };
char *envp[] = { NULL }; char *envp[] = { NULL };
int error; int error;
struct path spath;
if (ip == NULL) if (ip == NULL)
return (EISDIR); return (EISDIR);
@ -1103,10 +1104,22 @@ zfsctl_snapshot_mount(struct path *path, int flags)
argv[2] = kmem_asprintf(SET_MOUNT_CMD, full_name, full_path); argv[2] = kmem_asprintf(SET_MOUNT_CMD, full_name, full_path);
error = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_PROC); error = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_PROC);
strfree(argv[2]); strfree(argv[2]);
if (error && !(error & MOUNT_BUSY << 8)) { if (error) {
cmn_err(CE_WARN, "Unable to automount %s/%s: %d", if (!(error & MOUNT_BUSY << 8)) {
full_path, full_name, error); cmn_err(CE_WARN, "Unable to automount %s/%s: %d",
error = SET_ERROR(EISDIR); full_path, full_name, error);
error = SET_ERROR(EISDIR);
} else {
/*
* EBUSY, this could mean a concurrent mount, or the
* snapshot has already been mounted at completely
* different place. We return 0 so VFS will retry. For
* the latter case the VFS will retry several times
* and return ELOOP, which is probably not a very good
* behavior.
*/
error = 0;
}
goto error; goto error;
} }
@ -1114,20 +1127,22 @@ zfsctl_snapshot_mount(struct path *path, int flags)
* Follow down in to the mounted snapshot and set MNT_SHRINKABLE * Follow down in to the mounted snapshot and set MNT_SHRINKABLE
* to identify this as an automounted filesystem. * to identify this as an automounted filesystem.
*/ */
zpl_follow_down_one(path); spath = *path;
snap_zsb = ITOZSB(path->dentry->d_inode); path_get(&spath);
snap_zsb->z_parent = zsb; if (zpl_follow_down_one(&spath)) {
dentry = path->dentry; snap_zsb = ITOZSB(spath.dentry->d_inode);
path->mnt->mnt_flags |= MNT_SHRINKABLE; snap_zsb->z_parent = zsb;
zpl_follow_up(path); dentry = spath.dentry;
error = 0; spath.mnt->mnt_flags |= MNT_SHRINKABLE;
mutex_enter(&zfs_snapshot_lock); mutex_enter(&zfs_snapshot_lock);
se = zfsctl_snapshot_alloc(full_name, full_path, se = zfsctl_snapshot_alloc(full_name, full_path,
dmu_objset_id(snap_zsb->z_os), dentry); dmu_objset_id(snap_zsb->z_os), dentry);
zfsctl_snapshot_add(se); zfsctl_snapshot_add(se);
zfsctl_snapshot_unmount_delay_impl(se, zfs_expire_snapshot); zfsctl_snapshot_unmount_delay_impl(se, zfs_expire_snapshot);
mutex_exit(&zfs_snapshot_lock); mutex_exit(&zfs_snapshot_lock);
}
path_put(&spath);
error: error:
kmem_free(full_name, MAXNAMELEN); kmem_free(full_name, MAXNAMELEN);
kmem_free(full_path, MAXPATHLEN); kmem_free(full_path, MAXPATHLEN);