← Back to branch summary

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

« back to all changes in this revision

Viewing changes to fs/aufs/i_op_del.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/i_op_del.c
19
19
/*
20
20
 * inode operations (del entry)
21
21
 *
22
 
 * $Id: i_op_del.c,v 1.62 2008/04/13 23:42:32 sfjro Exp $
 
22
 * $Id: i_op_del.c,v 1.63 2008/06/30 03:50:20 sfjro Exp $
23
23
 */
24
24
 
25
25
#include "aufs.h"
479
479
                return -ENOENT; /* possible? */
480
480
        IMustLock(inode);
481
481
 
482
 
        whlist = nhash_new(GFP_TEMPORARY);
 
482
        whlist = nhash_new(GFP_NOFS);
483
483
        err = PTR_ERR(whlist);
484
484
        if (IS_ERR(whlist))
485
485
                goto out;
486
486
 
487
487
        err = -ENOMEM;
488
 
        args = kmalloc(sizeof(*args), GFP_TEMPORARY);
 
488
        args = kmalloc(sizeof(*args), GFP_NOFS);
489
489
        //args = NULL;
490
490
        if (unlikely(!args))
491
491
                goto out_whlist;