You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
54 lines
1.9 KiB
54 lines
1.9 KiB
11 years ago
|
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||
|
|
#
|
||
|
|
# Filename: package/.../aufs/aufs-vserver-inode-i_flags.diff
|
||
|
|
# Copyright (C) 2014 The OpenSDE Project
|
||
|
|
#
|
||
|
|
# More information can be found in the files COPYING and README.
|
||
|
|
#
|
||
|
|
# This patch file is dual-licensed. It is available under the license the
|
||
|
|
# patched project is licensed under, as long as it is an OpenSource license
|
||
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||
|
|
# of the GNU General Public License as published by the Free Software
|
||
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
||
|
|
# version.
|
||
|
|
# --- SDE-COPYRIGHT-NOTE-END ---
|
||
|
|
|
||
|
|
This patch needs to be applied when trying to build aufs on top
|
||
|
|
of a kernel with patched in linux vserver[1] support.
|
||
|
|
|
||
|
|
The vserver patch changes the type of the 'i_flags' field within
|
||
|
|
'struct inode' from 'unsigned int' to 'unsigned short'.
|
||
|
|
|
||
|
|
Initial build time test was done using following version:
|
||
|
|
|
||
|
|
linux kernel: 3.10.2
|
||
|
|
linux vserver patch: patch-3.10.9-vs2.3.6.6.diff [2]
|
||
|
|
aufs3-standalone: 3.10-20130916
|
||
|
|
|
||
|
|
[1] http://linux-vserver.org
|
||
|
|
[2] http://vserver.13thfloor.at/Experimental/patch-3.10.9-vs2.3.6.6.diff
|
||
|
|
|
||
|
|
--- a/fs/aufs/cpup.h
|
||
|
|
+++ b/fs/aufs/cpup.h
|
||
|
|
@@ -31,7 +31,7 @@
|
||
|
|
struct file;
|
||
|
|
struct au_pin;
|
||
|
|
|
||
|
|
-void au_cpup_attr_flags(struct inode *dst, unsigned int iflags);
|
||
|
|
+void au_cpup_attr_flags(struct inode *dst, unsigned short iflags);
|
||
|
|
void au_cpup_attr_timesizes(struct inode *inode);
|
||
|
|
void au_cpup_attr_nlink(struct inode *inode, int force);
|
||
|
|
void au_cpup_attr_changeable(struct inode *inode);
|
||
|
|
--- a/fs/aufs/cpup.c
|
||
|
|
+++ b/fs/aufs/cpup.c
|
||
|
|
@@ -24,7 +24,7 @@
|
||
|
|
#include <linux/mm.h>
|
||
|
|
#include "aufs.h"
|
||
|
|
|
||
|
|
-void au_cpup_attr_flags(struct inode *dst, unsigned int iflags)
|
||
|
|
+void au_cpup_attr_flags(struct inode *dst, unsigned short iflags)
|
||
|
|
{
|
||
|
|
const unsigned int mask = S_DEAD | S_SWAPFILE | S_PRIVATE
|
||
|
|
| S_NOATIME | S_NOCMTIME | S_AUTOMOUNT;
|