summaryrefslogtreecommitdiff
path: root/fs/buffer.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-09-19 08:40:45 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2002-09-19 08:40:45 -0700
commit2188a61733d33ca69bb49c92a2a31b93099028c4 (patch)
tree4c1cd1c823ce987c34750ccb8af5e3d4a83aa0f3 /fs/buffer.c
parent075ee9780bae0f5e1b59567dbdd463d1234d23f5 (diff)
parentc7ea169dbcf0fed457edead3cb615f0c5fe8995e (diff)
Merge home.transmeta.com:/home/torvalds/v2.5/akpm
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'fs/buffer.c')
-rw-r--r--fs/buffer.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/buffer.c b/fs/buffer.c
index 4fe7c935e4d6..cb06b5454e36 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -937,9 +937,11 @@ try_again:
head = NULL;
offset = PAGE_SIZE;
while ((offset -= size) >= 0) {
+ int pf_flags = current->flags;
+
current->flags |= PF_NOWARN;
bh = alloc_buffer_head();
- current->flags &= ~PF_NOWARN;
+ current->flags = pf_flags;
if (!bh)
goto no_grow;