← Back to branch summary

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

« back to all changes in this revision

Viewing changes to fs/aufs25/dentry.h

  • 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/dentry.h
19
19
/*
20
20
 * lookup and dentry operations
21
21
 *
22
 
 * $Id: dentry.h,v 1.5 2008/05/26 04:04:23 sfjro Exp $
 
22
 * $Id: dentry.h,v 1.6 2008/06/30 03:52:42 sfjro Exp $
23
23
 */
24
24
 
25
25
#ifndef __AUFS_DENTRY_H__
260
260
        AuLsc_DI_CHILD3,        /* copyup dirs */
261
261
        AuLsc_DI_PARENT,
262
262
        AuLsc_DI_PARENT2,
263
 
        AuLsc_DI_PARENT3
 
263
        AuLsc_DI_PARENT3,
 
264
        AuLsc_DI_PARENT4
264
265
};
265
266
 
266
267
/*
270
271
 * di_read_lock_parent, di_write_lock_parent,
271
272
 * di_read_lock_parent2, di_write_lock_parent2,
272
273
 * di_read_lock_parent3, di_write_lock_parent3,
 
274
 * di_read_lock_parent4, di_write_lock_parent4,
273
275
 */
274
276
#define AuReadLockFunc(name, lsc) \
275
277
static inline void di_read_lock_##name(struct dentry *d, int flags) \
289
291
AuRWLockFuncs(parent, PARENT);
290
292
AuRWLockFuncs(parent2, PARENT2);
291
293
AuRWLockFuncs(parent3, PARENT3);
 
294
AuRWLockFuncs(parent4, PARENT4);
292
295
 
293
296
#undef AuReadLockFunc
294
297
#undef AuWriteLockFunc