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 'master' of /home/trondmy/kernel/linux-2.6/
[pandora-kernel.git]
/
fs
/
dquot.c
diff --git
a/fs/dquot.c
b/fs/dquot.c
index
acf07e5
..
0122a27
100644
(file)
--- a/
fs/dquot.c
+++ b/
fs/dquot.c
@@
-250,7
+250,7
@@
static inline struct dquot *find_dquot(unsigned int hashent, struct super_block
/* Add a dquot to the tail of the free list */
static inline void put_dquot_last(struct dquot *dquot)
{
/* Add a dquot to the tail of the free list */
static inline void put_dquot_last(struct dquot *dquot)
{
- list_add
(&dquot->dq_free, free_dquots.prev
);
+ list_add
_tail(&dquot->dq_free, &free_dquots
);
dqstats.free_dquots++;
}
dqstats.free_dquots++;
}
@@
-266,7
+266,7
@@
static inline void put_inuse(struct dquot *dquot)
{
/* We add to the back of inuse list so we don't have to restart
* when traversing this list and we block */
{
/* We add to the back of inuse list so we don't have to restart
* when traversing this list and we block */
- list_add
(&dquot->dq_inuse, inuse_list.prev
);
+ list_add
_tail(&dquot->dq_inuse, &inuse_list
);
dqstats.allocated_dquots++;
}
dqstats.allocated_dquots++;
}
@@
-590,8
+590,7
@@
we_slept:
atomic_dec(&dquot->dq_count);
#ifdef __DQUOT_PARANOIA
/* sanity check */
atomic_dec(&dquot->dq_count);
#ifdef __DQUOT_PARANOIA
/* sanity check */
- if (!list_empty(&dquot->dq_free))
- BUG();
+ BUG_ON(!list_empty(&dquot->dq_free));
#endif
put_dquot_last(dquot);
spin_unlock(&dq_list_lock);
#endif
put_dquot_last(dquot);
spin_unlock(&dq_list_lock);
@@
-666,8
+665,7
@@
we_slept:
return NODQUOT;
}
#ifdef __DQUOT_PARANOIA
return NODQUOT;
}
#ifdef __DQUOT_PARANOIA
- if (!dquot->dq_sb) /* Has somebody invalidated entry under us? */
- BUG();
+ BUG_ON(!dquot->dq_sb); /* Has somebody invalidated entry under us? */
#endif
return dquot;
#endif
return dquot;
@@
-1821,7
+1819,8
@@
static int __init dquot_init(void)
dquot_cachep = kmem_cache_create("dquot",
sizeof(struct dquot), sizeof(unsigned long) * 4,
dquot_cachep = kmem_cache_create("dquot",
sizeof(struct dquot), sizeof(unsigned long) * 4,
- SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_PANIC,
+ (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|
+ SLAB_MEM_SPREAD|SLAB_PANIC),
NULL, NULL);
order = 0;
NULL, NULL);
order = 0;