Merge tag 'efi-for-3.8' into x86/efi

[pandora-kernel.git] / fs / fuse / file.c

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 78d2837..f3ab824 100644 (file)
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1599,19 +1599,19 @@ static sector_t fuse_bmap(struct address_space *mapping, sector_t block)
        return err ? 0 : outarg.block;
 }
 
-static loff_t fuse_file_llseek(struct file *file, loff_t offset, int origin)
+static loff_t fuse_file_llseek(struct file *file, loff_t offset, int whence)
 {
        loff_t retval;
        struct inode *inode = file->f_path.dentry->d_inode;
 
        /* No i_mutex protection necessary for SEEK_CUR and SEEK_SET */
-       if (origin == SEEK_CUR || origin == SEEK_SET)
-               return generic_file_llseek(file, offset, origin);
+       if (whence == SEEK_CUR || whence == SEEK_SET)
+               return generic_file_llseek(file, offset, whence);
 
        mutex_lock(&inode->i_mutex);
        retval = fuse_update_attributes(inode, NULL, file, NULL);
        if (!retval)
-               retval = generic_file_llseek(file, offset, origin);
+               retval = generic_file_llseek(file, offset, whence);
        mutex_unlock(&inode->i_mutex);
 
        return retval;
@@ -2177,8 +2177,8 @@ fuse_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov,
        return ret;
 }
 
-long fuse_file_fallocate(struct file *file, int mode, loff_t offset,
-                           loff_t length)
+static long fuse_file_fallocate(struct file *file, int mode, loff_t offset,
+                               loff_t length)
 {
        struct fuse_file *ff = file->private_data;
        struct fuse_conn *fc = ff->fc;
@@ -2213,7 +2213,6 @@ long fuse_file_fallocate(struct file *file, int mode, loff_t offset,
 
        return err;
 }
-EXPORT_SYMBOL_GPL(fuse_file_fallocate);
 
 static const struct file_operations fuse_file_operations = {
        .llseek         = fuse_file_llseek,