mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 04:31:50 +00:00
5a0e3ad6af
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
268 lines
6.3 KiB
C
268 lines
6.3 KiB
C
/*
|
|
* Process version 3 NFSACL requests.
|
|
*
|
|
* Copyright (C) 2002-2003 Andreas Gruenbacher <agruen@suse.de>
|
|
*/
|
|
|
|
#include "nfsd.h"
|
|
/* FIXME: nfsacl.h is a broken header */
|
|
#include <linux/nfsacl.h>
|
|
#include <linux/gfp.h>
|
|
#include "cache.h"
|
|
#include "xdr3.h"
|
|
#include "vfs.h"
|
|
|
|
#define RETURN_STATUS(st) { resp->status = (st); return (st); }
|
|
|
|
/*
|
|
* NULL call.
|
|
*/
|
|
static __be32
|
|
nfsd3_proc_null(struct svc_rqst *rqstp, void *argp, void *resp)
|
|
{
|
|
return nfs_ok;
|
|
}
|
|
|
|
/*
|
|
* Get the Access and/or Default ACL of a file.
|
|
*/
|
|
static __be32 nfsd3_proc_getacl(struct svc_rqst * rqstp,
|
|
struct nfsd3_getaclargs *argp, struct nfsd3_getaclres *resp)
|
|
{
|
|
svc_fh *fh;
|
|
struct posix_acl *acl;
|
|
__be32 nfserr = 0;
|
|
|
|
fh = fh_copy(&resp->fh, &argp->fh);
|
|
nfserr = fh_verify(rqstp, &resp->fh, 0, NFSD_MAY_NOP);
|
|
if (nfserr)
|
|
RETURN_STATUS(nfserr);
|
|
|
|
if (argp->mask & ~(NFS_ACL|NFS_ACLCNT|NFS_DFACL|NFS_DFACLCNT))
|
|
RETURN_STATUS(nfserr_inval);
|
|
resp->mask = argp->mask;
|
|
|
|
if (resp->mask & (NFS_ACL|NFS_ACLCNT)) {
|
|
acl = nfsd_get_posix_acl(fh, ACL_TYPE_ACCESS);
|
|
if (IS_ERR(acl)) {
|
|
int err = PTR_ERR(acl);
|
|
|
|
if (err == -ENODATA || err == -EOPNOTSUPP)
|
|
acl = NULL;
|
|
else {
|
|
nfserr = nfserrno(err);
|
|
goto fail;
|
|
}
|
|
}
|
|
if (acl == NULL) {
|
|
/* Solaris returns the inode's minimum ACL. */
|
|
|
|
struct inode *inode = fh->fh_dentry->d_inode;
|
|
acl = posix_acl_from_mode(inode->i_mode, GFP_KERNEL);
|
|
}
|
|
resp->acl_access = acl;
|
|
}
|
|
if (resp->mask & (NFS_DFACL|NFS_DFACLCNT)) {
|
|
/* Check how Solaris handles requests for the Default ACL
|
|
of a non-directory! */
|
|
|
|
acl = nfsd_get_posix_acl(fh, ACL_TYPE_DEFAULT);
|
|
if (IS_ERR(acl)) {
|
|
int err = PTR_ERR(acl);
|
|
|
|
if (err == -ENODATA || err == -EOPNOTSUPP)
|
|
acl = NULL;
|
|
else {
|
|
nfserr = nfserrno(err);
|
|
goto fail;
|
|
}
|
|
}
|
|
resp->acl_default = acl;
|
|
}
|
|
|
|
/* resp->acl_{access,default} are released in nfs3svc_release_getacl. */
|
|
RETURN_STATUS(0);
|
|
|
|
fail:
|
|
posix_acl_release(resp->acl_access);
|
|
posix_acl_release(resp->acl_default);
|
|
RETURN_STATUS(nfserr);
|
|
}
|
|
|
|
/*
|
|
* Set the Access and/or Default ACL of a file.
|
|
*/
|
|
static __be32 nfsd3_proc_setacl(struct svc_rqst * rqstp,
|
|
struct nfsd3_setaclargs *argp,
|
|
struct nfsd3_attrstat *resp)
|
|
{
|
|
svc_fh *fh;
|
|
__be32 nfserr = 0;
|
|
|
|
fh = fh_copy(&resp->fh, &argp->fh);
|
|
nfserr = fh_verify(rqstp, &resp->fh, 0, NFSD_MAY_SATTR);
|
|
|
|
if (!nfserr) {
|
|
nfserr = nfserrno( nfsd_set_posix_acl(
|
|
fh, ACL_TYPE_ACCESS, argp->acl_access) );
|
|
}
|
|
if (!nfserr) {
|
|
nfserr = nfserrno( nfsd_set_posix_acl(
|
|
fh, ACL_TYPE_DEFAULT, argp->acl_default) );
|
|
}
|
|
|
|
/* argp->acl_{access,default} may have been allocated in
|
|
nfs3svc_decode_setaclargs. */
|
|
posix_acl_release(argp->acl_access);
|
|
posix_acl_release(argp->acl_default);
|
|
RETURN_STATUS(nfserr);
|
|
}
|
|
|
|
/*
|
|
* XDR decode functions
|
|
*/
|
|
static int nfs3svc_decode_getaclargs(struct svc_rqst *rqstp, __be32 *p,
|
|
struct nfsd3_getaclargs *args)
|
|
{
|
|
if (!(p = nfs3svc_decode_fh(p, &args->fh)))
|
|
return 0;
|
|
args->mask = ntohl(*p); p++;
|
|
|
|
return xdr_argsize_check(rqstp, p);
|
|
}
|
|
|
|
|
|
static int nfs3svc_decode_setaclargs(struct svc_rqst *rqstp, __be32 *p,
|
|
struct nfsd3_setaclargs *args)
|
|
{
|
|
struct kvec *head = rqstp->rq_arg.head;
|
|
unsigned int base;
|
|
int n;
|
|
|
|
if (!(p = nfs3svc_decode_fh(p, &args->fh)))
|
|
return 0;
|
|
args->mask = ntohl(*p++);
|
|
if (args->mask & ~(NFS_ACL|NFS_ACLCNT|NFS_DFACL|NFS_DFACLCNT) ||
|
|
!xdr_argsize_check(rqstp, p))
|
|
return 0;
|
|
|
|
base = (char *)p - (char *)head->iov_base;
|
|
n = nfsacl_decode(&rqstp->rq_arg, base, NULL,
|
|
(args->mask & NFS_ACL) ?
|
|
&args->acl_access : NULL);
|
|
if (n > 0)
|
|
n = nfsacl_decode(&rqstp->rq_arg, base + n, NULL,
|
|
(args->mask & NFS_DFACL) ?
|
|
&args->acl_default : NULL);
|
|
return (n > 0);
|
|
}
|
|
|
|
/*
|
|
* XDR encode functions
|
|
*/
|
|
|
|
/* GETACL */
|
|
static int nfs3svc_encode_getaclres(struct svc_rqst *rqstp, __be32 *p,
|
|
struct nfsd3_getaclres *resp)
|
|
{
|
|
struct dentry *dentry = resp->fh.fh_dentry;
|
|
|
|
p = nfs3svc_encode_post_op_attr(rqstp, p, &resp->fh);
|
|
if (resp->status == 0 && dentry && dentry->d_inode) {
|
|
struct inode *inode = dentry->d_inode;
|
|
struct kvec *head = rqstp->rq_res.head;
|
|
unsigned int base;
|
|
int n;
|
|
int w;
|
|
|
|
*p++ = htonl(resp->mask);
|
|
if (!xdr_ressize_check(rqstp, p))
|
|
return 0;
|
|
base = (char *)p - (char *)head->iov_base;
|
|
|
|
rqstp->rq_res.page_len = w = nfsacl_size(
|
|
(resp->mask & NFS_ACL) ? resp->acl_access : NULL,
|
|
(resp->mask & NFS_DFACL) ? resp->acl_default : NULL);
|
|
while (w > 0) {
|
|
if (!rqstp->rq_respages[rqstp->rq_resused++])
|
|
return 0;
|
|
w -= PAGE_SIZE;
|
|
}
|
|
|
|
n = nfsacl_encode(&rqstp->rq_res, base, inode,
|
|
resp->acl_access,
|
|
resp->mask & NFS_ACL, 0);
|
|
if (n > 0)
|
|
n = nfsacl_encode(&rqstp->rq_res, base + n, inode,
|
|
resp->acl_default,
|
|
resp->mask & NFS_DFACL,
|
|
NFS_ACL_DEFAULT);
|
|
if (n <= 0)
|
|
return 0;
|
|
} else
|
|
if (!xdr_ressize_check(rqstp, p))
|
|
return 0;
|
|
|
|
return 1;
|
|
}
|
|
|
|
/* SETACL */
|
|
static int nfs3svc_encode_setaclres(struct svc_rqst *rqstp, __be32 *p,
|
|
struct nfsd3_attrstat *resp)
|
|
{
|
|
p = nfs3svc_encode_post_op_attr(rqstp, p, &resp->fh);
|
|
|
|
return xdr_ressize_check(rqstp, p);
|
|
}
|
|
|
|
/*
|
|
* XDR release functions
|
|
*/
|
|
static int nfs3svc_release_getacl(struct svc_rqst *rqstp, __be32 *p,
|
|
struct nfsd3_getaclres *resp)
|
|
{
|
|
fh_put(&resp->fh);
|
|
posix_acl_release(resp->acl_access);
|
|
posix_acl_release(resp->acl_default);
|
|
return 1;
|
|
}
|
|
|
|
#define nfs3svc_decode_voidargs NULL
|
|
#define nfs3svc_release_void NULL
|
|
#define nfsd3_setaclres nfsd3_attrstat
|
|
#define nfsd3_voidres nfsd3_voidargs
|
|
struct nfsd3_voidargs { int dummy; };
|
|
|
|
#define PROC(name, argt, rest, relt, cache, respsize) \
|
|
{ (svc_procfunc) nfsd3_proc_##name, \
|
|
(kxdrproc_t) nfs3svc_decode_##argt##args, \
|
|
(kxdrproc_t) nfs3svc_encode_##rest##res, \
|
|
(kxdrproc_t) nfs3svc_release_##relt, \
|
|
sizeof(struct nfsd3_##argt##args), \
|
|
sizeof(struct nfsd3_##rest##res), \
|
|
0, \
|
|
cache, \
|
|
respsize, \
|
|
}
|
|
|
|
#define ST 1 /* status*/
|
|
#define AT 21 /* attributes */
|
|
#define pAT (1+AT) /* post attributes - conditional */
|
|
#define ACL (1+NFS_ACL_MAX_ENTRIES*3) /* Access Control List */
|
|
|
|
static struct svc_procedure nfsd_acl_procedures3[] = {
|
|
PROC(null, void, void, void, RC_NOCACHE, ST),
|
|
PROC(getacl, getacl, getacl, getacl, RC_NOCACHE, ST+1+2*(1+ACL)),
|
|
PROC(setacl, setacl, setacl, fhandle, RC_NOCACHE, ST+pAT),
|
|
};
|
|
|
|
struct svc_version nfsd_acl_version3 = {
|
|
.vs_vers = 3,
|
|
.vs_nproc = 3,
|
|
.vs_proc = nfsd_acl_procedures3,
|
|
.vs_dispatch = nfsd_dispatch,
|
|
.vs_xdrsize = NFS3_SVC_XDRSIZE,
|
|
.vs_hidden = 0,
|
|
};
|
|
|