diff options
| author | Li Dongyang <[email protected]> | 2013-06-13 13:51:09 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2013-07-02 09:24:43 -0700 |
| commit | 802e7b5feb0135483de119eac1da192404eb5bb7 (patch) | |
| tree | 79e9810d340a3fdc66aa5c557bad3cddb7b72efc /include | |
| parent | cf91b2b6b2baaca1e56f23c985e3261cd98bd3f0 (diff) | |
Add SEEK_DATA/SEEK_HOLE to lseek()/llseek()
The approach taken was the rework zfs_holey() as little as
possible and then just wrap the code as needed to ensure
correct locking and error handling.
Tested with xfstests 285 and 286. All tests pass except for
7-9 of 285 which try to reserve blocks first via fallocate(2)
and fail because fallocate(2) is not yet supported.
Note that the filp->f_lock spinlock did not exist prior to
Linux 2.6.30, but we avoid the need for autotools check by
virtue of the fact that SEEK_DATA/SEEK_HOLE support was not
added until Linux 3.1.
An autoconf check was added for lseek_execute() which is
currently a private function but the expectation is that it
will be exported perhaps as early as Linux 3.11.
Reviewed-by: Richard Laager <[email protected]>
Signed-off-by: Richard Yao <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #1384
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/vfs_compat.h | 22 | ||||
| -rw-r--r-- | include/sys/zfs_vnops.h | 1 |
2 files changed, 23 insertions, 0 deletions
diff --git a/include/linux/vfs_compat.h b/include/linux/vfs_compat.h index bccf0d01f..17fa3ff7b 100644 --- a/include/linux/vfs_compat.h +++ b/include/linux/vfs_compat.h @@ -152,4 +152,26 @@ typedef int zpl_umode_t; #define ZFS_IOC_GETFLAGS FS_IOC_GETFLAGS #define ZFS_IOC_SETFLAGS FS_IOC_SETFLAGS +#if defined(SEEK_HOLE) && defined(SEEK_DATA) && !defined(HAVE_LSEEK_EXECUTE) +static inline loff_t +lseek_execute(struct file *filp, struct inode *inode, + loff_t offset, loff_t maxsize) +{ + if (offset < 0 && !(filp->f_mode & FMODE_UNSIGNED_OFFSET)) + return (-EINVAL); + + if (offset > maxsize) + return (-EINVAL); + + if (offset != filp->f_pos) { + spin_lock(&filp->f_lock); + filp->f_pos = offset; + filp->f_version = 0; + spin_unlock(&filp->f_lock); + } + + return (offset); +} +#endif /* SEEK_HOLE && SEEK_DATA && !HAVE_LSEEK_EXECUTE */ + #endif /* _ZFS_VFS_H */ diff --git a/include/sys/zfs_vnops.h b/include/sys/zfs_vnops.h index 5da5eaf1d..75f7c128b 100644 --- a/include/sys/zfs_vnops.h +++ b/include/sys/zfs_vnops.h @@ -38,6 +38,7 @@ extern "C" { extern int zfs_open(struct inode *ip, int mode, int flag, cred_t *cr); extern int zfs_close(struct inode *ip, int flag, cred_t *cr); +extern int zfs_holey(struct inode *ip, int cmd, loff_t *off); extern int zfs_read(struct inode *ip, uio_t *uio, int ioflag, cred_t *cr); extern int zfs_write(struct inode *ip, uio_t *uio, int ioflag, cred_t *cr); extern int zfs_access(struct inode *ip, int mode, int flag, cred_t *cr); |