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/ext3/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/ext3/inode.c')
| -rw-r--r-- | fs/ext3/inode.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c index ae94f6d949f5..fe2541d250e4 100644 --- a/fs/ext3/inode.c +++ b/fs/ext3/inode.c | |||
| @@ -1894,7 +1894,6 @@ static const struct address_space_operations ext3_ordered_aops = { | |||
| 1894 | .readpage = ext3_readpage, | 1894 | .readpage = ext3_readpage, |
| 1895 | .readpages = ext3_readpages, | 1895 | .readpages = ext3_readpages, |
| 1896 | .writepage = ext3_ordered_writepage, | 1896 | .writepage = ext3_ordered_writepage, |
| 1897 | .sync_page = block_sync_page, | ||
| 1898 | .write_begin = ext3_write_begin, | 1897 | .write_begin = ext3_write_begin, |
| 1899 | .write_end = ext3_ordered_write_end, | 1898 | .write_end = ext3_ordered_write_end, |
| 1900 | .bmap = ext3_bmap, | 1899 | .bmap = ext3_bmap, |
| @@ -1910,7 +1909,6 @@ static const struct address_space_operations ext3_writeback_aops = { | |||
| 1910 | .readpage = ext3_readpage, | 1909 | .readpage = ext3_readpage, |
| 1911 | .readpages = ext3_readpages, | 1910 | .readpages = ext3_readpages, |
| 1912 | .writepage = ext3_writeback_writepage, | 1911 | .writepage = ext3_writeback_writepage, |
| 1913 | .sync_page = block_sync_page, | ||
| 1914 | .write_begin = ext3_write_begin, | 1912 | .write_begin = ext3_write_begin, |
| 1915 | .write_end = ext3_writeback_write_end, | 1913 | .write_end = ext3_writeback_write_end, |
| 1916 | .bmap = ext3_bmap, | 1914 | .bmap = ext3_bmap, |
| @@ -1926,7 +1924,6 @@ static const struct address_space_operations ext3_journalled_aops = { | |||
| 1926 | .readpage = ext3_readpage, | 1924 | .readpage = ext3_readpage, |
| 1927 | .readpages = ext3_readpages, | 1925 | .readpages = ext3_readpages, |
| 1928 | .writepage = ext3_journalled_writepage, | 1926 | .writepage = ext3_journalled_writepage, |
| 1929 | .sync_page = block_sync_page, | ||
| 1930 | .write_begin = ext3_write_begin, | 1927 | .write_begin = ext3_write_begin, |
| 1931 | .write_end = ext3_journalled_write_end, | 1928 | .write_end = ext3_journalled_write_end, |
| 1932 | .set_page_dirty = ext3_journalled_set_page_dirty, | 1929 | .set_page_dirty = ext3_journalled_set_page_dirty, |