2005-06-22 21:16:27 +04:00
# include <linux/fs.h>
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
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>
2010-03-24 11:04:11 +03:00
# include <linux/gfp.h>
2005-06-22 21:16:27 +04:00
# include <linux/nfs.h>
# include <linux/nfs3.h>
# include <linux/nfs_fs.h>
2005-06-29 07:44:58 +04:00
# include <linux/posix_acl_xattr.h>
2005-06-22 21:16:27 +04:00
# include <linux/nfsacl.h>
2008-06-12 01:39:04 +04:00
# include "internal.h"
2014-09-26 00:28:53 +04:00
# include "nfs3_fs.h"
2008-06-12 01:39:04 +04:00
2005-06-22 21:16:27 +04:00
# define NFSDBG_FACILITY NFSDBG_PROC
2016-03-24 16:38:37 +03:00
/*
* nfs3_prepare_get_acl , nfs3_complete_get_acl , nfs3_abort_get_acl : Helpers for
* caching get_acl results in a race - free way . See fs / posix_acl . c : get_acl ( )
* for explanations .
*/
static void nfs3_prepare_get_acl ( struct posix_acl * * p )
{
struct posix_acl * sentinel = uncached_acl_sentinel ( current ) ;
if ( cmpxchg ( p , ACL_NOT_CACHED , sentinel ) ! = ACL_NOT_CACHED ) {
/* Not the first reader or sentinel already in place. */
}
}
static void nfs3_complete_get_acl ( struct posix_acl * * p , struct posix_acl * acl )
{
struct posix_acl * sentinel = uncached_acl_sentinel ( current ) ;
/* Only cache the ACL if our sentinel is still in place. */
posix_acl_dup ( acl ) ;
if ( cmpxchg ( p , sentinel , acl ) ! = sentinel )
posix_acl_release ( acl ) ;
}
static void nfs3_abort_get_acl ( struct posix_acl * * p )
{
struct posix_acl * sentinel = uncached_acl_sentinel ( current ) ;
/* Remove our sentinel upon failure. */
cmpxchg ( p , sentinel , ACL_NOT_CACHED ) ;
}
2013-12-20 17:16:53 +04:00
struct posix_acl * nfs3_get_acl ( struct inode * inode , int type )
2005-06-22 21:16:27 +04:00
{
struct nfs_server * server = NFS_SERVER ( inode ) ;
struct page * pages [ NFSACL_MAXPAGES ] = { } ;
struct nfs3_getaclargs args = {
. fh = NFS_FH ( inode ) ,
/* The xdr layer may allocate pages here. */
. pages = pages ,
} ;
struct nfs3_getaclres res = {
2012-03-11 21:11:00 +04:00
NULL ,
2005-06-22 21:16:27 +04:00
} ;
2006-03-20 21:44:23 +03:00
struct rpc_message msg = {
. rpc_argp = & args ,
. rpc_resp = & res ,
} ;
2005-06-22 21:16:27 +04:00
int status , count ;
if ( ! nfs_server_capable ( inode , NFS_CAP_ACLS ) )
return ERR_PTR ( - EOPNOTSUPP ) ;
2005-06-22 21:16:27 +04:00
status = nfs_revalidate_inode ( server , inode ) ;
if ( status < 0 )
return ERR_PTR ( status ) ;
2005-06-22 21:16:27 +04:00
2005-06-22 21:16:27 +04:00
/*
* Only get the access acl when explicitly requested : We don ' t
* need it for access decisions , and only some applications use
* it . Applications which request the access acl first are not
* penalized from this optimization .
*/
if ( type = = ACL_TYPE_ACCESS )
args . mask | = NFS_ACLCNT | NFS_ACL ;
if ( S_ISDIR ( inode - > i_mode ) )
args . mask | = NFS_DFACLCNT | NFS_DFACL ;
if ( args . mask = = 0 )
return NULL ;
2005-06-22 21:16:27 +04:00
dprintk ( " NFS call getacl \n " ) ;
2006-03-20 21:44:23 +03:00
msg . rpc_proc = & server - > client_acl - > cl_procinfo [ ACLPROC3_GETACL ] ;
2010-04-17 00:22:52 +04:00
res . fattr = nfs_alloc_fattr ( ) ;
if ( res . fattr = = NULL )
return ERR_PTR ( - ENOMEM ) ;
2016-03-24 16:38:37 +03:00
if ( args . mask & NFS_ACL )
nfs3_prepare_get_acl ( & inode - > i_acl ) ;
if ( args . mask & NFS_DFACL )
nfs3_prepare_get_acl ( & inode - > i_default_acl ) ;
2006-03-20 21:44:23 +03:00
status = rpc_call_sync ( server - > client_acl , & msg , 0 ) ;
2005-06-22 21:16:27 +04:00
dprintk ( " NFS reply getacl: %d \n " , status ) ;
/* pages may have been allocated at the xdr layer. */
for ( count = 0 ; count < NFSACL_MAXPAGES & & args . pages [ count ] ; count + + )
__free_page ( args . pages [ count ] ) ;
switch ( status ) {
case 0 :
2010-04-17 00:22:52 +04:00
status = nfs_refresh_inode ( inode , res . fattr ) ;
2005-06-22 21:16:27 +04:00
break ;
case - EPFNOSUPPORT :
case - EPROTONOSUPPORT :
dprintk ( " NFS_V3_ACL extension not supported; disabling \n " ) ;
server - > caps & = ~ NFS_CAP_ACLS ;
case - ENOTSUPP :
status = - EOPNOTSUPP ;
default :
goto getout ;
}
if ( ( args . mask & res . mask ) ! = args . mask ) {
status = - EIO ;
goto getout ;
}
if ( res . acl_access ! = NULL ) {
2014-01-31 06:31:12 +04:00
if ( ( posix_acl_equiv_mode ( res . acl_access , NULL ) = = 0 ) | |
2013-12-20 17:16:53 +04:00
res . acl_access - > a_count = = 0 ) {
2005-06-22 21:16:27 +04:00
posix_acl_release ( res . acl_access ) ;
res . acl_access = NULL ;
}
}
2013-12-20 17:16:53 +04:00
if ( res . mask & NFS_ACL )
2016-03-24 16:38:37 +03:00
nfs3_complete_get_acl ( & inode - > i_acl , res . acl_access ) ;
2013-12-20 17:16:53 +04:00
else
forget_cached_acl ( inode , ACL_TYPE_ACCESS ) ;
2005-06-22 21:16:27 +04:00
2013-12-20 17:16:53 +04:00
if ( res . mask & NFS_DFACL )
2016-03-24 16:38:37 +03:00
nfs3_complete_get_acl ( & inode - > i_default_acl , res . acl_default ) ;
2013-12-20 17:16:53 +04:00
else
forget_cached_acl ( inode , ACL_TYPE_DEFAULT ) ;
nfs_free_fattr ( res . fattr ) ;
if ( type = = ACL_TYPE_ACCESS ) {
posix_acl_release ( res . acl_default ) ;
return res . acl_access ;
} else {
posix_acl_release ( res . acl_access ) ;
return res . acl_default ;
2005-06-22 21:16:27 +04:00
}
getout :
2016-03-24 16:38:37 +03:00
nfs3_abort_get_acl ( & inode - > i_acl ) ;
nfs3_abort_get_acl ( & inode - > i_default_acl ) ;
2005-06-22 21:16:27 +04:00
posix_acl_release ( res . acl_access ) ;
posix_acl_release ( res . acl_default ) ;
2010-04-17 00:22:52 +04:00
nfs_free_fattr ( res . fattr ) ;
2013-12-20 17:16:53 +04:00
return ERR_PTR ( status ) ;
2005-06-22 21:16:27 +04:00
}
2014-02-02 23:36:42 +04:00
static int __nfs3_proc_setacls ( struct inode * inode , struct posix_acl * acl ,
2013-12-20 17:16:53 +04:00
struct posix_acl * dfacl )
2005-06-22 21:16:27 +04:00
{
struct nfs_server * server = NFS_SERVER ( inode ) ;
2010-04-17 00:22:52 +04:00
struct nfs_fattr * fattr ;
2009-03-11 03:33:18 +03:00
struct page * pages [ NFSACL_MAXPAGES ] ;
2005-06-22 21:16:27 +04:00
struct nfs3_setaclargs args = {
. inode = inode ,
. mask = NFS_ACL ,
. acl_access = acl ,
. pages = pages ,
} ;
2006-03-20 21:44:23 +03:00
struct rpc_message msg = {
. rpc_argp = & args ,
. rpc_resp = & fattr ,
} ;
2014-08-24 22:46:48 +04:00
int status = 0 ;
if ( acl = = NULL & & ( ! S_ISDIR ( inode - > i_mode ) | | dfacl = = NULL ) )
goto out ;
2005-06-22 21:16:27 +04:00
status = - EOPNOTSUPP ;
if ( ! nfs_server_capable ( inode , NFS_CAP_ACLS ) )
goto out ;
2011-01-21 06:05:38 +03:00
/* We are doing this here because XDR marshalling does not
* return any results , it BUGs . */
2005-06-22 21:16:27 +04:00
status = - ENOSPC ;
if ( acl ! = NULL & & acl - > a_count > NFS_ACL_MAX_ENTRIES )
goto out ;
if ( dfacl ! = NULL & & dfacl - > a_count > NFS_ACL_MAX_ENTRIES )
goto out ;
if ( S_ISDIR ( inode - > i_mode ) ) {
args . mask | = NFS_DFACL ;
args . acl_default = dfacl ;
2009-03-11 03:33:18 +03:00
args . len = nfsacl_size ( acl , dfacl ) ;
} else
args . len = nfsacl_size ( acl , NULL ) ;
if ( args . len > NFS_ACL_INLINE_BUFSIZE ) {
unsigned int npages = 1 + ( ( args . len - 1 ) > > PAGE_SHIFT ) ;
status = - ENOMEM ;
do {
args . pages [ args . npages ] = alloc_page ( GFP_KERNEL ) ;
if ( args . pages [ args . npages ] = = NULL )
goto out_freepages ;
args . npages + + ;
} while ( args . npages < npages ) ;
2005-06-22 21:16:27 +04:00
}
dprintk ( " NFS call setacl \n " ) ;
2010-04-17 00:22:52 +04:00
status = - ENOMEM ;
fattr = nfs_alloc_fattr ( ) ;
if ( fattr = = NULL )
goto out_freepages ;
2006-03-20 21:44:23 +03:00
msg . rpc_proc = & server - > client_acl - > cl_procinfo [ ACLPROC3_SETACL ] ;
2010-04-17 00:22:52 +04:00
msg . rpc_resp = fattr ;
2006-03-20 21:44:23 +03:00
status = rpc_call_sync ( server - > client_acl , & msg , 0 ) ;
2008-06-12 01:39:04 +04:00
nfs_access_zap_cache ( inode ) ;
nfs_zap_acl_cache ( inode ) ;
2005-06-22 21:16:27 +04:00
dprintk ( " NFS reply setacl: %d \n " , status ) ;
switch ( status ) {
case 0 :
2010-04-17 00:22:52 +04:00
status = nfs_refresh_inode ( inode , fattr ) ;
2013-12-20 17:16:53 +04:00
set_cached_acl ( inode , ACL_TYPE_ACCESS , acl ) ;
set_cached_acl ( inode , ACL_TYPE_DEFAULT , dfacl ) ;
2005-06-22 21:16:27 +04:00
break ;
case - EPFNOSUPPORT :
case - EPROTONOSUPPORT :
dprintk ( " NFS_V3_ACL SETACL RPC not supported "
" (will not retry) \n " ) ;
server - > caps & = ~ NFS_CAP_ACLS ;
case - ENOTSUPP :
status = - EOPNOTSUPP ;
}
2010-04-17 00:22:52 +04:00
nfs_free_fattr ( fattr ) ;
2009-03-11 03:33:18 +03:00
out_freepages :
while ( args . npages ! = 0 ) {
args . npages - - ;
__free_page ( args . pages [ args . npages ] ) ;
}
2005-06-22 21:16:27 +04:00
out :
return status ;
}
2014-02-02 23:36:42 +04:00
int nfs3_proc_setacls ( struct inode * inode , struct posix_acl * acl ,
struct posix_acl * dfacl )
{
int ret ;
ret = __nfs3_proc_setacls ( inode , acl , dfacl ) ;
return ( ret = = - EOPNOTSUPP ) ? 0 : ret ;
}
2013-12-20 17:16:53 +04:00
int nfs3_set_acl ( struct inode * inode , struct posix_acl * acl , int type )
2005-06-22 21:16:27 +04:00
{
struct posix_acl * alloc = NULL , * dfacl = NULL ;
int status ;
if ( S_ISDIR ( inode - > i_mode ) ) {
switch ( type ) {
2013-12-20 17:16:53 +04:00
case ACL_TYPE_ACCESS :
alloc = dfacl = get_acl ( inode , ACL_TYPE_DEFAULT ) ;
if ( IS_ERR ( alloc ) )
goto fail ;
break ;
case ACL_TYPE_DEFAULT :
dfacl = acl ;
alloc = acl = get_acl ( inode , ACL_TYPE_ACCESS ) ;
if ( IS_ERR ( alloc ) )
goto fail ;
break ;
2005-06-22 21:16:27 +04:00
}
2013-12-20 17:16:53 +04:00
}
2005-06-22 21:16:27 +04:00
if ( acl = = NULL ) {
alloc = acl = posix_acl_from_mode ( inode - > i_mode , GFP_KERNEL ) ;
if ( IS_ERR ( alloc ) )
goto fail ;
}
2014-02-02 23:36:42 +04:00
status = __nfs3_proc_setacls ( inode , acl , dfacl ) ;
2005-06-22 21:16:27 +04:00
posix_acl_release ( alloc ) ;
return status ;
fail :
return PTR_ERR ( alloc ) ;
}
2005-06-22 21:16:27 +04:00
2013-12-20 17:16:53 +04:00
const struct xattr_handler * nfs3_xattr_handlers [ ] = {
& posix_acl_access_xattr_handler ,
& posix_acl_default_xattr_handler ,
NULL ,
} ;
2014-06-18 13:07:03 +04:00
static int
nfs3_list_one_acl ( struct inode * inode , int type , const char * name , void * data ,
size_t size , ssize_t * result )
{
struct posix_acl * acl ;
char * p = data + * result ;
acl = get_acl ( inode , type ) ;
2014-07-26 15:58:01 +04:00
if ( IS_ERR_OR_NULL ( acl ) )
2014-06-18 13:07:03 +04:00
return 0 ;
posix_acl_release ( acl ) ;
* result + = strlen ( name ) ;
* result + = 1 ;
if ( ! size )
return 0 ;
if ( * result > size )
return - ERANGE ;
strcpy ( p , name ) ;
return 0 ;
}
ssize_t
nfs3_listxattr ( struct dentry * dentry , char * data , size_t size )
{
2015-03-18 01:25:59 +03:00
struct inode * inode = d_inode ( dentry ) ;
2014-06-18 13:07:03 +04:00
ssize_t result = 0 ;
int error ;
error = nfs3_list_one_acl ( inode , ACL_TYPE_ACCESS ,
2015-12-02 16:44:35 +03:00
XATTR_NAME_POSIX_ACL_ACCESS , data , size , & result ) ;
2014-06-18 13:07:03 +04:00
if ( error )
return error ;
error = nfs3_list_one_acl ( inode , ACL_TYPE_DEFAULT ,
2015-12-02 16:44:35 +03:00
XATTR_NAME_POSIX_ACL_DEFAULT , data , size , & result ) ;
2014-06-18 13:07:03 +04:00
if ( error )
return error ;
return result ;
}