Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

[~andy/linux] / fs / bad_inode.c

diff --git a/fs/bad_inode.c b/fs/bad_inode.c
index e172180a1d8c3f0173adae9101175c1454111ce3..34e6d7b220c322b9399c32a701fe4910c256946f 100644 (file)
--- a/fs/bad_inode.c
+++ b/fs/bad_inode.c
@@ -22,7 +22,7 @@ static int return_EIO(void)
 
 #define EIO_ERROR ((void *) (return_EIO))
 
-static struct file_operations bad_file_ops =
+static const struct file_operations bad_file_ops =
 {
        .llseek         = EIO_ERROR,
        .aio_read       = EIO_ERROR,
@@ -40,8 +40,6 @@ static struct file_operations bad_file_ops =
        .aio_fsync      = EIO_ERROR,
        .fasync         = EIO_ERROR,
        .lock           = EIO_ERROR,
-       .readv          = EIO_ERROR,
-       .writev         = EIO_ERROR,
        .sendfile       = EIO_ERROR,
        .sendpage       = EIO_ERROR,
        .get_unmapped_area = EIO_ERROR,