← Back to branch summary

~ubuntu-branches/ubuntu/vivid/aufs/vivid

« back to all changes in this revision

Viewing changes to fs/aufs/xino.c

  • Committer: Bazaar Package Importer
  • Author(s): Julian Andres Klode
  • Date: 2008-08-21 14:58:54 UTC
  • mfrom: (1.1.8 upstream) (4.1.1 lenny)
  • Revision ID: james.westby@ubuntu.com-20080821145854-4b49x09r4zmvlk5o
Tags: 0+20080719-4
http://bugs.debian.org/495921
01_vserver_apparmor.dpatch: [UPDATE] Disable vserver patches on kernel 
2.6.26, because they are not needed anymore. (Closes: #495921)

Show diffs side-by-side

added added

removed removed

Lines of Context:
fs/aufs/xino.c
19
19
/*
20
20
 * external inode number translation table and bitmap
21
21
 *
22
 
 * $Id: xino.c,v 1.54 2008/06/02 02:41:39 sfjro Exp $
 
22
 * $Id: xino.c,v 1.55 2008/06/30 03:50:20 sfjro Exp $
23
23
 */
24
24
 
25
25
#include <linux/fsnotify.h>
189
189
                goto out;
190
190
 
191
191
        /* lock and kfree() will be called in trunc_xino() */
192
 
        args = kmalloc(sizeof(*args), GFP_TEMPORARY);
 
192
        args = kmalloc(sizeof(*args), GFP_NOFS);
193
193
        if (args) {
194
194
                sbinfo = au_sbi(sb);
195
195
                args->mnt = mntget(sbinfo->si_mnt);
770
770
        AuTraceEnter();
771
771
 
772
772
        err = -ENOMEM;
773
 
        page = (void *)__get_free_page(GFP_TEMPORARY);
 
773
        page = (void *)__get_free_page(GFP_NOFS);
774
774
        if (unlikely(!page))
775
775
                goto out;
776
776
 
935
935
 
936
936
        err = -ENOMEM;
937
937
        if (!sbinfo->si_xib_buf)
938
 
                sbinfo->si_xib_buf = (void *)get_zeroed_page(GFP_KERNEL);
 
938
                sbinfo->si_xib_buf = (void *)get_zeroed_page(GFP_NOFS);
939
939
        if (unlikely(!sbinfo->si_xib_buf))
940
940
                goto out_unset;
941
941