diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-07-14 17:49:30 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-07-14 17:49:30 -0400 |
| commit | 3aca1c9029a9b05e9237dfdefc25f1975b824afe (patch) | |
| tree | 04415d9878a8978e02a427b6f6e438d6721cc8a6 | |
| parent | bbf80ce848caebdd3b2a342d929edb3775bd00a4 (diff) | |
| download | longterm-queue-2.6.34-3aca1c9029a9b05e9237dfdefc25f1975b824afe.tar.gz | |
nilfs: fix missing arg in backport.
In the 34 codebase, there was an extra arg to nilfs_set_file_dirty
that contained the SB. Without it, you get this:
CC fs/nilfs2/file.o
fs/nilfs2/file.c: In function 'nilfs_page_mkwrite':
fs/nilfs2/file.c:110: warning: passing argument 1 of 'nilfs_set_file_dirty' from incompatible pointer type
fs/nilfs2/nilfs.h:253: note: expected 'struct nilfs_sb_info *' but argument is of type 'struct inode *'
fs/nilfs2/file.c:110: warning: passing argument 2 of 'nilfs_set_file_dirty' makes pointer from integer without a cast
fs/nilfs2/nilfs.h:253: note: expected 'struct inode *' but argument is of type 'int'
fs/nilfs2/file.c:110: error: too few arguments to function 'nilfs_set_file_dirty'
make[2]: *** [fs/nilfs2/file.o] Error 1
make[1]: *** [fs/nilfs2/file.o] Error 2
make: *** [sub-make] Error 2
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/nilfs2-fix-data-loss-in-mmap-page-write-for-hole-blo.patch | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/queue/nilfs2-fix-data-loss-in-mmap-page-write-for-hole-blo.patch b/queue/nilfs2-fix-data-loss-in-mmap-page-write-for-hole-blo.patch index a66a914..da60620 100644 --- a/queue/nilfs2-fix-data-loss-in-mmap-page-write-for-hole-blo.patch +++ b/queue/nilfs2-fix-data-loss-in-mmap-page-write-for-hole-blo.patch @@ -1,4 +1,4 @@ -From 59365cf8d8c42f6426ddaef5e87a31e0d6718139 Mon Sep 17 00:00:00 2001 +From 8a0423fc21d016ac2e4c65cc192ff68cfcf62da6 Mon Sep 17 00:00:00 2001 From: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> Date: Sun, 27 Mar 2011 22:50:49 +0900 Subject: [PATCH] nilfs2: fix data loss in mmap page write for hole blocks @@ -25,12 +25,14 @@ problem in mmap write. [This should be applied to every kernel since 2.6.30 but a fix is needed for 2.6.37 and prior kernels] +[PG: add sb as 1st arg to nilfs_set_file_dirty() as per 34 codebase] + Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> Tested-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/nilfs2/file.c b/fs/nilfs2/file.c -index 30292df..e5cf985 100644 +index 30292df..584e0b0 100644 --- a/fs/nilfs2/file.c +++ b/fs/nilfs2/file.c @@ -72,10 +72,9 @@ static int nilfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) @@ -54,7 +56,7 @@ index 30292df..e5cf985 100644 goto mapped; } } -@@ -105,16 +103,17 @@ static int nilfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) +@@ -105,16 +103,18 @@ static int nilfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) return VM_FAULT_SIGBUS; ret = block_page_mkwrite(vma, vmf, nilfs_get_block); @@ -63,7 +65,8 @@ index 30292df..e5cf985 100644 nilfs_transaction_abort(inode->i_sb); return ret; } -+ nilfs_set_file_dirty(inode, 1 << (PAGE_SHIFT - inode->i_blkbits)); ++ nilfs_set_file_dirty(NILFS_SB(inode->i_sb), inode, ++ 1 << (PAGE_SHIFT - inode->i_blkbits)); nilfs_transaction_commit(inode->i_sb); mapped: |