packages: kernel/kernel-aufs.patch - updated for .31

[zbyniu]

Author: zbyniu                       Date: Fri Sep 18 19:25:09 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated for .31

---- Files affected:
packages/kernel:
   kernel-aufs.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-aufs.patch
diff -u packages/kernel/kernel-aufs.patch:1.3 packages/kernel/kernel-aufs.patch:1.4
--- packages/kernel/kernel-aufs.patch:1.3	Tue Apr  7 11:05:02 2009
+++ packages/kernel/kernel-aufs.patch	Fri Sep 18 21:25:04 2009
@@ -7124,7 +7124,7 @@
 diff -urN linux/fs/aufs/export.c linux-aufs/fs/aufs/export.c
 --- linux/fs/aufs/export.c	1970-01-01 01:00:00.000000000 +0100
 +++ linux-aufs/fs/aufs/export.c	2009-03-12 16:18:04.000000000 +0100
-@@ -0,0 +1,826 @@
+@@ -0,0 +1,827 @@
 +/*
 + * Copyright (C) 2005-2009 Junjiro Okajima
 + *
@@ -7152,6 +7152,7 @@
 +#include <linux/exportfs.h>
 +#include <linux/mnt_namespace.h>
 +#include <linux/random.h>
++#include <linux/nsproxy.h>
 +#include "aufs.h"
 +
 +union conv {
@@ -8056,7 +8057,7 @@
 +	if (file && au_test_nfs(h_dentry->d_sb))
 +		h_file = au_h_intent(dentry, bindex, file);
 +	if (!h_file)
-+		h_file = dentry_open(dget(h_dentry), mntget(br->br_mnt), flags, file->f_cred);
++		h_file = dentry_open(dget(h_dentry), mntget(br->br_mnt), flags, current_cred());
 +
 +	/*
 +	 * a dirty trick for handling FMODE_EXEC and deny_write_access().
@@ -27365,7 +27366,7 @@
 diff -urN linux/fs/aufs/wkq.c linux-aufs/fs/aufs/wkq.c
 --- linux/fs/aufs/wkq.c	1970-01-01 01:00:00.000000000 +0100
 +++ linux-aufs/fs/aufs/wkq.c	2009-03-12 16:18:04.000000000 +0100
-@@ -0,0 +1,343 @@
+@@ -0,0 +1,353 @@
 +/*
 + * Copyright (C) 2005-2009 Junjiro Okajima
 + *
@@ -27395,14 +27396,24 @@
 +
 +struct au_wkq *au_wkq;
 +
-+
++struct au_cred {
++#ifdef CONFIG_AUFS_DLGT
++	struct cred *cred;
++#if 0 /* reserved for future use */
++	unsigned keep_capabilities:1;
++	struct user_struct *user;
++	struct fs_struct *fs;
++	struct nsproxy *nsproxy;
++#endif
++#endif
++};
 +
 +struct au_wkinfo {
 +	struct work_struct wk;
 +	struct super_block *sb;
 +
 +	unsigned int flags;
-+	struct cred cred;
++	struct au_cred cred;
 +
 +	au_wkq_func_t func;
 +	void *args;
@@ -27414,18 +27425,18 @@
 +/* ---------------------------------------------------------------------- */
 +
 +#ifdef CONFIG_AUFS_DLGT
-+static void cred_store(struct cred *cred)
++static void cred_store(struct au_cred *cred)
 +{
 +	cred = get_current_cred();
 +}
 +
-+static void cred_revert(struct cred *cred)
++static void cred_revert(struct au_cred *cred)
 +{
 +	AuDebugOn(!au_test_wkq(current));
 +	revert_creds(cred);
 +}
 +
-+static void cred_switch(struct cred *old, struct cred *new)
++static void cred_switch(struct au_cred *old, struct au_cred *new)
 +{
 +	cred_store(old);
 +	cred_revert(new);
@@ -27442,7 +27453,7 @@
 +	if (!au_ftest_wkq(wkinfo->flags, DLGT))
 +		wkinfo->func(wkinfo->args);
 +	else {
-+		struct cred cred;
++		struct au_cred cred;
 +		cred_switch(&cred, &wkinfo->cred);
 +		wkinfo->func(wkinfo->args);
 +		cred_revert(&cred);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-aufs.patch?r1=1.3&r2=1.4&f=u