leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'linus/master' into testing

Browse Source
This commit is contained in:
Sage Weil
2013-08-15 11:11:45 -07:00
parent fe2a801b50 f1d6e17f54
commit ee3e542fec
9549 changed files with 750300 additions and 304071 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fs/ceph/file.c
View File

@@ -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);