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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
fs
/
ntfs
/
quota.c
diff --git
a/fs/ntfs/quota.c
b/fs/ntfs/quota.c
index
833df2a
..
d80e331
100644
(file)
--- a/
fs/ntfs/quota.c
+++ b/
fs/ntfs/quota.c
@@
-31,10
+31,10
@@
* ntfs_mark_quotas_out_of_date - mark the quotas out of date on an ntfs volume
* @vol: ntfs volume on which to mark the quotas out of date
*
* ntfs_mark_quotas_out_of_date - mark the quotas out of date on an ntfs volume
* @vol: ntfs volume on which to mark the quotas out of date
*
- * Mark the quotas out of date on the ntfs volume @vol and return
TRUE
on
- * success and
FALSE
on error.
+ * Mark the quotas out of date on the ntfs volume @vol and return
'true'
on
+ * success and
'false'
on error.
*/
*/
-
BOOL
ntfs_mark_quotas_out_of_date(ntfs_volume *vol)
+
bool
ntfs_mark_quotas_out_of_date(ntfs_volume *vol)
{
ntfs_index_context *ictx;
QUOTA_CONTROL_ENTRY *qce;
{
ntfs_index_context *ictx;
QUOTA_CONTROL_ENTRY *qce;
@@
-46,9
+46,9
@@
BOOL ntfs_mark_quotas_out_of_date(ntfs_volume *vol)
goto done;
if (!vol->quota_ino || !vol->quota_q_ino) {
ntfs_error(vol->sb, "Quota inodes are not open.");
goto done;
if (!vol->quota_ino || !vol->quota_q_ino) {
ntfs_error(vol->sb, "Quota inodes are not open.");
- return
FALSE
;
+ return
false
;
}
}
-
down(&vol->quota_q_ino->i_sem
);
+
mutex_lock(&vol->quota_q_ino->i_mutex
);
ictx = ntfs_index_ctx_get(NTFS_I(vol->quota_q_ino));
if (!ictx) {
ntfs_error(vol->sb, "Failed to get index context.");
ictx = ntfs_index_ctx_get(NTFS_I(vol->quota_q_ino));
if (!ictx) {
ntfs_error(vol->sb, "Failed to get index context.");
@@
-98,7
+98,7
@@
BOOL ntfs_mark_quotas_out_of_date(ntfs_volume *vol)
ntfs_index_entry_mark_dirty(ictx);
set_done:
ntfs_index_ctx_put(ictx);
ntfs_index_entry_mark_dirty(ictx);
set_done:
ntfs_index_ctx_put(ictx);
-
up(&vol->quota_q_ino->i_sem
);
+
mutex_unlock(&vol->quota_q_ino->i_mutex
);
/*
* We set the flag so we do not try to mark the quotas out of date
* again on remount.
/*
* We set the flag so we do not try to mark the quotas out of date
* again on remount.
@@
-106,12
+106,12
@@
set_done:
NVolSetQuotaOutOfDate(vol);
done:
ntfs_debug("Done.");
NVolSetQuotaOutOfDate(vol);
done:
ntfs_debug("Done.");
- return
TRUE
;
+ return
true
;
err_out:
if (ictx)
ntfs_index_ctx_put(ictx);
err_out:
if (ictx)
ntfs_index_ctx_put(ictx);
-
up(&vol->quota_q_ino->i_sem
);
- return
FALSE
;
+
mutex_unlock(&vol->quota_q_ino->i_mutex
);
+ return
false
;
}
#endif /* NTFS_RW */
}
#endif /* NTFS_RW */