Merge branches 'x86-fixes-for-linus' and 'x86-uv-for-linus' of git://git.kernel.org...

[mv-sheeva.git] / fs / fuse / cuse.c

diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
index e1f8171278bdeac8b5ba7f5b71abfe1d9984c307..3e87cce5837d6df9f0db0f476a9ca58c3a269231 100644 (file)
--- a/fs/fuse/cuse.c
+++ b/fs/fuse/cuse.c
@@ -182,6 +182,7 @@ static const struct file_operations cuse_frontend_fops = {
        .unlocked_ioctl         = cuse_file_ioctl,
        .compat_ioctl           = cuse_file_compat_ioctl,
        .poll                   = fuse_file_poll,
+       .llseek         = noop_llseek,
 };