diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-11 09:19:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-11 09:19:43 -0700 |
| commit | bf25db365428dbd182768baa9850bef7afaac80d (patch) | |
| tree | 4373037b00459643f0d661672eb6688f80800d72 /fs/exofs/inode.c | |
| parent | 682c30ed2165d5694a414d31eac7c63ac5700fb0 (diff) | |
| parent | 5002dd18c5940ce63b917d84f2b852c3b96009bb (diff) | |
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
* 'for-linus' of git://git.open-osd.org/linux-open-osd:
exofs: Fix groups code when num_devices is not divisible by group_width
exofs: Remove useless optimization
exofs: exofs_file_fsync and exofs_file_flush correctness
exofs: Remove superfluous dependency on buffer_head and writeback
Diffstat (limited to 'fs/exofs/inode.c')
| -rw-r--r-- | fs/exofs/inode.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/fs/exofs/inode.c b/fs/exofs/inode.c index 088cb476b68..eb7368ebd8c 100644 --- a/fs/exofs/inode.c +++ b/fs/exofs/inode.c @@ -32,9 +32,6 @@ */ #include <linux/slab.h> -#include <linux/writeback.h> -#include <linux/buffer_head.h> -#include <scsi/scsi_device.h> #include "exofs.h" @@ -773,15 +770,13 @@ static int exofs_releasepage(struct page *page, gfp_t gfp) { EXOFS_DBGMSG("page 0x%lx\n", page->index); WARN_ON(1); - return try_to_free_buffers(page); + return 0; } static void exofs_invalidatepage(struct page *page, unsigned long offset) { - EXOFS_DBGMSG("page_has_buffers=>%d\n", page_has_buffers(page)); + EXOFS_DBGMSG("page 0x%lx offset 0x%lx\n", page->index, offset); WARN_ON(1); - - block_invalidatepage(page, offset); } const struct address_space_operations exofs_aops = { |