diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-07-21 08:57:44 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-07-21 08:57:44 +0300 |
commit | f6a74a5e15df32f289837feeabf8c84829312b06 (patch) | |
tree | c8d16b12ef76c7a9e21693d1bad31f59f78436cd /fs/jfs/file.c | |
parent | 60cd37eb100c4880b28078a47f3062fac7572095 (diff) | |
parent | 9d634c410b07be7bf637ea03362d3ff132088fe3 (diff) | |
download | linux-f6a74a5e15df32f289837feeabf8c84829312b06.tar.xz |
Merge branch 'linus' into perf/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/jfs/file.c')
-rw-r--r-- | fs/jfs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jfs/file.c b/fs/jfs/file.c index e98d39d75cf4..b9dc23cd04f2 100644 --- a/fs/jfs/file.c +++ b/fs/jfs/file.c @@ -76,7 +76,7 @@ static int jfs_open(struct inode *inode, struct file *file) if (ji->active_ag == -1) { struct jfs_sb_info *jfs_sb = JFS_SBI(inode->i_sb); ji->active_ag = BLKTOAG(addressPXD(&ji->ixpxd), jfs_sb); - atomic_inc( &jfs_sb->bmap->db_active[ji->active_ag]); + atomic_inc(&jfs_sb->bmap->db_active[ji->active_ag]); } spin_unlock_irq(&ji->ag_lock); } |