diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /fs/hfsplus/inode.c | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
Diffstat (limited to 'fs/hfsplus/inode.c')
| -rw-r--r-- | fs/hfsplus/inode.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c index a8df651747f0..b248a6cfcad9 100644 --- a/fs/hfsplus/inode.c +++ b/fs/hfsplus/inode.c | |||
| @@ -146,7 +146,6 @@ static int hfsplus_writepages(struct address_space *mapping, | |||
| 146 | const struct address_space_operations hfsplus_btree_aops = { | 146 | const struct address_space_operations hfsplus_btree_aops = { |
| 147 | .readpage = hfsplus_readpage, | 147 | .readpage = hfsplus_readpage, |
| 148 | .writepage = hfsplus_writepage, | 148 | .writepage = hfsplus_writepage, |
| 149 | .sync_page = block_sync_page, | ||
| 150 | .write_begin = hfsplus_write_begin, | 149 | .write_begin = hfsplus_write_begin, |
| 151 | .write_end = generic_write_end, | 150 | .write_end = generic_write_end, |
| 152 | .bmap = hfsplus_bmap, | 151 | .bmap = hfsplus_bmap, |
| @@ -156,7 +155,6 @@ const struct address_space_operations hfsplus_btree_aops = { | |||
| 156 | const struct address_space_operations hfsplus_aops = { | 155 | const struct address_space_operations hfsplus_aops = { |
| 157 | .readpage = hfsplus_readpage, | 156 | .readpage = hfsplus_readpage, |
| 158 | .writepage = hfsplus_writepage, | 157 | .writepage = hfsplus_writepage, |
| 159 | .sync_page = block_sync_page, | ||
| 160 | .write_begin = hfsplus_write_begin, | 158 | .write_begin = hfsplus_write_begin, |
| 161 | .write_end = generic_write_end, | 159 | .write_end = generic_write_end, |
| 162 | .bmap = hfsplus_bmap, | 160 | .bmap = hfsplus_bmap, |