← Back to branch summary

~ubuntu-branches/ubuntu/trusty/linux-linaro-omap/trusty

« back to all changes in this revision

Viewing changes to fs/nilfs2/btnode.c

  • Committer: Package Import Robot
  • Author(s): John Rigby, John Rigby
  • Date: 2011-09-26 10:44:23 UTC
  • Revision ID: package-import@ubuntu.com-20110926104423-57i0gl3v99b3lkfg
Tags: 3.0.0-1007.9
https://launchpad.net/bugs/826021
[ John Rigby ]

Enable crypto modules and remove crypto-modules from
exclude-module files
LP: #826021

Show diffs side-by-side

added added

removed removed

Lines of Context:
fs/nilfs2/btnode.c
34
34
#include "page.h"
35
35
#include "btnode.h"
36
36
 
37
 
void nilfs_btnode_cache_init(struct address_space *btnc,
38
 
                             struct backing_dev_info *bdi)
39
 
{
40
 
        nilfs_mapping_init(btnc, bdi);
41
 
}
42
 
 
43
37
void nilfs_btnode_cache_clear(struct address_space *btnc)
44
38
{
45
39
        invalidate_mapping_pages(btnc, 0, -1);
62
56
                BUG();
63
57
        }
64
58
        memset(bh->b_data, 0, 1 << inode->i_blkbits);
65
 
        bh->b_bdev = NILFS_I_NILFS(inode)->ns_bdev;
 
59
        bh->b_bdev = inode->i_sb->s_bdev;
66
60
        bh->b_blocknr = blocknr;
67
61
        set_buffer_mapped(bh);
68
62
        set_buffer_uptodate(bh);
94
88
        if (pblocknr == 0) {
95
89
                pblocknr = blocknr;
96
90
                if (inode->i_ino != NILFS_DAT_INO) {
97
 
                        struct inode *dat = NILFS_I_NILFS(inode)->ns_dat;
 
91
                        struct the_nilfs *nilfs = inode->i_sb->s_fs_info;
98
92
 
99
93
                        /* blocknr is a virtual block number */
100
 
                        err = nilfs_dat_translate(dat, blocknr, &pblocknr);
 
94
                        err = nilfs_dat_translate(nilfs->ns_dat, blocknr,
 
95
                                                  &pblocknr);
101
96
                        if (unlikely(err)) {
102
97
                                brelse(bh);
103
98
                                goto out_locked;
120
115
                goto found;
121
116
        }
122
117
        set_buffer_mapped(bh);
123
 
        bh->b_bdev = NILFS_I_NILFS(inode)->ns_bdev;
 
118
        bh->b_bdev = inode->i_sb->s_bdev;
124
119
        bh->b_blocknr = pblocknr; /* set block address for read */
125
120
        bh->b_end_io = end_buffer_read_sync;
126
121
        get_bh(bh);
259
254
                                       "invalid oldkey %lld (newkey=%lld)",
260
255
                                       (unsigned long long)oldkey,
261
256
                                       (unsigned long long)newkey);
262
 
                nilfs_btnode_mark_dirty(obh);
 
257
                mark_buffer_dirty(obh);
263
258
 
264
259
                spin_lock_irq(&btnc->tree_lock);
265
260
                radix_tree_delete(&btnc->page_tree, oldkey);
271
266
                unlock_page(opage);
272
267
        } else {
273
268
                nilfs_copy_buffer(nbh, obh);
274
 
                nilfs_btnode_mark_dirty(nbh);
 
269
                mark_buffer_dirty(nbh);
275
270
 
276
271
                nbh->b_blocknr = newkey;
277
272
                ctxt->bh = nbh;