Update core ZFS code from build 121 to build 141.

[zfs.git] / module / zfs / zfs_rlock.c

diff --git a/module/zfs/zfs_rlock.c b/module/zfs/zfs_rlock.c
index 4de8d8a..7fd8f60 100644 (file)
--- a/module/zfs/zfs_rlock.c
+++ b/module/zfs/zfs_rlock.c
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -112,7 +112,7 @@ zfs_range_lock_writer(znode_t *zp, rl_t *new)
                 * Range locking is also used by zvol and uses a
                 * dummied up znode. However, for zvol, we don't need to
                 * append or grow blocksize, and besides we don't have
-                * a z_phys or z_zfsvfs - so skip that processing.
+                * a "sa" data or z_zfsvfs - so skip that processing.
                 *
                 * Yes, this is ugly, and would be solved by not handling
                 * grow or append in range lock code. If that was done then
@@ -125,14 +125,14 @@ zfs_range_lock_writer(znode_t *zp, rl_t *new)
                         * This is done under z_range_lock to avoid races.
                         */
                        if (new->r_type == RL_APPEND)
-                               new->r_off = zp->z_phys->zp_size;
+                               new->r_off = zp->z_size;
 
                        /*
                         * If we need to grow the block size then grab the whole
                         * file range. This is also done under z_range_lock to
                         * avoid races.
                         */
-                       end_size = MAX(zp->z_phys->zp_size, new->r_off + len);
+                       end_size = MAX(zp->z_size, new->r_off + len);
                        if (end_size > zp->z_blksz && (!ISP2(zp->z_blksz) ||
                            zp->z_blksz < zp->z_zfsvfs->z_max_blksz)) {
                                new->r_off = 0;