Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

[linux-2.6-block.git] / fs / libfs.c

diff --git a/fs/libfs.c b/fs/libfs.c
index 7cc37ca19cd81e4f844058ad11e5bba947ba86a1..35fc6e74cd886954aab26d223c603573dfe26786 100644 (file)
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -81,11 +81,11 @@ int dcache_dir_close(struct inode *inode, struct file *file)
        return 0;
 }
 
-loff_t dcache_dir_lseek(struct file *file, loff_t offset, int origin)
+loff_t dcache_dir_lseek(struct file *file, loff_t offset, int whence)
 {
        struct dentry *dentry = file->f_path.dentry;
        mutex_lock(&dentry->d_inode->i_mutex);
-       switch (origin) {
+       switch (whence) {
                case 1:
                        offset += file->f_pos;
                case 0: