← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to fs/ext3/inode.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
fs/ext3/inode.c
1894
1894
        .readpage               = ext3_readpage,
1895
1895
        .readpages              = ext3_readpages,
1896
1896
        .writepage              = ext3_ordered_writepage,
1897
 
        .sync_page              = block_sync_page,
1898
1897
        .write_begin            = ext3_write_begin,
1899
1898
        .write_end              = ext3_ordered_write_end,
1900
1899
        .bmap                   = ext3_bmap,
1910
1909
        .readpage               = ext3_readpage,
1911
1910
        .readpages              = ext3_readpages,
1912
1911
        .writepage              = ext3_writeback_writepage,
1913
 
        .sync_page              = block_sync_page,
1914
1912
        .write_begin            = ext3_write_begin,
1915
1913
        .write_end              = ext3_writeback_write_end,
1916
1914
        .bmap                   = ext3_bmap,
1926
1924
        .readpage               = ext3_readpage,
1927
1925
        .readpages              = ext3_readpages,
1928
1926
        .writepage              = ext3_journalled_writepage,
1929
 
        .sync_page              = block_sync_page,
1930
1927
        .write_begin            = ext3_write_begin,
1931
1928
        .write_end              = ext3_journalled_write_end,
1932
1929
        .set_page_dirty         = ext3_journalled_set_page_dirty,
2058
2055
 *
2059
2056
 *      When we do truncate() we may have to clean the ends of several
2060
2057
 *      indirect blocks but leave the blocks themselves alive. Block is
2061
 
 *      partially truncated if some data below the new i_size is refered
 
2058
 *      partially truncated if some data below the new i_size is referred
2062
2059
 *      from it (and it is on the path to the first completely truncated
2063
2060
 *      data block, indeed).  We have to free the top of that path along
2064
2061
 *      with everything to the right of the path. Since no allocation
2187
2184
 * @first:      array of block numbers
2188
2185
 * @last:       points immediately past the end of array
2189
2186
 *
2190
 
 * We are freeing all blocks refered from that array (numbers are stored as
 
2187
 * We are freeing all blocks referred from that array (numbers are stored as
2191
2188
 * little-endian 32-bit) and updating @inode->i_blocks appropriately.
2192
2189
 *
2193
2190
 * We accumulate contiguous runs of blocks to free.  Conveniently, if these
2275
2272
 *      @last:  pointer immediately past the end of array
2276
2273
 *      @depth: depth of the branches to free
2277
2274
 *
2278
 
 *      We are freeing all blocks refered from these branches (numbers are
 
2275
 *      We are freeing all blocks referred from these branches (numbers are
2279
2276
 *      stored as little-endian 32-bit) and updating @inode->i_blocks
2280
2277
 *      appropriately.
2281
2278
 */
3294
3291
        if (ext3_should_journal_data(inode))
3295
3292
                ret = 3 * (bpp + indirects) + 2;
3296
3293
        else
3297
 
                ret = 2 * (bpp + indirects) + 2;
 
3294
                ret = 2 * (bpp + indirects) + indirects + 2;
3298
3295
 
3299
3296
#ifdef CONFIG_QUOTA
3300
3297
        /* We know that structure was already allocated during dquot_initialize so
3395
3392
 * so would cause a commit on atime updates, which we don't bother doing.
3396
3393
 * We handle synchronous inodes at the highest possible level.
3397
3394
 */
3398
 
void ext3_dirty_inode(struct inode *inode)
 
3395
void ext3_dirty_inode(struct inode *inode, int flags)
3399
3396
{
3400
3397
        handle_t *current_handle = ext3_journal_current_handle();
3401
3398
        handle_t *handle;