Merge branch 'topic/hda-ca0132-dsp' into for-next

[linux.git] / fs / ceph / dir.c

diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
index e5b77319c97b7fe1a537bfd292e859467389167a..8c1aabe93b6779e2c2a39333c73f26222c7f4c28 100644 (file)
--- a/fs/ceph/dir.c
+++ b/fs/ceph/dir.c
@@ -454,7 +454,7 @@ static void reset_readdir(struct ceph_file_info *fi)
        fi->flags &= ~CEPH_F_ATEND;
 }
 
-static loff_t ceph_dir_llseek(struct file *file, loff_t offset, int origin)
+static loff_t ceph_dir_llseek(struct file *file, loff_t offset, int whence)
 {
        struct ceph_file_info *fi = file->private_data;
        struct inode *inode = file->f_mapping->host;
@@ -463,7 +463,7 @@ static loff_t ceph_dir_llseek(struct file *file, loff_t offset, int origin)
 
        mutex_lock(&inode->i_mutex);
        retval = -EINVAL;
-       switch (origin) {
+       switch (whence) {
        case SEEK_END:
                offset += inode->i_size + 2;   /* FIXME */
                break;