Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Remove checks for mandatory locks 

The Linux VFS handles mandatory locks generically so we shouldn't
need to check for conflicting locks in zfs_read(), zfs_write(), or
zfs_freesp().  Linux 3.18 removed the lock_may_read() and
lock_may_write() interfaces which we were relying on for this
purpose.  Rather than emulating those interfaces we remove the
redundant checks.

Signed-off-by: Ned Bass <bass6@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #2804
This commit is contained in:
Ned Bass 2014-10-16 13:52:56 -07:00 committed by Brian Behlendorf
parent 88904bb3e3
commit bc151f7b31
2 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
module/zfs/zfs_vnops.c
View File

@ -473,15 +473,6 @@ zfs_read(struct inode *ip, uio_t *uio, int ioflag, cred_t *cr)
return (0); return (0);
} }
/*
* Check for mandatory locks
*/
if (mandatory_lock(ip) &&
!lock_may_read(ip, uio->uio_loffset, uio->uio_resid)) {
ZFS_EXIT(zsb);
return (SET_ERROR(EAGAIN));
}
/* /*
* If we're in FRSYNC mode, sync out this znode before reading it. * If we're in FRSYNC mode, sync out this znode before reading it.
*/ */
@ -650,15 +641,6 @@ zfs_write(struct inode *ip, uio_t *uio, int ioflag, cred_t *cr)
return (SET_ERROR(EINVAL)); return (SET_ERROR(EINVAL));
} }
/*
* Check for mandatory locks before calling zfs_range_lock()
* in order to prevent a deadlock with locks set via fcntl().
*/
if (mandatory_lock(ip) && !lock_may_write(ip, woff, n)) {
ZFS_EXIT(zsb);
return (SET_ERROR(EAGAIN));
}
/* /*
* Pre-fault the pages to ensure slow (eg NFS) pages * Pre-fault the pages to ensure slow (eg NFS) pages
* don't hold up txg. * don't hold up txg.

10
module/zfs/zfs_znode.c
View File

@ -1546,7 +1546,6 @@ zfs_trunc(znode_t *zp, uint64_t end)
int int
zfs_freesp(znode_t *zp, uint64_t off, uint64_t len, int flag, boolean_t log) zfs_freesp(znode_t *zp, uint64_t off, uint64_t len, int flag, boolean_t log)
{ {
struct inode *ip = ZTOI(zp);
dmu_tx_t *tx; dmu_tx_t *tx;
zfs_sb_t *zsb = ZTOZSB(zp); zfs_sb_t *zsb = ZTOZSB(zp);
zilog_t *zilog = zsb->z_log; zilog_t *zilog = zsb->z_log;
@ -1567,15 +1566,6 @@ zfs_freesp(znode_t *zp, uint64_t off, uint64_t len, int flag, boolean_t log)
goto out; goto out;
} }
/*
* Check for any locks in the region to be freed.
*/
if (ip->i_flock && mandatory_lock(ip)) {
uint64_t length = (len ? len : zp->z_size - off);
if (!lock_may_write(ip, off, length))
return (SET_ERROR(EAGAIN));
}
if (len == 0) { if (len == 0) {
error = zfs_trunc(zp, off); error = zfs_trunc(zp, off);
} else { } else {