Merge /dists/sid/linux-2.6 (2.6.37-1).
Keep ABI at 'trunk'. Disable aufs again (but keep the patches). Drop patches merged upstream. svn path=/dists/trunk/linux-2.6/; revision=16904
This commit is contained in:
Ben Hutchings
commit
5fa092eee4
|
|
@ -9,7 +9,7 @@ linux-2.6 (2.6.38~rc5-1~experimental.1) UNRELEASED; urgency=low
|
|||
|
||||
-- Ben Hutchings <ben@decadent.org.uk> Mon, 10 Jan 2011 00:39:29 +0000
|
||||
|
||||
linux-2.6 (2.6.37-1) UNRELEASED; urgency=low
|
||||
linux-2.6 (2.6.37-1) unstable; urgency=low
|
||||
|
||||
[ Ben Hutchings ]
|
||||
* [arm] ixp4xx: Revert build fix, now applied upstream which resulted
|
||||
|
|
@ -18,6 +18,16 @@ linux-2.6 (2.6.37-1) UNRELEASED; urgency=low
|
|||
* r8712u: Firmware filename is rtlwifi/rtl8712u.bin (Closes: #602450)
|
||||
* [sparc] Fix misaligned tracing information which the module loader
|
||||
does not support (Closes: #609371)
|
||||
* Set ABI to 1
|
||||
* Add aufs2.1, marked as staging (Closes: #573189, #613248)
|
||||
* fs/notify: Enable FANOTIFY (Closes: #599877)
|
||||
* acer-wmi, aic94xx, asus_acpi, iscsi, janz-ican3, rtc-ds1511, tc1100-wmi:
|
||||
Restrict write permissions on files in procfs/sysfs
|
||||
* nbd: Remove module-level ioctl mutex mistakenly introduced in 2.6.37
|
||||
* [x86] crypto: Re-enable AES_NI_INTEL as module (Closes: #597658)
|
||||
* [powerpc] video/fb: Enable FB_VGA16 as built-in; build FB_CT65550,
|
||||
FB_NVIDIA, FB_MATROX, FB_RADEON, FB_ATY128, FB_ATY, FB_SIS, FB_3DFX
|
||||
as modules (Closes: #609615)
|
||||
|
||||
[ Aurelien Jarno ]
|
||||
* [sh4] Export cpu_core_map to fix build failure with CONFIG_SFC=m.
|
||||
|
|
@ -27,7 +37,7 @@ linux-2.6 (2.6.37-1) UNRELEASED; urgency=low
|
|||
* Enable CIFS fscache and ACL support.
|
||||
* Enable Xen PCI frontend.
|
||||
|
||||
-- Ben Hutchings <ben@decadent.org.uk> Mon, 10 Jan 2011 00:39:29 +0000
|
||||
-- Ben Hutchings <ben@decadent.org.uk> Tue, 15 Feb 2011 04:14:09 +0000
|
||||
|
||||
linux-2.6 (2.6.37-1~experimental.1) experimental; urgency=low
|
||||
|
||||
|
|
|
|||
|
|
@ -2923,6 +2923,25 @@ CONFIG_AFS_FS=m
|
|||
# CONFIG_AFS_DEBUG is not set
|
||||
CONFIG_AFS_FSCACHE=y
|
||||
|
||||
##
|
||||
## file: fs/aufs/Kconfig
|
||||
##
|
||||
# CONFIG_AUFS_FS=m
|
||||
# ## choice: Maximum number of branches
|
||||
# CONFIG_AUFS_BRANCH_MAX_127=y
|
||||
# # CONFIG_AUFS_BRANCH_MAX_511 is not set
|
||||
# # CONFIG_AUFS_BRANCH_MAX_1023 is not set
|
||||
# # CONFIG_AUFS_BRANCH_MAX_32767 is not set
|
||||
# ## end choice
|
||||
# # CONFIG_AUFS_HNOTIFY is not set
|
||||
# # CONFIG_AUFS_EXPORT is not set
|
||||
# # CONFIG_AUFS_RDU is not set
|
||||
# # CONFIG_AUFS_SP_IATTR is not set
|
||||
# # CONFIG_AUFS_SHWH is not set
|
||||
# # CONFIG_AUFS_BR_RAMFS is not set
|
||||
# # CONFIG_AUFS_BR_FUSE is not set
|
||||
# # CONFIG_AUFS_DEBUG is not set
|
||||
|
||||
##
|
||||
## file: fs/autofs4/Kconfig
|
||||
##
|
||||
|
|
@ -3237,6 +3256,11 @@ CONFIG_NLS_UTF8=m
|
|||
##
|
||||
CONFIG_DNOTIFY=y
|
||||
|
||||
##
|
||||
## file: fs/notify/fanotify/Kconfig
|
||||
##
|
||||
CONFIG_FANOTIFY=y
|
||||
|
||||
##
|
||||
## file: fs/notify/inotify/Kconfig
|
||||
##
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ CONFIG_X86_POWERNOW_K8=m
|
|||
## file: crypto/Kconfig
|
||||
##
|
||||
CONFIG_CRYPTO_AES_X86_64=m
|
||||
# CONFIG_CRYPTO_AES_NI_INTEL is not set
|
||||
CONFIG_CRYPTO_AES_NI_INTEL=m
|
||||
CONFIG_CRYPTO_SALSA20_X86_64=m
|
||||
CONFIG_CRYPTO_TWOFISH_X86_64=m
|
||||
|
||||
|
|
|
|||
|
|
@ -753,38 +753,38 @@ CONFIG_FB_CIRRUS=m
|
|||
# CONFIG_FB_PM2 is not set
|
||||
# CONFIG_FB_CYBER2000 is not set
|
||||
CONFIG_FB_OF=y
|
||||
CONFIG_FB_CT65550=y
|
||||
CONFIG_FB_CT65550=m
|
||||
# CONFIG_FB_ASILIANT is not set
|
||||
# CONFIG_FB_VGA16 is not set
|
||||
CONFIG_FB_VGA16=y
|
||||
CONFIG_FB_S1D13XXX=m
|
||||
CONFIG_FB_NVIDIA=y
|
||||
CONFIG_FB_NVIDIA=m
|
||||
CONFIG_FB_NVIDIA_I2C=y
|
||||
# CONFIG_FB_RIVA is not set
|
||||
# CONFIG_FB_RIVA_I2C is not set
|
||||
# CONFIG_FB_RIVA_DEBUG is not set
|
||||
CONFIG_FB_MATROX=y
|
||||
CONFIG_FB_MATROX=m
|
||||
CONFIG_FB_MATROX_MILLENIUM=y
|
||||
CONFIG_FB_MATROX_MYSTIQUE=y
|
||||
CONFIG_FB_MATROX_G=y
|
||||
CONFIG_FB_MATROX_I2C=m
|
||||
CONFIG_FB_MATROX_MAVEN=m
|
||||
CONFIG_FB_RADEON=y
|
||||
CONFIG_FB_RADEON=m
|
||||
CONFIG_FB_RADEON_I2C=y
|
||||
# CONFIG_FB_RADEON_DEBUG is not set
|
||||
CONFIG_FB_ATY128=y
|
||||
CONFIG_FB_ATY=y
|
||||
CONFIG_FB_ATY128=m
|
||||
CONFIG_FB_ATY=m
|
||||
CONFIG_FB_ATY_CT=y
|
||||
CONFIG_FB_ATY_GENERIC_LCD=y
|
||||
CONFIG_FB_ATY_GX=y
|
||||
CONFIG_FB_SAVAGE=m
|
||||
CONFIG_FB_SAVAGE_I2C=y
|
||||
CONFIG_FB_SAVAGE_ACCEL=y
|
||||
CONFIG_FB_SIS=y
|
||||
CONFIG_FB_SIS=m
|
||||
CONFIG_FB_SIS_300=y
|
||||
CONFIG_FB_SIS_315=y
|
||||
CONFIG_FB_NEOMAGIC=m
|
||||
CONFIG_FB_KYRO=m
|
||||
CONFIG_FB_3DFX=y
|
||||
CONFIG_FB_3DFX=m
|
||||
CONFIG_FB_VOODOO1=y
|
||||
CONFIG_FB_TRIDENT=m
|
||||
CONFIG_FB_IBM_GXT4500=m
|
||||
|
|
|
|||
29
debian/patches/bugfix/all/rtc-rtc-ds1511-world-writable-sysfs-nvram-file.patch
vendored
Normal file
29
debian/patches/bugfix/all/rtc-rtc-ds1511-world-writable-sysfs-nvram-file.patch
vendored
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
From: Vasiliy Kulikov <segoon@openwall.com>
|
||||
Subject: [PATCH 17/20] rtc: rtc-ds1511: world-writable sysfs nvram file
|
||||
Date: Fri, 4 Feb 2011 15:24:06 +0300
|
||||
|
||||
Don't allow everybogy to write to NVRAM.
|
||||
|
||||
Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
|
||||
---
|
||||
Compile tested only.
|
||||
|
||||
drivers/rtc/rtc-ds1511.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c
|
||||
index 37268e9..afeb546 100644
|
||||
--- a/drivers/rtc/rtc-ds1511.c
|
||||
+++ b/drivers/rtc/rtc-ds1511.c
|
||||
@@ -485,7 +485,7 @@ ds1511_nvram_write(struct file *filp, struct kobject *kobj,
|
||||
static struct bin_attribute ds1511_nvram_attr = {
|
||||
.attr = {
|
||||
.name = "nvram",
|
||||
- .mode = S_IRUGO | S_IWUGO,
|
||||
+ .mode = S_IRUGO | S_IWUSR,
|
||||
},
|
||||
.size = DS1511_RAM_MAX,
|
||||
.read = ds1511_nvram_read,
|
||||
--
|
||||
1.7.0.4
|
||||
|
||||
29
debian/patches/bugfix/all/scsi-aic94xx-world-writable-sysfs-update_bios-file.patch
vendored
Normal file
29
debian/patches/bugfix/all/scsi-aic94xx-world-writable-sysfs-update_bios-file.patch
vendored
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
From: Vasiliy Kulikov <segoon@openwall.com>
|
||||
Subject: [PATCH 18/20] scsi: aic94xx: world-writable sysfs update_bios file
|
||||
Date: Fri, 4 Feb 2011 15:24:10 +0300
|
||||
|
||||
Don't allow everybody to load firmware.
|
||||
|
||||
Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
|
||||
---
|
||||
Compile tested only.
|
||||
|
||||
drivers/scsi/aic94xx/aic94xx_init.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
|
||||
index 3b7e83d..d5ff142 100644
|
||||
--- a/drivers/scsi/aic94xx/aic94xx_init.c
|
||||
+++ b/drivers/scsi/aic94xx/aic94xx_init.c
|
||||
@@ -486,7 +486,7 @@ static ssize_t asd_show_update_bios(struct device *dev,
|
||||
flash_error_table[i].reason);
|
||||
}
|
||||
|
||||
-static DEVICE_ATTR(update_bios, S_IRUGO|S_IWUGO,
|
||||
+static DEVICE_ATTR(update_bios, S_IRUGO|S_IWUSR,
|
||||
asd_show_update_bios, asd_store_update_bios);
|
||||
|
||||
static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha)
|
||||
--
|
||||
1.7.0.4
|
||||
|
||||
29
debian/patches/bugfix/all/scsi-iscsi-world-writable-sysfs-priv_sess-file.patch
vendored
Normal file
29
debian/patches/bugfix/all/scsi-iscsi-world-writable-sysfs-priv_sess-file.patch
vendored
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
From: Vasiliy Kulikov <segoon@openwall.com>
|
||||
Subject: [PATCH 19/20] scsi: iscsi: world-writable sysfs priv_sess file
|
||||
Date: Fri, 4 Feb 2011 15:24:14 +0300
|
||||
|
||||
Don't allow everybody to change iSCSI settings.
|
||||
|
||||
Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
|
||||
---
|
||||
Compile tested only.
|
||||
|
||||
drivers/scsi/scsi_transport_iscsi.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
|
||||
index f905ecb..01543d2 100644
|
||||
--- a/drivers/scsi/scsi_transport_iscsi.c
|
||||
+++ b/drivers/scsi/scsi_transport_iscsi.c
|
||||
@@ -1847,7 +1847,7 @@ store_priv_session_##field(struct device *dev, \
|
||||
#define iscsi_priv_session_rw_attr(field, format) \
|
||||
iscsi_priv_session_attr_show(field, format) \
|
||||
iscsi_priv_session_attr_store(field) \
|
||||
-static ISCSI_CLASS_ATTR(priv_sess, field, S_IRUGO | S_IWUGO, \
|
||||
+static ISCSI_CLASS_ATTR(priv_sess, field, S_IRUGO | S_IWUSR, \
|
||||
show_priv_session_##field, \
|
||||
store_priv_session_##field)
|
||||
iscsi_priv_session_rw_attr(recovery_tmo, "%d");
|
||||
--
|
||||
1.7.0.4
|
||||
|
||||
30
debian/patches/bugfix/x86/platform-x86-acer-wmi-world-writable-sysfs-threeg-fi.patch
vendored
Normal file
30
debian/patches/bugfix/x86/platform-x86-acer-wmi-world-writable-sysfs-threeg-fi.patch
vendored
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
From: Vasiliy Kulikov <segoon@openwall.com>
|
||||
Date: Fri, 4 Feb 2011 15:23:56 +0300
|
||||
Subject: [PATCH 7/9] platform: x86: acer-wmi: world-writable sysfs threeg file
|
||||
|
||||
commit a6414907541a44db0586b894b0f19b3be6457da3 upstream.
|
||||
|
||||
Don't allow everybody to write to hardware registers.
|
||||
|
||||
Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
|
||||
Signed-off-by: Matthew Garrett <mjg@redhat.com>
|
||||
---
|
||||
drivers/platform/x86/acer-wmi.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
|
||||
index c5c4b8c..a7bcad7 100644
|
||||
--- a/drivers/platform/x86/acer-wmi.c
|
||||
+++ b/drivers/platform/x86/acer-wmi.c
|
||||
@@ -1280,7 +1280,7 @@ static ssize_t set_bool_threeg(struct device *dev,
|
||||
return -EINVAL;
|
||||
return count;
|
||||
}
|
||||
-static DEVICE_ATTR(threeg, S_IWUGO | S_IRUGO | S_IWUSR, show_bool_threeg,
|
||||
+static DEVICE_ATTR(threeg, S_IRUGO | S_IWUSR, show_bool_threeg,
|
||||
set_bool_threeg);
|
||||
|
||||
static ssize_t show_interface(struct device *dev, struct device_attribute *attr,
|
||||
--
|
||||
1.7.2.3
|
||||
|
||||
39
debian/patches/bugfix/x86/platform-x86-asus_acpi-world-writable-procfs-files.patch
vendored
Normal file
39
debian/patches/bugfix/x86/platform-x86-asus_acpi-world-writable-procfs-files.patch
vendored
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
From: Vasiliy Kulikov <segoon@openwall.com>
|
||||
Date: Fri, 4 Feb 2011 15:23:59 +0300
|
||||
Subject: [PATCH 8/9] platform: x86: asus_acpi: world-writable procfs files
|
||||
|
||||
commit e75b7eb5716256c52a123a467be25fb5e03fa930 upstream.
|
||||
|
||||
Don't allow everybody to change ACPI settings. The comment says that it
|
||||
is done deliberatelly, however, the comment before disp_proc_write()
|
||||
says that at least one of these setting is experimental.
|
||||
|
||||
Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
|
||||
Signed-off-by: Matthew Garrett <mjg@redhat.com>
|
||||
---
|
||||
drivers/platform/x86/asus_acpi.c | 8 +-------
|
||||
1 files changed, 1 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/drivers/platform/x86/asus_acpi.c b/drivers/platform/x86/asus_acpi.c
|
||||
index 4633fd8..fe49593 100644
|
||||
--- a/drivers/platform/x86/asus_acpi.c
|
||||
+++ b/drivers/platform/x86/asus_acpi.c
|
||||
@@ -1081,14 +1081,8 @@ static int asus_hotk_add_fs(struct acpi_device *device)
|
||||
struct proc_dir_entry *proc;
|
||||
mode_t mode;
|
||||
|
||||
- /*
|
||||
- * If parameter uid or gid is not changed, keep the default setting for
|
||||
- * our proc entries (-rw-rw-rw-) else, it means we care about security,
|
||||
- * and then set to -rw-rw----
|
||||
- */
|
||||
-
|
||||
if ((asus_uid == 0) && (asus_gid == 0)) {
|
||||
- mode = S_IFREG | S_IRUGO | S_IWUGO;
|
||||
+ mode = S_IFREG | S_IRUGO | S_IWUSR | S_IWGRP;
|
||||
} else {
|
||||
mode = S_IFREG | S_IRUSR | S_IRGRP | S_IWUSR | S_IWGRP;
|
||||
printk(KERN_WARNING " asus_uid and asus_gid parameters are "
|
||||
--
|
||||
1.7.2.3
|
||||
|
||||
30
debian/patches/bugfix/x86/platform-x86-tc1100-wmi-world-writable-sysfs-wireles.patch
vendored
Normal file
30
debian/patches/bugfix/x86/platform-x86-tc1100-wmi-world-writable-sysfs-wireles.patch
vendored
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
From: Vasiliy Kulikov <segoon@openwall.com>
|
||||
Date: Fri, 4 Feb 2011 15:24:03 +0300
|
||||
Subject: [PATCH 9/9] platform: x86: tc1100-wmi: world-writable sysfs wireless and jogdial files
|
||||
|
||||
commit 9f6c8b9930b72876dbd934e8563818cfb5e481e2 upstream.
|
||||
|
||||
Don't allow everybody to change WMI settings.
|
||||
|
||||
Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
|
||||
Signed-off-by: Matthew Garrett <mjg@redhat.com>
|
||||
---
|
||||
drivers/platform/x86/tc1100-wmi.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/drivers/platform/x86/tc1100-wmi.c b/drivers/platform/x86/tc1100-wmi.c
|
||||
index 1fe0f1f..865ef78 100644
|
||||
--- a/drivers/platform/x86/tc1100-wmi.c
|
||||
+++ b/drivers/platform/x86/tc1100-wmi.c
|
||||
@@ -162,7 +162,7 @@ set_bool_##value(struct device *dev, struct device_attribute *attr, \
|
||||
return -EINVAL; \
|
||||
return count; \
|
||||
} \
|
||||
-static DEVICE_ATTR(value, S_IWUGO | S_IRUGO | S_IWUSR, \
|
||||
+static DEVICE_ATTR(value, S_IRUGO | S_IWUSR, \
|
||||
show_bool_##value, set_bool_##value);
|
||||
|
||||
show_set_bool(wireless, TC1100_INSTANCE_WIRELESS);
|
||||
--
|
||||
1.7.2.3
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,78 @@
|
|||
aufs2.1 base patch for linux-2.6.37
|
||||
|
||||
diff --git a/fs/namei.c b/fs/namei.c
|
||||
index 4ff7ca5..a8c583f 100644
|
||||
--- a/fs/namei.c
|
||||
+++ b/fs/namei.c
|
||||
@@ -1161,12 +1161,12 @@ out:
|
||||
* needs parent already locked. Doesn't follow mounts.
|
||||
* SMP-safe.
|
||||
*/
|
||||
-static struct dentry *lookup_hash(struct nameidata *nd)
|
||||
+struct dentry *lookup_hash(struct nameidata *nd)
|
||||
{
|
||||
return __lookup_hash(&nd->last, nd->path.dentry, nd);
|
||||
}
|
||||
|
||||
-static int __lookup_one_len(const char *name, struct qstr *this,
|
||||
+int __lookup_one_len(const char *name, struct qstr *this,
|
||||
struct dentry *base, int len)
|
||||
{
|
||||
unsigned long hash;
|
||||
diff --git a/fs/splice.c b/fs/splice.c
|
||||
index ce2f025..ff0ae69 100644
|
||||
--- a/fs/splice.c
|
||||
+++ b/fs/splice.c
|
||||
@@ -1092,8 +1092,8 @@ EXPORT_SYMBOL_GPL(generic_splice_sendpage);
|
||||
/*
|
||||
* Attempt to initiate a splice from pipe to file.
|
||||
*/
|
||||
-static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
|
||||
- loff_t *ppos, size_t len, unsigned int flags)
|
||||
+long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
|
||||
+ loff_t *ppos, size_t len, unsigned int flags)
|
||||
{
|
||||
ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
|
||||
loff_t *, size_t, unsigned int);
|
||||
@@ -1120,9 +1120,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
|
||||
/*
|
||||
* Attempt to initiate a splice from a file to a pipe.
|
||||
*/
|
||||
-static long do_splice_to(struct file *in, loff_t *ppos,
|
||||
- struct pipe_inode_info *pipe, size_t len,
|
||||
- unsigned int flags)
|
||||
+long do_splice_to(struct file *in, loff_t *ppos,
|
||||
+ struct pipe_inode_info *pipe, size_t len,
|
||||
+ unsigned int flags)
|
||||
{
|
||||
ssize_t (*splice_read)(struct file *, loff_t *,
|
||||
struct pipe_inode_info *, size_t, unsigned int);
|
||||
diff --git a/include/linux/namei.h b/include/linux/namei.h
|
||||
index 05b441d..91bc74e 100644
|
||||
--- a/include/linux/namei.h
|
||||
+++ b/include/linux/namei.h
|
||||
@@ -73,6 +73,9 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
|
||||
extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
|
||||
int (*open)(struct inode *, struct file *));
|
||||
|
||||
+extern struct dentry *lookup_hash(struct nameidata *nd);
|
||||
+extern int __lookup_one_len(const char *name, struct qstr *this,
|
||||
+ struct dentry *base, int len);
|
||||
extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
|
||||
|
||||
extern int follow_down(struct path *);
|
||||
diff --git a/include/linux/splice.h b/include/linux/splice.h
|
||||
index 997c3b4..be9a153 100644
|
||||
--- a/include/linux/splice.h
|
||||
+++ b/include/linux/splice.h
|
||||
@@ -89,4 +89,10 @@ extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *);
|
||||
extern void splice_shrink_spd(struct pipe_inode_info *,
|
||||
struct splice_pipe_desc *);
|
||||
|
||||
+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
|
||||
+ loff_t *ppos, size_t len, unsigned int flags);
|
||||
+extern long do_splice_to(struct file *in, loff_t *ppos,
|
||||
+ struct pipe_inode_info *pipe, size_t len,
|
||||
+ unsigned int flags);
|
||||
+
|
||||
#endif
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
aufs2.1 kbuild patch for linux-2.6.37
|
||||
|
||||
diff --git a/fs/Kconfig b/fs/Kconfig
|
||||
index 771f457..bb1a52f 100644
|
||||
--- a/fs/Kconfig
|
||||
+++ b/fs/Kconfig
|
||||
@@ -191,6 +191,7 @@ source "fs/romfs/Kconfig"
|
||||
source "fs/sysv/Kconfig"
|
||||
source "fs/ufs/Kconfig"
|
||||
source "fs/exofs/Kconfig"
|
||||
+source "fs/aufs/Kconfig"
|
||||
|
||||
endif # MISC_FILESYSTEMS
|
||||
|
||||
diff --git a/fs/Makefile b/fs/Makefile
|
||||
index a7f7cef..95dd4d3 100644
|
||||
--- a/fs/Makefile
|
||||
+++ b/fs/Makefile
|
||||
@@ -121,3 +121,4 @@ obj-$(CONFIG_BTRFS_FS) += btrfs/
|
||||
obj-$(CONFIG_GFS2_FS) += gfs2/
|
||||
obj-$(CONFIG_EXOFS_FS) += exofs/
|
||||
obj-$(CONFIG_CEPH_FS) += ceph/
|
||||
+obj-$(CONFIG_AUFS_FS) += aufs/
|
||||
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
|
||||
index 97319a8..7ebb4b4 100644
|
||||
--- a/include/linux/Kbuild
|
||||
+++ b/include/linux/Kbuild
|
||||
@@ -60,6 +60,7 @@ header-y += atmppp.h
|
||||
header-y += atmsap.h
|
||||
header-y += atmsvc.h
|
||||
header-y += audit.h
|
||||
+header-y += aufs_type.h
|
||||
header-y += auto_fs.h
|
||||
header-y += auto_fs4.h
|
||||
header-y += auxvec.h
|
||||
|
|
@ -0,0 +1,289 @@
|
|||
aufs2.1 standalone patch for linux-2.6.37
|
||||
|
||||
diff --git a/fs/file_table.c b/fs/file_table.c
|
||||
index c3dee38..f529e4d 100644
|
||||
--- a/fs/file_table.c
|
||||
+++ b/fs/file_table.c
|
||||
@@ -393,6 +393,8 @@ void file_sb_list_del(struct file *file)
|
||||
}
|
||||
}
|
||||
|
||||
+EXPORT_SYMBOL_GPL(file_sb_list_del);
|
||||
+
|
||||
#ifdef CONFIG_SMP
|
||||
|
||||
/*
|
||||
diff --git a/fs/inode.c b/fs/inode.c
|
||||
index ae2727a..2c8071a 100644
|
||||
--- a/fs/inode.c
|
||||
+++ b/fs/inode.c
|
||||
@@ -82,6 +82,7 @@ static struct hlist_head *inode_hashtable __read_mostly;
|
||||
* the i_state of an inode while it is in use..
|
||||
*/
|
||||
DEFINE_SPINLOCK(inode_lock);
|
||||
+EXPORT_SYMBOL_GPL(inode_lock);
|
||||
|
||||
/*
|
||||
* iprune_sem provides exclusion between the kswapd or try_to_free_pages
|
||||
diff --git a/fs/namei.c b/fs/namei.c
|
||||
index a8c583f..b020c45 100644
|
||||
--- a/fs/namei.c
|
||||
+++ b/fs/namei.c
|
||||
@@ -347,6 +347,7 @@ int deny_write_access(struct file * file)
|
||||
|
||||
return 0;
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(deny_write_access);
|
||||
|
||||
/**
|
||||
* path_get - get a reference to a path
|
||||
@@ -1165,6 +1166,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
|
||||
{
|
||||
return __lookup_hash(&nd->last, nd->path.dentry, nd);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(lookup_hash);
|
||||
|
||||
int __lookup_one_len(const char *name, struct qstr *this,
|
||||
struct dentry *base, int len)
|
||||
@@ -1187,6 +1189,7 @@ int __lookup_one_len(const char *name, struct qstr *this,
|
||||
this->hash = end_name_hash(hash);
|
||||
return 0;
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(__lookup_one_len);
|
||||
|
||||
/**
|
||||
* lookup_one_len - filesystem helper to lookup single pathname component
|
||||
diff --git a/fs/namespace.c b/fs/namespace.c
|
||||
index 3dbfc07..3998762 100644
|
||||
--- a/fs/namespace.c
|
||||
+++ b/fs/namespace.c
|
||||
@@ -1321,6 +1321,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(iterate_mounts);
|
||||
|
||||
static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end)
|
||||
{
|
||||
diff --git a/fs/notify/group.c b/fs/notify/group.c
|
||||
index d309f38..f0e9568 100644
|
||||
--- a/fs/notify/group.c
|
||||
+++ b/fs/notify/group.c
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <linux/srcu.h>
|
||||
#include <linux/rculist.h>
|
||||
#include <linux/wait.h>
|
||||
+#include <linux/module.h>
|
||||
|
||||
#include <linux/fsnotify_backend.h>
|
||||
#include "fsnotify.h"
|
||||
@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group)
|
||||
if (atomic_dec_and_test(&group->refcnt))
|
||||
fsnotify_destroy_group(group);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(fsnotify_put_group);
|
||||
|
||||
/*
|
||||
* Create a new fsnotify_group and hold a reference for the group returned.
|
||||
@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops)
|
||||
|
||||
return group;
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(fsnotify_alloc_group);
|
||||
diff --git a/fs/notify/mark.c b/fs/notify/mark.c
|
||||
index 325185e..adede09 100644
|
||||
--- a/fs/notify/mark.c
|
||||
+++ b/fs/notify/mark.c
|
||||
@@ -113,6 +113,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
|
||||
if (atomic_dec_and_test(&mark->refcnt))
|
||||
mark->free_mark(mark);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(fsnotify_put_mark);
|
||||
|
||||
/*
|
||||
* Any time a mark is getting freed we end up here.
|
||||
@@ -190,6 +191,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark)
|
||||
if (unlikely(atomic_dec_and_test(&group->num_marks)))
|
||||
fsnotify_final_destroy_group(group);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(fsnotify_destroy_mark);
|
||||
|
||||
void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask)
|
||||
{
|
||||
@@ -277,6 +279,7 @@ err:
|
||||
|
||||
return ret;
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(fsnotify_add_mark);
|
||||
|
||||
/*
|
||||
* clear any marks in a group in which mark->flags & flags is true
|
||||
@@ -332,6 +335,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
|
||||
atomic_set(&mark->refcnt, 1);
|
||||
mark->free_mark = free_mark;
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(fsnotify_init_mark);
|
||||
|
||||
static int fsnotify_mark_destroy(void *ignored)
|
||||
{
|
||||
diff --git a/fs/open.c b/fs/open.c
|
||||
index 4197b9e..912817a 100644
|
||||
--- a/fs/open.c
|
||||
+++ b/fs/open.c
|
||||
@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
|
||||
mutex_unlock(&dentry->d_inode->i_mutex);
|
||||
return ret;
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(do_truncate);
|
||||
|
||||
static long do_sys_truncate(const char __user *pathname, loff_t length)
|
||||
{
|
||||
diff --git a/fs/splice.c b/fs/splice.c
|
||||
index ff0ae69..1c9e9b0 100644
|
||||
--- a/fs/splice.c
|
||||
+++ b/fs/splice.c
|
||||
@@ -1116,6 +1116,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
|
||||
|
||||
return splice_write(pipe, out, ppos, len, flags);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(do_splice_from);
|
||||
|
||||
/*
|
||||
* Attempt to initiate a splice from a file to a pipe.
|
||||
@@ -1142,6 +1143,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
|
||||
|
||||
return splice_read(in, ppos, pipe, len, flags);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(do_splice_to);
|
||||
|
||||
/**
|
||||
* splice_direct_to_actor - splices data directly between two non-pipes
|
||||
diff --git a/security/commoncap.c b/security/commoncap.c
|
||||
index 64c2ed9..e58b5d8 100644
|
||||
--- a/security/commoncap.c
|
||||
+++ b/security/commoncap.c
|
||||
@@ -929,3 +929,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot,
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(cap_file_mmap);
|
||||
diff --git a/security/device_cgroup.c b/security/device_cgroup.c
|
||||
index 8d9c48f..29108aa 100644
|
||||
--- a/security/device_cgroup.c
|
||||
+++ b/security/device_cgroup.c
|
||||
@@ -515,6 +515,7 @@ found:
|
||||
|
||||
return -EPERM;
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(devcgroup_inode_permission);
|
||||
|
||||
int devcgroup_inode_mknod(int mode, dev_t dev)
|
||||
{
|
||||
diff --git a/security/security.c b/security/security.c
|
||||
index 1b798d3..3b7d2ca 100644
|
||||
--- a/security/security.c
|
||||
+++ b/security/security.c
|
||||
@@ -360,6 +360,7 @@ int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode)
|
||||
return 0;
|
||||
return security_ops->path_mkdir(dir, dentry, mode);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(security_path_mkdir);
|
||||
|
||||
int security_path_rmdir(struct path *dir, struct dentry *dentry)
|
||||
{
|
||||
@@ -367,6 +368,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
|
||||
return 0;
|
||||
return security_ops->path_rmdir(dir, dentry);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(security_path_rmdir);
|
||||
|
||||
int security_path_unlink(struct path *dir, struct dentry *dentry)
|
||||
{
|
||||
@@ -374,6 +376,7 @@ int security_path_unlink(struct path *dir, struct dentry *dentry)
|
||||
return 0;
|
||||
return security_ops->path_unlink(dir, dentry);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(security_path_unlink);
|
||||
|
||||
int security_path_symlink(struct path *dir, struct dentry *dentry,
|
||||
const char *old_name)
|
||||
@@ -382,6 +385,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
|
||||
return 0;
|
||||
return security_ops->path_symlink(dir, dentry, old_name);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(security_path_symlink);
|
||||
|
||||
int security_path_link(struct dentry *old_dentry, struct path *new_dir,
|
||||
struct dentry *new_dentry)
|
||||
@@ -390,6 +394,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
|
||||
return 0;
|
||||
return security_ops->path_link(old_dentry, new_dir, new_dentry);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(security_path_link);
|
||||
|
||||
int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
|
||||
struct path *new_dir, struct dentry *new_dentry)
|
||||
@@ -400,6 +405,7 @@ int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
|
||||
return security_ops->path_rename(old_dir, old_dentry, new_dir,
|
||||
new_dentry);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(security_path_rename);
|
||||
|
||||
int security_path_truncate(struct path *path)
|
||||
{
|
||||
@@ -407,6 +413,7 @@ int security_path_truncate(struct path *path)
|
||||
return 0;
|
||||
return security_ops->path_truncate(path);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(security_path_truncate);
|
||||
|
||||
int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
|
||||
mode_t mode)
|
||||
@@ -415,6 +422,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
|
||||
return 0;
|
||||
return security_ops->path_chmod(dentry, mnt, mode);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(security_path_chmod);
|
||||
|
||||
int security_path_chown(struct path *path, uid_t uid, gid_t gid)
|
||||
{
|
||||
@@ -422,6 +430,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid)
|
||||
return 0;
|
||||
return security_ops->path_chown(path, uid, gid);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(security_path_chown);
|
||||
|
||||
int security_path_chroot(struct path *path)
|
||||
{
|
||||
@@ -498,6 +507,7 @@ int security_inode_readlink(struct dentry *dentry)
|
||||
return 0;
|
||||
return security_ops->inode_readlink(dentry);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(security_inode_readlink);
|
||||
|
||||
int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
|
||||
{
|
||||
@@ -512,6 +522,7 @@ int security_inode_permission(struct inode *inode, int mask)
|
||||
return 0;
|
||||
return security_ops->inode_permission(inode, mask);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(security_inode_permission);
|
||||
|
||||
int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
|
||||
{
|
||||
@@ -611,6 +622,7 @@ int security_file_permission(struct file *file, int mask)
|
||||
|
||||
return fsnotify_perm(file, mask);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(security_file_permission);
|
||||
|
||||
int security_file_alloc(struct file *file)
|
||||
{
|
||||
@@ -638,6 +650,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
|
||||
return ret;
|
||||
return ima_file_mmap(file, prot);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(security_file_mmap);
|
||||
|
||||
int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot,
|
||||
unsigned long prot)
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Subject: [PATCH] aufs: mark as staging
|
||||
|
||||
I really don't want to support this.
|
||||
|
||||
--- a/fs/aufs/module.c
|
||||
+++ b/fs/aufs/module.c
|
||||
@@ -89,6 +89,7 @@
|
||||
MODULE_DESCRIPTION(AUFS_NAME
|
||||
" -- Advanced multi layered unification filesystem");
|
||||
MODULE_VERSION(AUFS_VERSION);
|
||||
+MODULE_INFO(staging, "Y");
|
||||
|
||||
/* this module parameter has no meaning when SYSFS is disabled */
|
||||
int sysaufs_brs = 1;
|
||||
|
|
@ -39,3 +39,10 @@
|
|||
+ features/all/Kbuild-kconfig-Verbose-version-of-listnewconfig.patch
|
||||
+ features/all/r8712u-Switch-driver-to-use-external-firmware.patch
|
||||
+ features/all/r8712u-Firmware-changes-for-driver.patch
|
||||
|
||||
+ bugfix/x86/platform-x86-acer-wmi-world-writable-sysfs-threeg-fi.patch
|
||||
+ bugfix/x86/platform-x86-asus_acpi-world-writable-procfs-files.patch
|
||||
+ bugfix/x86/platform-x86-tc1100-wmi-world-writable-sysfs-wireles.patch
|
||||
+ bugfix/all/rtc-rtc-ds1511-world-writable-sysfs-nvram-file.patch
|
||||
+ bugfix/all/scsi-aic94xx-world-writable-sysfs-update_bios-file.patch
|
||||
+ bugfix/all/scsi-iscsi-world-writable-sysfs-priv_sess-file.patch
|
||||
|
|
|
|||
Loading…
Reference in New Issue