[packages/kernel] - builds without vs, aufs and imq

[arekm]

commit a25ec4e90d2e42814715bd1d7310e2545da0a909
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Jan 20 23:11:41 2014 +0100

    - builds without vs, aufs and imq

 ovl03-vfs-export-inode_permission-to-modules.patch |  2 +-
 ovl05-overlay-filesystem.patch                     | 23 +++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/ovl03-vfs-export-inode_permission-to-modules.patch b/ovl03-vfs-export-inode_permission-to-modules.patch
index c3de113..bb853e0 100644
--- a/ovl03-vfs-export-inode_permission-to-modules.patch
+++ b/ovl03-vfs-export-inode_permission-to-modules.patch
@@ -38,7 +38,7 @@ Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
 +++ b/include/linux/fs.h
 @@ -2221,6 +2221,7 @@ extern sector_t bmap(struct inode *, sec
  #endif
- extern int notify_change(struct dentry *, struct iattr *);
+ extern int notify_change(struct dentry *, struct iattr *, struct inode **);
  extern int inode_permission(struct inode *, int);
 +extern int __inode_permission(struct inode *, int);
  extern int generic_permission(struct inode *, int);
diff --git a/ovl05-overlay-filesystem.patch b/ovl05-overlay-filesystem.patch
index 23e2283..b5e7735 100644
--- a/ovl05-overlay-filesystem.patch
+++ b/ovl05-overlay-filesystem.patch
@@ -307,7 +307,7 @@ Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
 +		.ia_mtime = stat->mtime,
 +	};
 +
-+	return notify_change(upperdentry, &attr);
++	return notify_change(upperdentry, &attr, NULL);
 +}
 +
 +static int ovl_set_mode(struct dentry *upperdentry, umode_t mode)
@@ -317,7 +317,7 @@ Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
 +		.ia_mode = mode,
 +	};
 +
-+	return notify_change(upperdentry, &attr);
++	return notify_change(upperdentry, &attr, NULL);
 +}
 +
 +static int ovl_copy_up_locked(struct dentry *upperdir, struct dentry *dentry,
@@ -372,7 +372,7 @@ Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
 +	if (S_ISDIR(stat->mode))
 +		vfs_rmdir(upperdir->d_inode, newpath.dentry);
 +	else
-+		vfs_unlink(upperdir->d_inode, newpath.dentry);
++		vfs_unlink(upperdir->d_inode, newpath.dentry, NULL);
 +
 +	dput(newpath.dentry);
 +
@@ -531,7 +531,7 @@ Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
 +}
 --- /dev/null
 +++ b/fs/overlayfs/dir.c
-@@ -0,0 +1,605 @@
+@@ -0,0 +1,606 @@
 +/*
 + *
 + * Copyright (C) 2011 Novell Inc.
@@ -593,7 +593,7 @@ Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
 +
 +	err = vfs_setxattr(newdentry, ovl_whiteout_xattr, "y", 1, 0);
 +	if (err)
-+		vfs_unlink(upperdir->d_inode, newdentry);
++		vfs_unlink(upperdir->d_inode, newdentry, NULL);
 +
 +out_dput:
 +	dput(newdentry);
@@ -651,7 +651,7 @@ Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
 +
 +		err = -EEXIST;
 +		if (ovl_is_whiteout(newdentry))
-+			err = vfs_unlink(upperdir->d_inode, newdentry);
++			err = vfs_unlink(upperdir->d_inode, newdentry, NULL);
 +
 +		revert_creds(old_cred);
 +		put_cred(override_cred);
@@ -901,7 +901,8 @@ Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
 +		if (is_dir)
 +			err = vfs_rmdir(upperdir->d_inode, realpath.dentry);
 +		else
-+			err = vfs_unlink(upperdir->d_inode, realpath.dentry);
++			err = vfs_unlink(upperdir->d_inode, realpath.dentry,
++					 NULL);
 +		if (err)
 +			goto out_d_drop;
 +
@@ -970,7 +971,7 @@ Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
 +		goto out_unlock;
 +
 +	olddentry = ovl_dentry_upper(old);
-+	err = vfs_link(olddentry, upperdir->d_inode, newdentry);
++	err = vfs_link(olddentry, upperdir->d_inode, newdentry, NULL);
 +	if (!err) {
 +		if (WARN_ON(!newdentry->d_inode)) {
 +			dput(newdentry);
@@ -1091,7 +1092,7 @@ Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
 +	}
 +
 +	err = vfs_rename(old_upperdir->d_inode, olddentry,
-+			 new_upperdir->d_inode, newdentry);
++			 new_upperdir->d_inode, newdentry, NULL);
 +
 +	if (err) {
 +		if (new_create && ovl_dentry_is_opaque(new))
@@ -1172,7 +1173,7 @@ Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
 +		attr->ia_valid &= ~ATTR_MODE;
 +
 +	mutex_lock(&upperdentry->d_inode->i_mutex);
-+	err = notify_change(upperdentry, attr);
++	err = notify_change(upperdentry, attr, NULL);
 +	if (!err)
 +		ovl_copyattr(upperdentry->d_inode, dentry->d_inode);
 +	mutex_unlock(&upperdentry->d_inode->i_mutex);
@@ -2126,7 +2127,7 @@ Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
 +			    p->len, p->name, PTR_ERR(dentry));
 +			continue;
 +		}
-+		ret = vfs_unlink(upperdir->d_inode, dentry);
++		ret = vfs_unlink(upperdir->d_inode, dentry, NULL);
 +		dput(dentry);
 +		if (ret)
 +			pr_warn(
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/a25ec4e90d2e42814715bd1d7310e2545da0a909