[PATCH 3.18.y 4/5] switch xattr_handler->set() to passing dentry and inode separately
From: Al Viro
preparation for similar switch in ->setxattr() (see the next commit for
rationale).
Signed-off-by: Al Viro
[sw0312.kim: backport to 3.18 including ext3]
Signed-off-by: Seung-Woo Kim
---
fs/9p/acl.c |7 +++
fs/9p/xattr_security.c |5 +++--
fs/9p/xattr_trusted.c|5 +++--
fs/9p/xattr_user.c |5 +++--
fs/ext2/xattr_security.c |7 ---
fs/ext2/xattr_trusted.c |7 ---
fs/ext2/xattr_user.c |9 +
fs/ext3/xattr_security.c |7 ---
fs/ext3/xattr_trusted.c |7 ---
fs/ext3/xattr_user.c |9 +
fs/ext4/xattr_security.c |7 ---
fs/ext4/xattr_trusted.c |7 ---
fs/ext4/xattr_user.c |9 +
fs/f2fs/xattr.c | 17 -
fs/gfs2/xattr.c |7 ---
fs/hfsplus/xattr.c |7 ---
fs/hfsplus/xattr.h |4 ++--
fs/hfsplus/xattr_security.c |7 ---
fs/hfsplus/xattr_trusted.c |7 ---
fs/hfsplus/xattr_user.c |7 ---
fs/jffs2/security.c |7 ---
fs/jffs2/xattr_trusted.c |7 ---
fs/jffs2/xattr_user.c|7 ---
fs/nfs/nfs4proc.c| 19 +--
fs/ocfs2/xattr.c | 23 +--
fs/posix_acl.c |6 +++---
fs/reiserfs/xattr.c |6 --
fs/reiserfs/xattr_security.c |8
fs/reiserfs/xattr_trusted.c |8
fs/reiserfs/xattr_user.c |8
fs/xattr.c |5 +++--
fs/xfs/xfs_xattr.c |7 ---
include/linux/xattr.h|5 +++--
33 files changed, 144 insertions(+), 119 deletions(-)
diff --git a/fs/9p/acl.c b/fs/9p/acl.c
index 938e1a4..0928d74 100644
--- a/fs/9p/acl.c
+++ b/fs/9p/acl.c
@@ -279,14 +279,13 @@ static int v9fs_remote_set_acl(struct dentry *dentry,
const char *name,
}
-static int v9fs_xattr_set_acl(struct dentry *dentry, const char *name,
- const void *value, size_t size,
- int flags, int type)
+static int v9fs_xattr_set_acl(struct dentry *dentry, struct inode *inode,
+ const char *name, const void *value,
+ size_t size, int flags, int type)
{
int retval;
struct posix_acl *acl;
struct v9fs_session_info *v9ses;
- struct inode *inode = dentry->d_inode;
if (strcmp(name, "") != 0)
return -EINVAL;
diff --git a/fs/9p/xattr_security.c b/fs/9p/xattr_security.c
index df692f9..242c1f8 100644
--- a/fs/9p/xattr_security.c
+++ b/fs/9p/xattr_security.c
@@ -47,8 +47,9 @@ static int v9fs_xattr_security_get(struct dentry *dentry,
struct inode *inode,
return retval;
}
-static int v9fs_xattr_security_set(struct dentry *dentry, const char *name,
- const void *value, size_t size, int flags, int type)
+static int v9fs_xattr_security_set(struct dentry *dentry, struct inode *inode,
+ const char *name, const void *value,
+ size_t size, int flags, int type)
{
int retval;
char *full_name;
diff --git a/fs/9p/xattr_trusted.c b/fs/9p/xattr_trusted.c
index acfadcf..a1fe7d9 100644
--- a/fs/9p/xattr_trusted.c
+++ b/fs/9p/xattr_trusted.c
@@ -47,8 +47,9 @@ static int v9fs_xattr_trusted_get(struct dentry *dentry,
struct inode *inode,
return retval;
}
-static int v9fs_xattr_trusted_set(struct dentry *dentry, const char *name,
- const void *value, size_t size, int flags, int type)
+static int v9fs_xattr_trusted_set(struct dentry *dentry, struct inode *inode,
+ const char *name, const void *value,
+ size_t size, int flags, int type)
{
int retval;
char *full_name;
diff --git a/fs/9p/xattr_user.c b/fs/9p/xattr_user.c
index 9b37675..7a34aca 100644
--- a/fs/9p/xattr_user.c
+++ b/fs/9p/xattr_user.c
@@ -47,8 +47,9 @@ static int v9fs_xattr_user_get(struct dentry *dentry, struct
inode *inode,
return retval;
}
-static int v9fs_xattr_user_set(struct dentry *dentry, const char *name,
- const void *value, size_t size, int flags, int type)
+static int v9fs_xattr_user_set(struct dentry *dentry, struct inode *inode,
+ const char *name, const void *value,
+ size_t size, int flags, int type)
{
int retval;
char *full_name;
diff --git a/fs/ext2/xattr_security.c b/fs/ext2/xattr_security.c
index 1d53da4..3ece525 100644
--- a/fs/ext2/xattr_security.c
+++ b/fs/ext2/xattr_security.c
@@ -33,12 +33,13 @@ ext2_xattr_security_get(struct dentry *unused, struct inode
*inode,
}
static int
-ext2_xattr_security_set(struct dentry *dentry, const char *name,
- const void
[PATCH 3.18.y 4/5] switch xattr_handler->set() to passing dentry and inode separately
From: Al Viro
preparation for similar switch in ->setxattr() (see the next commit for
rationale).
Signed-off-by: Al Viro
[sw0312.kim: backport to 3.18 including ext3]
Signed-off-by: Seung-Woo Kim
---
fs/9p/acl.c |7 +++
fs/9p/xattr_security.c |5 +++--
fs/9p/xattr_trusted.c|5 +++--
fs/9p/xattr_user.c |5 +++--
fs/ext2/xattr_security.c |7 ---
fs/ext2/xattr_trusted.c |7 ---
fs/ext2/xattr_user.c |9 +
fs/ext3/xattr_security.c |7 ---
fs/ext3/xattr_trusted.c |7 ---
fs/ext3/xattr_user.c |9 +
fs/ext4/xattr_security.c |7 ---
fs/ext4/xattr_trusted.c |7 ---
fs/ext4/xattr_user.c |9 +
fs/f2fs/xattr.c | 17 -
fs/gfs2/xattr.c |7 ---
fs/hfsplus/xattr.c |7 ---
fs/hfsplus/xattr.h |4 ++--
fs/hfsplus/xattr_security.c |7 ---
fs/hfsplus/xattr_trusted.c |7 ---
fs/hfsplus/xattr_user.c |7 ---
fs/jffs2/security.c |7 ---
fs/jffs2/xattr_trusted.c |7 ---
fs/jffs2/xattr_user.c|7 ---
fs/nfs/nfs4proc.c| 19 +--
fs/ocfs2/xattr.c | 23 +--
fs/posix_acl.c |6 +++---
fs/reiserfs/xattr.c |6 --
fs/reiserfs/xattr_security.c |8
fs/reiserfs/xattr_trusted.c |8
fs/reiserfs/xattr_user.c |8
fs/xattr.c |5 +++--
fs/xfs/xfs_xattr.c |7 ---
include/linux/xattr.h|5 +++--
33 files changed, 144 insertions(+), 119 deletions(-)
diff --git a/fs/9p/acl.c b/fs/9p/acl.c
index 938e1a4..0928d74 100644
--- a/fs/9p/acl.c
+++ b/fs/9p/acl.c
@@ -279,14 +279,13 @@ static int v9fs_remote_set_acl(struct dentry *dentry,
const char *name,
}
-static int v9fs_xattr_set_acl(struct dentry *dentry, const char *name,
- const void *value, size_t size,
- int flags, int type)
+static int v9fs_xattr_set_acl(struct dentry *dentry, struct inode *inode,
+ const char *name, const void *value,
+ size_t size, int flags, int type)
{
int retval;
struct posix_acl *acl;
struct v9fs_session_info *v9ses;
- struct inode *inode = dentry->d_inode;
if (strcmp(name, "") != 0)
return -EINVAL;
diff --git a/fs/9p/xattr_security.c b/fs/9p/xattr_security.c
index df692f9..242c1f8 100644
--- a/fs/9p/xattr_security.c
+++ b/fs/9p/xattr_security.c
@@ -47,8 +47,9 @@ static int v9fs_xattr_security_get(struct dentry *dentry,
struct inode *inode,
return retval;
}
-static int v9fs_xattr_security_set(struct dentry *dentry, const char *name,
- const void *value, size_t size, int flags, int type)
+static int v9fs_xattr_security_set(struct dentry *dentry, struct inode *inode,
+ const char *name, const void *value,
+ size_t size, int flags, int type)
{
int retval;
char *full_name;
diff --git a/fs/9p/xattr_trusted.c b/fs/9p/xattr_trusted.c
index acfadcf..a1fe7d9 100644
--- a/fs/9p/xattr_trusted.c
+++ b/fs/9p/xattr_trusted.c
@@ -47,8 +47,9 @@ static int v9fs_xattr_trusted_get(struct dentry *dentry,
struct inode *inode,
return retval;
}
-static int v9fs_xattr_trusted_set(struct dentry *dentry, const char *name,
- const void *value, size_t size, int flags, int type)
+static int v9fs_xattr_trusted_set(struct dentry *dentry, struct inode *inode,
+ const char *name, const void *value,
+ size_t size, int flags, int type)
{
int retval;
char *full_name;
diff --git a/fs/9p/xattr_user.c b/fs/9p/xattr_user.c
index 9b37675..7a34aca 100644
--- a/fs/9p/xattr_user.c
+++ b/fs/9p/xattr_user.c
@@ -47,8 +47,9 @@ static int v9fs_xattr_user_get(struct dentry *dentry, struct
inode *inode,
return retval;
}
-static int v9fs_xattr_user_set(struct dentry *dentry, const char *name,
- const void *value, size_t size, int flags, int type)
+static int v9fs_xattr_user_set(struct dentry *dentry, struct inode *inode,
+ const char *name, const void *value,
+ size_t size, int flags, int type)
{
int retval;
char *full_name;
diff --git a/fs/ext2/xattr_security.c b/fs/ext2/xattr_security.c
index 1d53da4..3ece525 100644
--- a/fs/ext2/xattr_security.c
+++ b/fs/ext2/xattr_security.c
@@ -33,12 +33,13 @@ ext2_xattr_security_get(struct dentry *unused, struct inode
*inode,
}
static int
-ext2_xattr_security_set(struct dentry *dentry, const char *name,
- const void
