Skip to content

Commit

Permalink
4638 Panic in ZFS via rfs3_setattr()/rfs3_write(): dirtying snapshot!
Browse files Browse the repository at this point in the history
Reviewed by: Alek Pinchuk <[email protected]>
Reviewed by: Ilya Usvyatsky <[email protected]>
Reviewed by: Dan McDonald <[email protected]>
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: Garrett D'Amore <[email protected]>
Approved by: Garrett D'Amore <[email protected]>
  • Loading branch information
mtelka authored and gdamore committed Mar 4, 2014
1 parent ef1d073 commit 2144b12
Showing 1 changed file with 21 additions and 1 deletion.
22 changes: 21 additions & 1 deletion usr/src/uts/common/fs/zfs/zfs_vnops.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013 by Delphix. All rights reserved.
* Copyright 2013 Nexenta Systems, Inc. All rights reserved.
* Copyright 2014 Nexenta Systems, Inc. All rights reserved.
*/

/* Portions Copyright 2007 Jeremy Teo */
Expand Down Expand Up @@ -643,6 +643,16 @@ zfs_write(vnode_t *vp, uio_t *uio, int ioflag, cred_t *cr, caller_context_t *ct)
SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_FLAGS(zfsvfs), NULL,
&zp->z_pflags, 8);

/*
* In a case vp->v_vfsp != zp->z_zfsvfs->z_vfs (e.g. snapshots) our
* callers might not be able to detect properly that we are read-only,
* so check it explicitly here.
*/
if (zfsvfs->z_vfs->vfs_flag & VFS_RDONLY) {
ZFS_EXIT(zfsvfs);
return (SET_ERROR(EROFS));
}

/*
* If immutable or not appending then return EPERM
*/
Expand Down Expand Up @@ -4750,6 +4760,16 @@ zfs_space(vnode_t *vp, int cmd, flock64_t *bfp, int flag,
return (SET_ERROR(EINVAL));
}

/*
* In a case vp->v_vfsp != zp->z_zfsvfs->z_vfs (e.g. snapshots) our
* callers might not be able to detect properly that we are read-only,
* so check it explicitly here.
*/
if (zfsvfs->z_vfs->vfs_flag & VFS_RDONLY) {
ZFS_EXIT(zfsvfs);
return (SET_ERROR(EROFS));
}

if (error = convoff(vp, bfp, 0, offset)) {
ZFS_EXIT(zfsvfs);
return (error);
Expand Down

0 comments on commit 2144b12

Please sign in to comment.