← Back to branch summary

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

« back to all changes in this revision

Viewing changes to fs/aufs/dentry.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/dentry.c
19
19
/*
20
20
 * lookup and dentry operations
21
21
 *
22
 
 * $Id: dentry.c,v 1.74 2008/04/13 23:39:09 sfjro Exp $
 
22
 * $Id: dentry.c,v 1.75 2008/06/30 03:50:16 sfjro Exp $
23
23
 */
24
24
 
25
25
//#include <linux/fs.h>
429
429
        new_sz = sizeof(*dinfo->di_hdentry) * (au_sbend(sb) + 1);
430
430
        dinfo = au_di(dentry);
431
431
        p = au_kzrealloc(dinfo->di_hdentry, sizeof(*p) * (dinfo->di_bend + 1),
432
 
                         new_sz, GFP_KERNEL);
 
432
                         new_sz, GFP_NOFS);
433
433
        //p = NULL;
434
434
        if (unlikely(!p))
435
435
                goto out;
760
760
                struct au_dpage *dpage;
761
761
                struct dentry **dentries;
762
762
 
763
 
                err = au_dpages_init(&dpages, GFP_TEMPORARY);
 
763
                err = au_dpages_init(&dpages, GFP_NOFS);
764
764
                AuDebugOn(err);
765
765
                err = au_dcsub_pages_rev(&dpages, parent, /*do_include*/1, NULL,
766
766
                                         NULL);