git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
fs
/
udf
/
ialloc.c
diff --git
a/fs/udf/ialloc.c
b/fs/udf/ialloc.c
index
a7e5d40
..
3873c67
100644
(file)
--- a/
fs/udf/ialloc.c
+++ b/
fs/udf/ialloc.c
@@
-4,11
+4,6
@@
* PURPOSE
* Inode allocation handling routines for the OSTA-UDF(tm) filesystem.
*
* PURPOSE
* Inode allocation handling routines for the OSTA-UDF(tm) filesystem.
*
- * CONTACTS
- * E-mail regarding any portion of the Linux UDF file system should be
- * directed to the development team mailing list (run by majordomo):
- * linux_udf@hpesjro.fc.hp.com
- *
* COPYRIGHT
* This file is distributed under the terms of the GNU General Public
* License (GPL). Copies of the GPL can be obtained from:
* COPYRIGHT
* This file is distributed under the terms of the GNU General Public
* License (GPL). Copies of the GPL can be obtained from:
@@
-47,7
+42,7
@@
void udf_free_inode(struct inode * inode)
clear_inode(inode);
clear_inode(inode);
-
down(&sbi->s_alloc_sem
);
+
mutex_lock(&sbi->s_alloc_mutex
);
if (sbi->s_lvidbh) {
if (S_ISDIR(inode->i_mode))
UDF_SB_LVIDIU(sb)->numDirs =
if (sbi->s_lvidbh) {
if (S_ISDIR(inode->i_mode))
UDF_SB_LVIDIU(sb)->numDirs =
@@
-58,7
+53,7
@@
void udf_free_inode(struct inode * inode)
mark_buffer_dirty(sbi->s_lvidbh);
}
mark_buffer_dirty(sbi->s_lvidbh);
}
-
up(&sbi->s_alloc_sem
);
+
mutex_unlock(&sbi->s_alloc_mutex
);
udf_free_blocks(sb, NULL, UDF_I_LOCATION(inode), 0, 1);
}
udf_free_blocks(sb, NULL, UDF_I_LOCATION(inode), 0, 1);
}
@@
-88,7
+83,7
@@
struct inode * udf_new_inode (struct inode *dir, int mode, int * err)
return NULL;
}
return NULL;
}
-
down(&sbi->s_alloc_sem
);
+
mutex_lock(&sbi->s_alloc_mutex
);
UDF_I_UNIQUE(inode) = 0;
UDF_I_LENEXTENTS(inode) = 0;
UDF_I_NEXT_ALLOC_BLOCK(inode) = 0;
UDF_I_UNIQUE(inode) = 0;
UDF_I_LENEXTENTS(inode) = 0;
UDF_I_NEXT_ALLOC_BLOCK(inode) = 0;
@@
-153,7
+148,7
@@
struct inode * udf_new_inode (struct inode *dir, int mode, int * err)
UDF_I_CRTIME(inode) = current_fs_time(inode->i_sb);
insert_inode_hash(inode);
mark_inode_dirty(inode);
UDF_I_CRTIME(inode) = current_fs_time(inode->i_sb);
insert_inode_hash(inode);
mark_inode_dirty(inode);
-
up(&sbi->s_alloc_sem
);
+
mutex_unlock(&sbi->s_alloc_mutex
);
if (DQUOT_ALLOC_INODE(inode))
{
if (DQUOT_ALLOC_INODE(inode))
{