Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / fs / minix / dir.c

diff --git a/fs/minix/dir.c b/fs/minix/dir.c
index 97c3c3d..69224d1 100644 (file)
--- a/fs/minix/dir.c
+++ b/fs/minix/dir.c
@@ -14,7 +14,7 @@ typedef struct minix_dir_entry minix_dirent;
 
 static int minix_readdir(struct file *, void *, filldir_t);
 
-struct file_operations minix_dir_operations = {
+const struct file_operations minix_dir_operations = {
        .read           = generic_read_dir,
        .readdir        = minix_readdir,
        .fsync          = minix_sync_file,
@@ -246,7 +246,7 @@ got_it:
        memset (de->name + namelen, 0, sbi->s_dirsize - namelen - 2);
        de->inode = inode->i_ino;
        err = dir_commit_chunk(page, from, to);
-       dir->i_mtime = dir->i_ctime = CURRENT_TIME;
+       dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;
        mark_inode_dirty(dir);
 out_put:
        dir_put_page(page);
@@ -275,7 +275,7 @@ int minix_delete_entry(struct minix_dir_entry *de, struct page *page)
                unlock_page(page);
        }
        dir_put_page(page);
-       inode->i_ctime = inode->i_mtime = CURRENT_TIME;
+       inode->i_ctime = inode->i_mtime = CURRENT_TIME_SEC;
        mark_inode_dirty(inode);
        return err;
 }
@@ -378,7 +378,7 @@ void minix_set_link(struct minix_dir_entry *de, struct page *page,
                unlock_page(page);
        }
        dir_put_page(page);
-       dir->i_mtime = dir->i_ctime = CURRENT_TIME;
+       dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;
        mark_inode_dirty(dir);
 }