diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
| commit | b32e3dc7860d00124fa432dba09667e647cb9bcc (patch) | |
| tree | 2fa6e56f389431dfb84609d3d7572cad76e88e71 /fs/ext2/inode.c | |
| parent | 6604271c5bc658a6067ed0c3deba4d89e0e50382 (diff) | |
| parent | 96120d86fe302c006259baee9061eea9e1b9e486 (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'fs/ext2/inode.c')
| -rw-r--r-- | fs/ext2/inode.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c index 40ad210a5049..c47f706878b5 100644 --- a/fs/ext2/inode.c +++ b/fs/ext2/inode.c | |||
| @@ -860,7 +860,6 @@ const struct address_space_operations ext2_aops = { | |||
| 860 | .readpage = ext2_readpage, | 860 | .readpage = ext2_readpage, |
| 861 | .readpages = ext2_readpages, | 861 | .readpages = ext2_readpages, |
| 862 | .writepage = ext2_writepage, | 862 | .writepage = ext2_writepage, |
| 863 | .sync_page = block_sync_page, | ||
| 864 | .write_begin = ext2_write_begin, | 863 | .write_begin = ext2_write_begin, |
| 865 | .write_end = ext2_write_end, | 864 | .write_end = ext2_write_end, |
| 866 | .bmap = ext2_bmap, | 865 | .bmap = ext2_bmap, |
| @@ -880,7 +879,6 @@ const struct address_space_operations ext2_nobh_aops = { | |||
| 880 | .readpage = ext2_readpage, | 879 | .readpage = ext2_readpage, |
| 881 | .readpages = ext2_readpages, | 880 | .readpages = ext2_readpages, |
| 882 | .writepage = ext2_nobh_writepage, | 881 | .writepage = ext2_nobh_writepage, |
| 883 | .sync_page = block_sync_page, | ||
| 884 | .write_begin = ext2_nobh_write_begin, | 882 | .write_begin = ext2_nobh_write_begin, |
| 885 | .write_end = nobh_write_end, | 883 | .write_end = nobh_write_end, |
| 886 | .bmap = ext2_bmap, | 884 | .bmap = ext2_bmap, |