diff options
| author | Sage Weil <sage@inktank.com> | 2013-08-15 20:11:45 +0200 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-15 20:11:45 +0200 |
| commit | ee3e542fec6e69bc9fb668698889a37d93950ddf (patch) | |
| tree | e74ee766a4764769ef1d3d45d266b4dea64101d3 /fs/ceph/file.c | |
| parent | ceph: Remove bogus check in invalidatepage (diff) | |
| parent | Merge branch 'akpm' (patches from Andrew Morton) (diff) | |
| download | linux-ee3e542fec6e69bc9fb668698889a37d93950ddf.tar.xz linux-ee3e542fec6e69bc9fb668698889a37d93950ddf.zip | |
Merge remote-tracking branch 'linus/master' into testing
Diffstat (limited to 'fs/ceph/file.c')
| -rw-r--r-- | fs/ceph/file.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/fs/ceph/file.c b/fs/ceph/file.c index a17ffe4ec3ca..bc0735498d29 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -861,16 +861,7 @@ static loff_t ceph_llseek(struct file *file, loff_t offset, int whence) break; } - if (offset < 0 || offset > inode->i_sb->s_maxbytes) { - offset = -EINVAL; - goto out; - } - - /* Special lock needed here? */ - if (offset != file->f_pos) { - file->f_pos = offset; - file->f_version = 0; - } + offset = vfs_setpos(file, offset, inode->i_sb->s_maxbytes); out: mutex_unlock(&inode->i_mutex); |