Commit c5230112 authored by Marius Aamodt Eriksen's avatar Marius Aamodt Eriksen Committed by Trond Myklebust

Add hooks into the NFSv4 XDR code to make use of the new uid/gid

mapper upcall mechanism.
parent 8e8c637b
...@@ -596,11 +596,13 @@ nfs4_do_open(struct inode *dir, struct qstr *name, int flags, ...@@ -596,11 +596,13 @@ nfs4_do_open(struct inode *dir, struct qstr *name, int flags,
.name = name, .name = name,
.f_getattr = &f_getattr, .f_getattr = &f_getattr,
.d_getattr = &d_getattr, .d_getattr = &d_getattr,
.server = server,
}; };
struct nfs_openres o_res = { struct nfs_openres o_res = {
.cinfo = &d_cinfo, .cinfo = &d_cinfo,
.f_getattr = &f_getattr, .f_getattr = &f_getattr,
.d_getattr = &d_getattr, .d_getattr = &d_getattr,
.server = server,
}; };
struct rpc_message msg = { struct rpc_message msg = {
.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_OPEN], .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_OPEN],
...@@ -685,9 +687,11 @@ nfs4_do_setattr(struct nfs_server *server, struct nfs_fattr *fattr, ...@@ -685,9 +687,11 @@ nfs4_do_setattr(struct nfs_server *server, struct nfs_fattr *fattr,
.fh = fhandle, .fh = fhandle,
.iap = sattr, .iap = sattr,
.attr = &getattr, .attr = &getattr,
.server = server,
}; };
struct nfs_setattrres res = { struct nfs_setattrres res = {
.attr = &getattr, .attr = &getattr,
.server = server,
}; };
struct rpc_message msg = { struct rpc_message msg = {
.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_SETATTR], .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_SETATTR],
......
This diff is collapsed.
...@@ -105,6 +105,7 @@ struct nfs_openargs { ...@@ -105,6 +105,7 @@ struct nfs_openargs {
struct qstr * name; struct qstr * name;
struct nfs4_getattr * f_getattr; struct nfs4_getattr * f_getattr;
struct nfs4_getattr * d_getattr; struct nfs4_getattr * d_getattr;
struct nfs_server * server; /* Needed for ID mapping */
}; };
struct nfs_openres { struct nfs_openres {
...@@ -115,6 +116,7 @@ struct nfs_openres { ...@@ -115,6 +116,7 @@ struct nfs_openres {
__u32 rflags; __u32 rflags;
struct nfs4_getattr * f_getattr; struct nfs4_getattr * f_getattr;
struct nfs4_getattr * d_getattr; struct nfs4_getattr * d_getattr;
struct nfs_server * server;
}; };
/* /*
...@@ -248,10 +250,12 @@ struct nfs_setattrargs { ...@@ -248,10 +250,12 @@ struct nfs_setattrargs {
nfs4_stateid stateid; nfs4_stateid stateid;
struct iattr * iap; struct iattr * iap;
struct nfs4_getattr * attr; struct nfs4_getattr * attr;
struct nfs_server * server; /* Needed for name mapping */
}; };
struct nfs_setattrres { struct nfs_setattrres {
struct nfs4_getattr * attr; struct nfs4_getattr * attr;
struct nfs_server * server;
}; };
struct nfs_linkargs { struct nfs_linkargs {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment