diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-07-29 21:57:51 (GMT) |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-07-29 21:57:51 (GMT) |
commit | 3431e490b50356b56084305a2e93b3a980802b22 (patch) | |
tree | da5213c3c05df56711a097c95e8a1410a46df78d /fs/jfs/file.c | |
parent | 5af310a8ee70dd6a588c8ee1d4487a230a7b7b65 (diff) | |
parent | 1dcc3d3362b0c97e48290f7786be85b4cec2a147 (diff) | |
download | linux-3431e490b50356b56084305a2e93b3a980802b22.tar.xz |
Merge branch 'acpi-scan' into acpi-pm
Conflicts:
drivers/acpi/scan.c
The conflict is resolved by moving the just introduced
acpi_device_is_first_physical_node() to bus.c and using
the existing acpi_companion_match() from there.
There will be an additional commit to combine the two.
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 e98d39d..b9dc23c 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); } |