Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

[net-next-2.6.git] / fs / gfs2 / file.c

diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index a51079bd4af1b7f0f2bf5c57675a1b883f762e9e..aa996471ec5c961d7d94c62c10a20d29ac8e1bbb 100644 (file)
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -775,6 +775,7 @@ const struct file_operations gfs2_dir_fops = {
        .fsync          = gfs2_fsync,
        .lock           = gfs2_lock,
        .flock          = gfs2_flock,
+       .llseek         = default_llseek,
 };
 
 #endif /* CONFIG_GFS2_FS_LOCKING_DLM */
@@ -801,5 +802,6 @@ const struct file_operations gfs2_dir_fops_nolock = {
        .open           = gfs2_open,
        .release        = gfs2_close,
        .fsync          = gfs2_fsync,
+       .llseek         = default_llseek,
 };