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
vserver 1.9.5.x5
[linux-2.6.git]
/
fs
/
xfs
/
linux-2.6
/
kmem.h
diff --git
a/fs/xfs/linux-2.6/kmem.h
b/fs/xfs/linux-2.6/kmem.h
index
ffe383e
..
466b2d5
100644
(file)
--- a/
fs/xfs/linux-2.6/kmem.h
+++ b/
fs/xfs/linux-2.6/kmem.h
@@
-83,7
+83,7
@@
typedef unsigned long xfs_pflags_t;
static __inline unsigned int kmem_flags_convert(int flags)
{
static __inline unsigned int kmem_flags_convert(int flags)
{
- int
lflags;
+ int
lflags = __GFP_NOWARN; /* we'll report problems, if need be */
#ifdef DEBUG
if (unlikely(flags & ~(KM_SLEEP|KM_NOSLEEP|KM_NOFS|KM_MAYFAIL))) {
#ifdef DEBUG
if (unlikely(flags & ~(KM_SLEEP|KM_NOSLEEP|KM_NOFS|KM_MAYFAIL))) {
@@
-94,9
+94,9
@@
static __inline unsigned int kmem_flags_convert(int flags)
#endif
if (flags & KM_NOSLEEP) {
#endif
if (flags & KM_NOSLEEP) {
- lflags = GFP_ATOMIC;
+ lflags
|
= GFP_ATOMIC;
} else {
} else {
- lflags = GFP_KERNEL;
+ lflags
|
= GFP_KERNEL;
/* avoid recusive callbacks to filesystem during transactions */
if (PFLAGS_TEST_FSTRANS() || (flags & KM_NOFS))
/* avoid recusive callbacks to filesystem during transactions */
if (PFLAGS_TEST_FSTRANS() || (flags & KM_NOFS))