[GFS2] Add generation number

[safe/jmp/linux-2.6] / fs / gfs2 / ops_file.c

diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c
index ecef76e..26f1d32 100644 (file)
--- a/fs/gfs2/ops_file.c
+++ b/fs/gfs2/ops_file.c
@@ -333,7 +333,7 @@ static int filldir_reg_func(void *opaque, const char *name, unsigned int length,
        int error;
 
        error = fdr->fdr_filldir(fdr->fdr_opaque, name, length, offset,
-                                inum->no_formal_ino, type);
+                                inum->no_addr, type);
        if (error)
                return 1;
 
@@ -950,7 +950,7 @@ static int gfs2_flock(struct file *file, int cmd, struct file_lock *fl)
                return do_flock(file, cmd, fl);
 }
 
-struct file_operations gfs2_file_fops = {
+const struct file_operations gfs2_file_fops = {
        .llseek = gfs2_llseek,
        .read = gfs2_read,
        .readv = gfs2_file_readv,
@@ -970,7 +970,7 @@ struct file_operations gfs2_file_fops = {
        .splice_write = generic_file_splice_write,
 };
 
-struct file_operations gfs2_dir_fops = {
+const struct file_operations gfs2_dir_fops = {
        .readdir = gfs2_readdir,
        .unlocked_ioctl = gfs2_ioctl,
        .open = gfs2_open,