1
Add a struct vfsmount parameter to vfs_getxattr()
3
Signed-off-by: Tony Jones <tonyj@suse.de>
4
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
7
===================================================================
10
@@ -378,11 +378,12 @@ out_nfserr:
11
#if defined(CONFIG_NFSD_V2_ACL) || \
12
defined(CONFIG_NFSD_V3_ACL) || \
13
defined(CONFIG_NFSD_V4)
14
-static ssize_t nfsd_getxattr(struct dentry *dentry, char *key, void **buf)
15
+static ssize_t nfsd_getxattr(struct dentry *dentry, struct vfsmount *mnt,
16
+ char *key, void **buf)
20
- buflen = vfs_getxattr(dentry, key, NULL, 0);
21
+ buflen = vfs_getxattr(dentry, mnt, key, NULL, 0);
25
@@ -390,7 +391,7 @@ static ssize_t nfsd_getxattr(struct dent
29
- return vfs_getxattr(dentry, key, *buf, buflen);
30
+ return vfs_getxattr(dentry, mnt, key, *buf, buflen);
34
@@ -476,13 +477,13 @@ out_nfserr:
37
static struct posix_acl *
38
-_get_posix_acl(struct dentry *dentry, char *key)
39
+_get_posix_acl(struct dentry *dentry, struct vfsmount *mnt, char *key)
42
struct posix_acl *pacl = NULL;
45
- buflen = nfsd_getxattr(dentry, key, &buf);
46
+ buflen = nfsd_getxattr(dentry, mnt, key, &buf);
50
@@ -494,14 +495,15 @@ _get_posix_acl(struct dentry *dentry, ch
54
-nfsd4_get_nfs4_acl(struct svc_rqst *rqstp, struct dentry *dentry, struct nfs4_acl **acl)
55
+nfsd4_get_nfs4_acl(struct svc_rqst *rqstp, struct dentry *dentry,
56
+ struct vfsmount *mnt, struct nfs4_acl **acl)
58
struct inode *inode = dentry->d_inode;
60
struct posix_acl *pacl = NULL, *dpacl = NULL;
61
unsigned int flags = 0;
63
- pacl = _get_posix_acl(dentry, POSIX_ACL_XATTR_ACCESS);
64
+ pacl = _get_posix_acl(dentry, mnt, POSIX_ACL_XATTR_ACCESS);
65
if (IS_ERR(pacl) && PTR_ERR(pacl) == -ENODATA)
66
pacl = posix_acl_from_mode(inode->i_mode, GFP_KERNEL);
68
@@ -511,7 +513,7 @@ nfsd4_get_nfs4_acl(struct svc_rqst *rqst
71
if (S_ISDIR(inode->i_mode)) {
72
- dpacl = _get_posix_acl(dentry, POSIX_ACL_XATTR_DEFAULT);
73
+ dpacl = _get_posix_acl(dentry, mnt, POSIX_ACL_XATTR_DEFAULT);
74
if (IS_ERR(dpacl) && PTR_ERR(dpacl) == -ENODATA)
76
else if (IS_ERR(dpacl)) {
77
@@ -1935,7 +1937,8 @@ nfsd_get_posix_acl(struct svc_fh *fhp, i
78
return ERR_PTR(-EOPNOTSUPP);
81
- size = nfsd_getxattr(fhp->fh_dentry, name, &value);
82
+ size = nfsd_getxattr(fhp->fh_dentry, fhp->fh_export->ex_mnt, name,
88
===================================================================
91
@@ -107,7 +107,8 @@ out:
92
EXPORT_SYMBOL_GPL(vfs_setxattr);
95
-vfs_getxattr(struct dentry *dentry, char *name, void *value, size_t size)
96
+vfs_getxattr(struct dentry *dentry, struct vfsmount *mnt, char *name,
97
+ void *value, size_t size)
99
struct inode *inode = dentry->d_inode;
101
@@ -279,7 +280,8 @@ sys_fsetxattr(int fd, char __user *name,
102
* Extended attribute GET operations
105
-getxattr(struct dentry *d, char __user *name, void __user *value, size_t size)
106
+getxattr(struct dentry *dentry, struct vfsmount *mnt, char __user *name,
107
+ void __user *value, size_t size)
111
@@ -299,7 +301,7 @@ getxattr(struct dentry *d, char __user *
115
- error = vfs_getxattr(d, kname, kvalue, size);
116
+ error = vfs_getxattr(dentry, mnt, kname, kvalue, size);
118
if (size && copy_to_user(value, kvalue, error))
120
@@ -322,7 +324,7 @@ sys_getxattr(char __user *path, char __u
121
error = user_path_walk(path, &nd);
124
- error = getxattr(nd.dentry, name, value, size);
125
+ error = getxattr(nd.dentry, nd.mnt, name, value, size);
129
@@ -337,7 +339,7 @@ sys_lgetxattr(char __user *path, char __
130
error = user_path_walk_link(path, &nd);
133
- error = getxattr(nd.dentry, name, value, size);
134
+ error = getxattr(nd.dentry, nd.mnt, name, value, size);
138
@@ -351,7 +353,7 @@ sys_fgetxattr(int fd, char __user *name,
142
- error = getxattr(f->f_path.dentry, name, value, size);
143
+ error = getxattr(f->f_path.dentry, f->f_path.mnt, name, value, size);
147
Index: b/include/linux/xattr.h
148
===================================================================
149
--- a/include/linux/xattr.h
150
+++ b/include/linux/xattr.h
151
@@ -46,7 +46,8 @@ struct xattr_handler {
152
size_t size, int flags);
155
-ssize_t vfs_getxattr(struct dentry *, char *, void *, size_t);
156
+ssize_t vfs_getxattr(struct dentry *, struct vfsmount *, char *, void *,
158
ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
159
int vfs_setxattr(struct dentry *, struct vfsmount *, char *, void *, size_t,
161
Index: b/fs/nfsd/nfs4xdr.c
162
===================================================================
163
--- a/fs/nfsd/nfs4xdr.c
164
+++ b/fs/nfsd/nfs4xdr.c
165
@@ -1472,7 +1472,7 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s
167
if (bmval0 & (FATTR4_WORD0_ACL | FATTR4_WORD0_ACLSUPPORT
168
| FATTR4_WORD0_SUPPORTED_ATTRS)) {
169
- err = nfsd4_get_nfs4_acl(rqstp, dentry, &acl);
170
+ err = nfsd4_get_nfs4_acl(rqstp, dentry, exp->ex_mnt, &acl);
171
aclsupport = (err == 0);
172
if (bmval0 & FATTR4_WORD0_ACL) {
173
if (err == -EOPNOTSUPP)
174
Index: b/include/linux/nfsd/nfsd.h
175
===================================================================
176
--- a/include/linux/nfsd/nfsd.h
177
+++ b/include/linux/nfsd/nfsd.h
178
@@ -77,7 +77,8 @@ __be32 nfsd_setattr(struct svc_rqst *,
179
#ifdef CONFIG_NFSD_V4
180
__be32 nfsd4_set_nfs4_acl(struct svc_rqst *, struct svc_fh *,
182
-int nfsd4_get_nfs4_acl(struct svc_rqst *, struct dentry *, struct nfs4_acl **);
183
+int nfsd4_get_nfs4_acl(struct svc_rqst *, struct dentry *,
184
+ struct vfsmount *mnt, struct nfs4_acl **);
185
#endif /* CONFIG_NFSD_V4 */
186
__be32 nfsd_create(struct svc_rqst *, struct svc_fh *,
187
char *name, int len, struct iattr *attrs,