projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
[platform/upstream/kernel-adaptation-pc.git]
/
fs
/
ceph
/
file.c
diff --git
a/fs/ceph/file.c
b/fs/ceph/file.c
index
d415096
..
e51558f
100644
(file)
--- a/
fs/ceph/file.c
+++ b/
fs/ceph/file.c
@@
-784,7
+784,7
@@
out:
/*
* llseek. be sure to verify file size on SEEK_END.
*/
/*
* llseek. be sure to verify file size on SEEK_END.
*/
-static loff_t ceph_llseek(struct file *file, loff_t offset, int
origin
)
+static loff_t ceph_llseek(struct file *file, loff_t offset, int
whence
)
{
struct inode *inode = file->f_mapping->host;
int ret;
{
struct inode *inode = file->f_mapping->host;
int ret;
@@
-792,7
+792,7
@@
static loff_t ceph_llseek(struct file *file, loff_t offset, int origin)
mutex_lock(&inode->i_mutex);
__ceph_do_pending_vmtruncate(inode);
mutex_lock(&inode->i_mutex);
__ceph_do_pending_vmtruncate(inode);
- if (
origin == SEEK_END || origin == SEEK_DATA || origin
== SEEK_HOLE) {
+ if (
whence == SEEK_END || whence == SEEK_DATA || whence
== SEEK_HOLE) {
ret = ceph_do_getattr(inode, CEPH_STAT_CAP_SIZE);
if (ret < 0) {
offset = ret;
ret = ceph_do_getattr(inode, CEPH_STAT_CAP_SIZE);
if (ret < 0) {
offset = ret;
@@
-800,7
+800,7
@@
static loff_t ceph_llseek(struct file *file, loff_t offset, int origin)
}
}
}
}
- switch (
origin
) {
+ switch (
whence
) {
case SEEK_END:
offset += inode->i_size;
break;
case SEEK_END:
offset += inode->i_size;
break;