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 Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.13-vs2...
[linux-2.6.git]
/
fs
/
dquot.c
diff --git
a/fs/dquot.c
b/fs/dquot.c
index
e3a6db7
..
81d87a4
100644
(file)
--- a/
fs/dquot.c
+++ b/
fs/dquot.c
@@
-458,7
+458,6
@@
restart:
spin_unlock(&dq_list_lock);
}
spin_unlock(&dq_list_lock);
}
-
int vfs_quota_sync(struct super_block *sb, int type)
{
struct list_head *dirty;
int vfs_quota_sync(struct super_block *sb, int type)
{
struct list_head *dirty;
@@
-668,6
+667,7
@@
we_slept:
#ifdef __DQUOT_PARANOIA
BUG_ON(!dquot->dq_sb); /* Has somebody invalidated entry under us? */
#endif
#ifdef __DQUOT_PARANOIA
BUG_ON(!dquot->dq_sb); /* Has somebody invalidated entry under us? */
#endif
+
return dquot;
}
return dquot;
}