← Back to branch summary

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

« back to all changes in this revision

Viewing changes to fs/aufs/opts.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/opts.c
19
19
/*
20
20
 * mount options/flags
21
21
 *
22
 
 * $Id: opts.c,v 1.63 2008/06/02 02:34:58 sfjro Exp $
 
22
 * $Id: opts.c,v 1.64 2008/06/30 03:50:20 sfjro Exp $
23
23
 */
24
24
 
25
25
#include <linux/types.h> /* a distribution requires */
293
293
        char *buf;
294
294
        int ret;
295
295
 
296
 
        buf = kmalloc(s->to - s->from + 1, GFP_KERNEL);
 
296
        buf = kmalloc(s->to - s->from + 1, GFP_NOFS);
297
297
        if (!buf)
298
298
                return -ENOMEM;
299
299
        memcpy(buf, s->from, s->to - s->from);