Merge branch 'linus' into x86/tracehook

[karo-tx-linux.git] / fs / adfs / dir.c

diff --git a/fs/adfs/dir.c b/fs/adfs/dir.c
index 2b8903893d3f76be76ec4aa564b506b79c00d503..85a30e929800aea513f28f3e7dfd6827bb39814f 100644 (file)
--- a/fs/adfs/dir.c
+++ b/fs/adfs/dir.c
@@ -197,6 +197,7 @@ out:
 
 const struct file_operations adfs_dir_operations = {
        .read           = generic_read_dir,
+       .llseek         = generic_file_llseek,
        .readdir        = adfs_readdir,
        .fsync          = file_fsync,
 };
@@ -295,7 +296,7 @@ adfs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
 /*
  * directories can handle most operations...
  */
-struct inode_operations adfs_dir_inode_operations = {
+const struct inode_operations adfs_dir_inode_operations = {
        .lookup         = adfs_lookup,
        .setattr        = adfs_notify_change,
 };