git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
fs
/
jfs
/
file.c
diff --git
a/fs/jfs/file.c
b/fs/jfs/file.c
index
c5ce6c1
..
2f3f531
100644
(file)
--- a/
fs/jfs/file.c
+++ b/
fs/jfs/file.c
@@
-66,9
+66,9
@@
static int jfs_open(struct inode *inode, struct file *file)
struct jfs_inode_info *ji = JFS_IP(inode);
spin_lock_irq(&ji->ag_lock);
if (ji->active_ag == -1) {
struct jfs_inode_info *ji = JFS_IP(inode);
spin_lock_irq(&ji->ag_lock);
if (ji->active_ag == -1) {
-
ji->active_ag = ji->agno
;
- atomic_inc(
-
&JFS_SBI(inode->i_sb)->bmap->db_active[ji->agno
]);
+
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
]);
}
spin_unlock_irq(&ji->ag_lock);
}
}
spin_unlock_irq(&ji->ag_lock);
}