diff options
| author |   Josef Bacik <josef@redhat.com> | 2011-07-18 13:21:38 -0400 |
|---|---|---|
| committer |   Al Viro <viro@zeniv.linux.org.uk> | 2011-07-20 20:47:58 -0400 |
| commit | 06222e491e663dac939f04b125c9dc52126a75c4 (patch) | |
| tree | 99636fd666c8148a5bf58ea4844263d4b3a36310 /fs/ceph/dir.c | |
| parent | Ext4: handle SEEK_HOLE/SEEK_DATA generically (diff) | |
| download | linux-dev-06222e491e663dac939f04b125c9dc52126a75c4.tar.xz linux-dev-06222e491e663dac939f04b125c9dc52126a75c4.zip | |
fs: handle SEEK_HOLE/SEEK_DATA properly in all fs's that define their own llseek
This converts everybody to handle SEEK_HOLE/SEEK_DATA properly. In some cases
we just return -EINVAL, in others we do the normal generic thing, and in others
we're simply making sure that the properly due-dilligence is done. For example
in NFS/CIFS we need to make sure the file size is update properly for the
SEEK_HOLE and SEEK_DATA case, but since it calls the generic llseek stuff itself
that is all we have to do. Thanks,
Signed-off-by: Josef Bacik <josef@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ceph/dir.c')
| -rw-r--r-- | fs/ceph/dir.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c index e8477dc51b45..0972b457a03f 100644 --- a/fs/ceph/dir.c +++ b/fs/ceph/dir.c @@ -446,14 +446,19 @@ static loff_t ceph_dir_llseek(struct file *file, loff_t offset, int origin) loff_t retval; mutex_lock(&inode->i_mutex); + retval = -EINVAL; switch (origin) { case SEEK_END: offset += inode->i_size + 2; /* FIXME */ break; case SEEK_CUR: offset += file->f_pos; + case SEEK_SET: + break; + default: + goto out; } - retval = -EINVAL; + if (offset >= 0 && offset <= inode->i_sb->s_maxbytes) { if (offset != file->f_pos) { file->f_pos = offset; @@ -477,6 +482,7 @@ static loff_t ceph_dir_llseek(struct file *file, loff_t offset, int origin) if (offset > old_offset) fi->dir_release_count--; } +out: mutex_unlock(&inode->i_mutex); return retval; } |