← Back to branch summary

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

« back to all changes in this revision

Viewing changes to fs/aufs25/sbinfo.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/aufs25/sbinfo.c
19
19
/*
20
20
 * superblock private data
21
21
 *
22
 
 * $Id: sbinfo.c,v 1.8 2008/06/02 02:39:58 sfjro Exp $
 
22
 * $Id: sbinfo.c,v 1.10 2008/07/14 00:13:49 sfjro Exp $
23
23
 */
24
24
 
25
25
#include <linux/smp_lock.h>
57
57
        AuTraceEnter();
58
58
 
59
59
        err = -ENOMEM;
60
 
        sbinfo = kmalloc(sizeof(*sbinfo), GFP_KERNEL);
 
60
        sbinfo = kmalloc(sizeof(*sbinfo), GFP_NOFS);
61
61
        if (unlikely(!sbinfo))
62
62
                goto out;
63
 
        sbinfo->si_branch = kzalloc(sizeof(*sbinfo->si_branch), GFP_KERNEL);
 
63
        sbinfo->si_branch = kzalloc(sizeof(*sbinfo->si_branch), GFP_NOFS);
64
64
        if (unlikely(!sbinfo->si_branch))
65
65
                goto out_sbinfo;
66
66
 
87
87
        sbinfo->si_xib = NULL;
88
88
        mutex_init(&sbinfo->si_xib_mtx);
89
89
        sbinfo->si_xib_buf = NULL;
 
90
        sbinfo->si_xino_def_br = NULL;
90
91
        /* leave si_xib_last_pindex and si_xib_next_bit */
91
92
 
92
93
        au_nwt_init(&sbinfo->si_nowait);