diff options
| author | Brian Behlendorf <[email protected]> | 2009-02-18 12:51:31 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2009-02-18 12:51:31 -0800 |
| commit | d164b2093561a9771db07346e6fffc9ca19427a2 (patch) | |
| tree | b24adaf8695cebdd827968ac1df3cc0093936be1 /module/zfs/zfs_rlock.c | |
| parent | c65e71073f45e6e549c825969740cb15a96ea547 (diff) | |
Rebase master to b108
Diffstat (limited to 'module/zfs/zfs_rlock.c')
| -rw-r--r-- | module/zfs/zfs_rlock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/module/zfs/zfs_rlock.c b/module/zfs/zfs_rlock.c index f0a75b5fa..4de8d8a2d 100644 --- a/module/zfs/zfs_rlock.c +++ b/module/zfs/zfs_rlock.c @@ -19,12 +19,10 @@ * CDDL HEADER END */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * This file contains the code to implement file range locking in * ZFS, although there isn't much specific to ZFS (all that comes to mind @@ -431,6 +429,8 @@ zfs_range_lock(znode_t *zp, uint64_t off, uint64_t len, rl_type_t type) new = kmem_alloc(sizeof (rl_t), KM_SLEEP); new->r_zp = zp; new->r_off = off; + if (len + off < off) /* overflow */ + len = UINT64_MAX - off; new->r_len = len; new->r_cnt = 1; /* assume it's going to be in the tree */ new->r_type = type; |