diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2008-04-22 07:34:25 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2008-04-22 07:34:25 -0400 |
| commit | f838bad1b3be8ca0c785ee0e0c570dfda74cf377 (patch) | |
| tree | 5a842a8056a708cfad55a20fa8ab733dd94b0903 /fs/ext4/xattr.c | |
| parent | dd919660aacdf4adfcd279556aa03e595f7f0fc2 (diff) | |
| parent | 807501475fce0ebe68baedf87f202c3e4ee0d12c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/ext4/xattr.c')
| -rw-r--r-- | fs/ext4/xattr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c index d7962139c010..e9054c1c7d93 100644 --- a/fs/ext4/xattr.c +++ b/fs/ext4/xattr.c | |||
| @@ -1386,7 +1386,7 @@ ext4_xattr_cache_insert(struct buffer_head *bh) | |||
| 1386 | struct mb_cache_entry *ce; | 1386 | struct mb_cache_entry *ce; |
| 1387 | int error; | 1387 | int error; |
| 1388 | 1388 | ||
| 1389 | ce = mb_cache_entry_alloc(ext4_xattr_cache); | 1389 | ce = mb_cache_entry_alloc(ext4_xattr_cache, GFP_NOFS); |
| 1390 | if (!ce) { | 1390 | if (!ce) { |
| 1391 | ea_bdebug(bh, "out of memory"); | 1391 | ea_bdebug(bh, "out of memory"); |
| 1392 | return; | 1392 | return; |