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

« back to all changes in this revision

Viewing changes to fs/aufs/dir.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
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:
19
19
/*
20
20
 * directory operations
21
21
 *
22
 
 * $Id: dir.c,v 1.58 2008/04/13 23:39:56 sfjro Exp $
 
22
 * $Id: dir.c,v 1.60 2008/06/30 03:50:16 sfjro Exp $
23
23
 */
24
24
 
25
25
#include "aufs.h"
115
115
                return 0; /* success */
116
116
 
117
117
        /* close all */
118
 
        for (bindex = au_fbstart(file); !err && bindex <= btail; bindex++)
 
118
        for (bindex = au_fbstart(file); bindex <= btail; bindex++)
119
119
                au_set_h_fptr(file, bindex, NULL);
120
120
        au_set_fbstart(file, -1);
121
121
        au_set_fbend(file, -1);
493
493
        inode = dentry->d_inode;
494
494
        AuDebugOn(!inode || !S_ISDIR(inode->i_mode));
495
495
 
496
 
        whlist = nhash_new(GFP_TEMPORARY);
 
496
        whlist = nhash_new(GFP_NOFS);
497
497
        err = PTR_ERR(whlist);
498
498
        if (IS_ERR(whlist))
499
499
                goto out;