diff options
| author | Rohan Puri <[email protected]> | 2011-06-29 11:00:58 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2011-07-01 13:39:40 -0700 |
| commit | a89c3e0bd509267225b5699c65aaf39acf2fce18 (patch) | |
| tree | ff9588be2ce4bd352a220df504aa35c65a5c1459 /module/zfs/zfs_znode.c | |
| parent | 2cf7f52bc42f215d4ef27d0fd75fc1b1417cb841 (diff) | |
Support mandatory locks (nbmand)
The Linux kernel already has support for mandatory locking. This
change just replaces the Solaris mandatory locking calls with the
Linux equivilants. In fact, it looks like this code could be
removed entirely because this checking is already done generically
in the Linux VFS. However, for now we'll leave it in place even
if it is redundant just in case we missed something.
The original patch to update the code to support mandatory locking
was done by Rohan Puri. This patch is an updated version which is
compatible with the previous mount option handling changes.
Original-Patch-by: Rohan Puri <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #222
Closes #253
Diffstat (limited to 'module/zfs/zfs_znode.c')
| -rw-r--r-- | module/zfs/zfs_znode.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/module/zfs/zfs_znode.c b/module/zfs/zfs_znode.c index 076161a85..a51d5e6f3 100644 --- a/module/zfs/zfs_znode.c +++ b/module/zfs/zfs_znode.c @@ -1324,9 +1324,7 @@ top: int zfs_freesp(znode_t *zp, uint64_t off, uint64_t len, int flag, boolean_t log) { -#ifdef HAVE_MANDLOCKS struct inode *ip = ZTOI(zp); -#endif /* HAVE_MANDLOCKS */ dmu_tx_t *tx; zfs_sb_t *zsb = ZTOZSB(zp); zilog_t *zilog = zsb->z_log; @@ -1348,17 +1346,14 @@ zfs_freesp(znode_t *zp, uint64_t off, uint64_t len, int flag, boolean_t log) return (error); } -#ifdef HAVE_MANDLOCKS /* * Check for any locks in the region to be freed. */ - - if (MANDLOCK(ip, (mode_t)mode)) { + if (ip->i_flock && mandatory_lock(ip)) { uint64_t length = (len ? len : zp->z_size - off); - if (error = chklock(ip, FWRITE, off, length, flag, NULL)) - return (error); + if (!lock_may_write(ip, off, length)) + return (EAGAIN); } -#endif /* HAVE_MANDLOCKS */ if (len == 0) { error = zfs_trunc(zp, off); |