Author: smh
Date: Wed Jan 21 09:39:20 2015
New Revision: 277482
URL: https://svnweb.freebsd.org/changeset/base/277482
Log:
MFC r272509 (by delphi):
Diff reduction with upstream
Sponsored by: Multiplay
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c Wed Jan
21 09:01:48 2015 (r277481)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c Wed Jan
21 09:39:20 2015 (r277482)
@@ -1997,8 +1997,8 @@ zvol_ioctl(dev_t dev, int cmd, intptr_t
*/
if (df.df_start >= zv->zv_volsize)
break; /* No need to do anything... */
- if (df.df_start + df.df_length > zv->zv_volsize)
- df.df_length = DMU_OBJECT_END;
+
+ mutex_exit(&spa_namespace_lock);
rl = zfs_range_lock(&zv->zv_znode, df.df_start, df.df_length,
RL_WRITER);
@@ -2037,7 +2037,7 @@ zvol_ioctl(dev_t dev, int cmd, intptr_t
dmu_objset_pool(zv->zv_objset), 0);
}
}
- break;
+ return (error);
}
default:
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
