ogawahirofumi / tux3 Goto Github PK

$ git rev-parse HEAD
103165788d5523414226320211d4518401af1fe9

$ make
make -C /lib/modules/`uname -r`/build/ M=`pwd` CONFIG_TUX3=m modules
make[1]: Entering directory `/usr/src/kernels/3.12.9-301.fc20.x86_64'
  CC [M]  /repos/tux3/user/kernel/buffer.o
In file included from /repos/tux3/user/kernel/buffer.c:261:0:
/repos/tux3/user/kernel/buffer_fork.c: In function ‘newpage_add_lru’:
/repos/tux3/user/kernel/buffer_fork.c:361:3: error: too many arguments to function ‘__lru_cache_add’
   __lru_cache_add(page, LRU_ACTIVE_FILE);
   ^
In file included from /repos/tux3/user/kernel/buffer_fork.c:6:0,
                 from /repos/tux3/user/kernel/buffer.c:261:
include/linux/swap.h:275:13: note: declared here
 extern void __lru_cache_add(struct page *);
             ^
In file included from /repos/tux3/user/kernel/buffer.c:261:0:
/repos/tux3/user/kernel/buffer_fork.c:363:3: error: too many arguments to function ‘__lru_cache_add’
   __lru_cache_add(page, LRU_INACTIVE_FILE);
   ^
In file included from /repos/tux3/user/kernel/buffer_fork.c:6:0,
                 from /repos/tux3/user/kernel/buffer.c:261:
include/linux/swap.h:275:13: note: declared here
 extern void __lru_cache_add(struct page *);
             ^
make[2]: *** [/repos/tux3/user/kernel/buffer.o] Error 1
make[1]: *** [_module_/repos/tux3/user/kernel] Error 2
make[1]: Leaving directory `/usr/src/kernels/3.12.9-301.fc20.x86_64'
make: *** [all] Error 2

diff --git a/user/kernel/buffer_fork.c b/user/kernel/buffer_fork.c
index 867471e..1c9a1c3 100644
--- a/user/kernel/buffer_fork.c
+++ b/user/kernel/buffer_fork.c
@@ -357,10 +357,7 @@ static void oldpage_try_remove_from_lru(struct page *page)
 /* Schedule to add LRU list */
 static void newpage_add_lru(struct page *page)
 {
-   if (TestClearPageActive(page))
-       __lru_cache_add(page, LRU_ACTIVE_FILE);
-   else
-       __lru_cache_add(page, LRU_INACTIVE_FILE);
+   __lru_cache_add(page);
 }

 enum ret_needfork {
diff --git a/user/kernel/dir.c b/user/kernel/dir.c
index 0c75c54..314e1bb 100644
--- a/user/kernel/dir.c
+++ b/user/kernel/dir.c
@@ -273,7 +273,8 @@ static unsigned char filetype[TUX_TYPES] = {
    [TUX_LNK] = DT_LNK,
 };

-int tux_readdir(struct file *file, void *state, filldir_t filldir)
+// int tux_readdir(struct file *file, void *state, filldir_t filldir)
+int tux_readdir(struct file *file, void *state, struct dir_context *ctx)
 {
    loff_t pos = file->f_pos;
    struct inode *dir = file_inode(file);
diff --git a/user/kernel/filemap.c b/user/kernel/filemap.c
index db60c79..a63bf49 100644
--- a/user/kernel/filemap.c
+++ b/user/kernel/filemap.c
@@ -973,7 +973,7 @@ static void tux3_write_failed(struct address_space *mapping, loff_t to)
         *
         * FIXME: right?
         */
-       truncate_pagecache(inode, to, inode->i_size);
+       truncate_pagecache(inode, inode->i_size);
    }
 }

diff --git a/user/kernel/filemap_blocklib.c b/user/kernel/filemap_blocklib.c
index c85cd56..3dc306d 100644
--- a/user/kernel/filemap_blocklib.c
+++ b/user/kernel/filemap_blocklib.c
@@ -360,8 +360,10 @@ void tux3_try_cancel_dirty_page(struct page *page)
  *
  * Caller must hold lock_page().
  */
-static void tux3_invalidatepage(struct page *page, unsigned long offset)
+static void tux3_invalidatepage(struct page *page, unsigned int offset,
+               unsigned int length)
 {
+
    struct buffer_head *head, *bh, *next;
    unsigned int curr_off = 0;
    int has_dirty = 0;
@@ -571,7 +573,7 @@ zero_fill_page:
    zero_user_segment(page, offset, PAGE_CACHE_SIZE);
    cleancache_invalidate_page(mapping, page);
    if (invalid_from && page_has_buffers(page))
-       mapping->a_ops->invalidatepage(page, invalid_from);
+       mapping->a_ops->invalidatepage(page, 0, invalid_from);

    err = 0;

diff --git a/user/kernel/inode.c b/user/kernel/inode.c
index 87cfaac..e3ff1d1 100644
--- a/user/kernel/inode.c
+++ b/user/kernel/inode.c
@@ -627,7 +627,7 @@ static int tux3_truncate(struct inode *inode, loff_t newsize)
     * truncate_pagecache() */
    tux3_truncate_inode_pages_range(inode->i_mapping, holebegin, LLONG_MAX);
 #endif
-   truncate_pagecache(inode, oldsize, holebegin);
+   truncate_pagecache(inode, holebegin);

    if (!is_expand) {
        err = tux3_add_truncate_hole(inode, newsize);
diff --git a/user/kernel/namei.c b/user/kernel/namei.c
index 4b77eab..7108263 100644
--- a/user/kernel/namei.c
+++ b/user/kernel/namei.c
@@ -347,7 +347,8 @@ error:
 const struct file_operations tux_dir_fops = {
    .llseek     = generic_file_llseek,
    .read       = generic_read_dir,
-   .readdir    = tux_readdir,
+   // .readdir = tux_readdir,
+   .iterate    = tux_readdir,
    .fsync      = tux3_sync_file,
 };

$ make
/usr/include/features.h:330:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp]
cc1: all warnings being treated as errors
make: *** [tests/balloc.o] Error 1

$ git diff
diff --git a/user/Makefile b/user/Makefile
index 64e15f2..3935601 100644
--- a/user/Makefile
+++ b/user/Makefile
@@ -12,7 +12,7 @@ ifeq ($(ARCH),i686)
 CFLAGS += -m32
 endif

-CFLAGS += -std=gnu99 -Wall -g -rdynamic -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+CFLAGS += -std=gnu99 -Wall -g -O1 -rdynamic -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
 CFLAGS += -I$(TOPDIR)
 # gcc warning options
 CFLAGS += -Wall -Wextra -Werror