diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-02-17 10:00:42 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-02-17 10:00:42 +1100 |
| commit | ec144a81ade915b5b38adedf10e84690813ed768 (patch) | |
| tree | c94b53c971ab2c39e27433267318b3c7bc86ff1b /fs/reiserfs/inode.c | |
| parent | b919ee827e048826786fd7e889a2b04f63382fe6 (diff) | |
| parent | 88626272549b94310975932a9970d11a9b362a16 (diff) | |
| download | kernel_samsung_tuna-ec144a81ade915b5b38adedf10e84690813ed768.zip kernel_samsung_tuna-ec144a81ade915b5b38adedf10e84690813ed768.tar.gz kernel_samsung_tuna-ec144a81ade915b5b38adedf10e84690813ed768.tar.bz2 | |
Merge commit 'origin/master' into next
Diffstat (limited to 'fs/reiserfs/inode.c')
| -rw-r--r-- | fs/reiserfs/inode.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c index 9087b10..2df0f5c 100644 --- a/fs/reiserfs/inode.c +++ b/fs/reiserfs/inode.c @@ -1497,9 +1497,11 @@ struct inode *reiserfs_iget(struct super_block *s, const struct cpu_key *key) args.objectid = key->on_disk_key.k_objectid; args.dirid = key->on_disk_key.k_dir_id; + reiserfs_write_unlock(s); inode = iget5_locked(s, key->on_disk_key.k_objectid, reiserfs_find_actor, reiserfs_init_locked_inode, (void *)(&args)); + reiserfs_write_lock(s); if (!inode) return ERR_PTR(-ENOMEM); |