Merge 'staging-next' to Linus's tree

[net-next-2.6.git] / fs / dlm / debug_fs.c

diff --git a/fs/dlm/debug_fs.c b/fs/dlm/debug_fs.c
index c6cf251587467dc9af1c12c7391c6e529fa4249a..6b42ba807dfda1747f7cae9fa0ecf7a3c400b5f2 100644 (file)
--- a/fs/dlm/debug_fs.c
+++ b/fs/dlm/debug_fs.c
@@ -643,7 +643,8 @@ static ssize_t waiters_read(struct file *file, char __user *userbuf,
 static const struct file_operations waiters_fops = {
        .owner   = THIS_MODULE,
        .open    = waiters_open,
-       .read    = waiters_read
+       .read    = waiters_read,
+       .llseek  = default_llseek,
 };
 
 void dlm_delete_debug_file(struct dlm_ls *ls)