mirror of
https://github.com/torvalds/linux.git
synced 2024-12-05 10:32:35 +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>
293 lines
6.4 KiB
C
293 lines
6.4 KiB
C
/* CacheFiles extended attribute management
|
|
*
|
|
* Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
|
|
* Written by David Howells (dhowells@redhat.com)
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public Licence
|
|
* as published by the Free Software Foundation; either version
|
|
* 2 of the Licence, or (at your option) any later version.
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/sched.h>
|
|
#include <linux/file.h>
|
|
#include <linux/fs.h>
|
|
#include <linux/fsnotify.h>
|
|
#include <linux/quotaops.h>
|
|
#include <linux/xattr.h>
|
|
#include <linux/slab.h>
|
|
#include "internal.h"
|
|
|
|
static const char cachefiles_xattr_cache[] =
|
|
XATTR_USER_PREFIX "CacheFiles.cache";
|
|
|
|
/*
|
|
* check the type label on an object
|
|
* - done using xattrs
|
|
*/
|
|
int cachefiles_check_object_type(struct cachefiles_object *object)
|
|
{
|
|
struct dentry *dentry = object->dentry;
|
|
char type[3], xtype[3];
|
|
int ret;
|
|
|
|
ASSERT(dentry);
|
|
ASSERT(dentry->d_inode);
|
|
|
|
if (!object->fscache.cookie)
|
|
strcpy(type, "C3");
|
|
else
|
|
snprintf(type, 3, "%02x", object->fscache.cookie->def->type);
|
|
|
|
_enter("%p{%s}", object, type);
|
|
|
|
/* attempt to install a type label directly */
|
|
ret = vfs_setxattr(dentry, cachefiles_xattr_cache, type, 2,
|
|
XATTR_CREATE);
|
|
if (ret == 0) {
|
|
_debug("SET"); /* we succeeded */
|
|
goto error;
|
|
}
|
|
|
|
if (ret != -EEXIST) {
|
|
kerror("Can't set xattr on %*.*s [%lu] (err %d)",
|
|
dentry->d_name.len, dentry->d_name.len,
|
|
dentry->d_name.name, dentry->d_inode->i_ino,
|
|
-ret);
|
|
goto error;
|
|
}
|
|
|
|
/* read the current type label */
|
|
ret = vfs_getxattr(dentry, cachefiles_xattr_cache, xtype, 3);
|
|
if (ret < 0) {
|
|
if (ret == -ERANGE)
|
|
goto bad_type_length;
|
|
|
|
kerror("Can't read xattr on %*.*s [%lu] (err %d)",
|
|
dentry->d_name.len, dentry->d_name.len,
|
|
dentry->d_name.name, dentry->d_inode->i_ino,
|
|
-ret);
|
|
goto error;
|
|
}
|
|
|
|
/* check the type is what we're expecting */
|
|
if (ret != 2)
|
|
goto bad_type_length;
|
|
|
|
if (xtype[0] != type[0] || xtype[1] != type[1])
|
|
goto bad_type;
|
|
|
|
ret = 0;
|
|
|
|
error:
|
|
_leave(" = %d", ret);
|
|
return ret;
|
|
|
|
bad_type_length:
|
|
kerror("Cache object %lu type xattr length incorrect",
|
|
dentry->d_inode->i_ino);
|
|
ret = -EIO;
|
|
goto error;
|
|
|
|
bad_type:
|
|
xtype[2] = 0;
|
|
kerror("Cache object %*.*s [%lu] type %s not %s",
|
|
dentry->d_name.len, dentry->d_name.len,
|
|
dentry->d_name.name, dentry->d_inode->i_ino,
|
|
xtype, type);
|
|
ret = -EIO;
|
|
goto error;
|
|
}
|
|
|
|
/*
|
|
* set the state xattr on a cache file
|
|
*/
|
|
int cachefiles_set_object_xattr(struct cachefiles_object *object,
|
|
struct cachefiles_xattr *auxdata)
|
|
{
|
|
struct dentry *dentry = object->dentry;
|
|
int ret;
|
|
|
|
ASSERT(object->fscache.cookie);
|
|
ASSERT(dentry);
|
|
|
|
_enter("%p,#%d", object, auxdata->len);
|
|
|
|
/* attempt to install the cache metadata directly */
|
|
_debug("SET %s #%u", object->fscache.cookie->def->name, auxdata->len);
|
|
|
|
ret = vfs_setxattr(dentry, cachefiles_xattr_cache,
|
|
&auxdata->type, auxdata->len,
|
|
XATTR_CREATE);
|
|
if (ret < 0 && ret != -ENOMEM)
|
|
cachefiles_io_error_obj(
|
|
object,
|
|
"Failed to set xattr with error %d", ret);
|
|
|
|
_leave(" = %d", ret);
|
|
return ret;
|
|
}
|
|
|
|
/*
|
|
* update the state xattr on a cache file
|
|
*/
|
|
int cachefiles_update_object_xattr(struct cachefiles_object *object,
|
|
struct cachefiles_xattr *auxdata)
|
|
{
|
|
struct dentry *dentry = object->dentry;
|
|
int ret;
|
|
|
|
ASSERT(object->fscache.cookie);
|
|
ASSERT(dentry);
|
|
|
|
_enter("%p,#%d", object, auxdata->len);
|
|
|
|
/* attempt to install the cache metadata directly */
|
|
_debug("SET %s #%u", object->fscache.cookie->def->name, auxdata->len);
|
|
|
|
ret = vfs_setxattr(dentry, cachefiles_xattr_cache,
|
|
&auxdata->type, auxdata->len,
|
|
XATTR_REPLACE);
|
|
if (ret < 0 && ret != -ENOMEM)
|
|
cachefiles_io_error_obj(
|
|
object,
|
|
"Failed to update xattr with error %d", ret);
|
|
|
|
_leave(" = %d", ret);
|
|
return ret;
|
|
}
|
|
|
|
/*
|
|
* check the state xattr on a cache file
|
|
* - return -ESTALE if the object should be deleted
|
|
*/
|
|
int cachefiles_check_object_xattr(struct cachefiles_object *object,
|
|
struct cachefiles_xattr *auxdata)
|
|
{
|
|
struct cachefiles_xattr *auxbuf;
|
|
struct dentry *dentry = object->dentry;
|
|
int ret;
|
|
|
|
_enter("%p,#%d", object, auxdata->len);
|
|
|
|
ASSERT(dentry);
|
|
ASSERT(dentry->d_inode);
|
|
|
|
auxbuf = kmalloc(sizeof(struct cachefiles_xattr) + 512, GFP_KERNEL);
|
|
if (!auxbuf) {
|
|
_leave(" = -ENOMEM");
|
|
return -ENOMEM;
|
|
}
|
|
|
|
/* read the current type label */
|
|
ret = vfs_getxattr(dentry, cachefiles_xattr_cache,
|
|
&auxbuf->type, 512 + 1);
|
|
if (ret < 0) {
|
|
if (ret == -ENODATA)
|
|
goto stale; /* no attribute - power went off
|
|
* mid-cull? */
|
|
|
|
if (ret == -ERANGE)
|
|
goto bad_type_length;
|
|
|
|
cachefiles_io_error_obj(object,
|
|
"Can't read xattr on %lu (err %d)",
|
|
dentry->d_inode->i_ino, -ret);
|
|
goto error;
|
|
}
|
|
|
|
/* check the on-disk object */
|
|
if (ret < 1)
|
|
goto bad_type_length;
|
|
|
|
if (auxbuf->type != auxdata->type)
|
|
goto stale;
|
|
|
|
auxbuf->len = ret;
|
|
|
|
/* consult the netfs */
|
|
if (object->fscache.cookie->def->check_aux) {
|
|
enum fscache_checkaux result;
|
|
unsigned int dlen;
|
|
|
|
dlen = auxbuf->len - 1;
|
|
|
|
_debug("checkaux %s #%u",
|
|
object->fscache.cookie->def->name, dlen);
|
|
|
|
result = fscache_check_aux(&object->fscache,
|
|
&auxbuf->data, dlen);
|
|
|
|
switch (result) {
|
|
/* entry okay as is */
|
|
case FSCACHE_CHECKAUX_OKAY:
|
|
goto okay;
|
|
|
|
/* entry requires update */
|
|
case FSCACHE_CHECKAUX_NEEDS_UPDATE:
|
|
break;
|
|
|
|
/* entry requires deletion */
|
|
case FSCACHE_CHECKAUX_OBSOLETE:
|
|
goto stale;
|
|
|
|
default:
|
|
BUG();
|
|
}
|
|
|
|
/* update the current label */
|
|
ret = vfs_setxattr(dentry, cachefiles_xattr_cache,
|
|
&auxdata->type, auxdata->len,
|
|
XATTR_REPLACE);
|
|
if (ret < 0) {
|
|
cachefiles_io_error_obj(object,
|
|
"Can't update xattr on %lu"
|
|
" (error %d)",
|
|
dentry->d_inode->i_ino, -ret);
|
|
goto error;
|
|
}
|
|
}
|
|
|
|
okay:
|
|
ret = 0;
|
|
|
|
error:
|
|
kfree(auxbuf);
|
|
_leave(" = %d", ret);
|
|
return ret;
|
|
|
|
bad_type_length:
|
|
kerror("Cache object %lu xattr length incorrect",
|
|
dentry->d_inode->i_ino);
|
|
ret = -EIO;
|
|
goto error;
|
|
|
|
stale:
|
|
ret = -ESTALE;
|
|
goto error;
|
|
}
|
|
|
|
/*
|
|
* remove the object's xattr to mark it stale
|
|
*/
|
|
int cachefiles_remove_object_xattr(struct cachefiles_cache *cache,
|
|
struct dentry *dentry)
|
|
{
|
|
int ret;
|
|
|
|
ret = vfs_removexattr(dentry, cachefiles_xattr_cache);
|
|
if (ret < 0) {
|
|
if (ret == -ENOENT || ret == -ENODATA)
|
|
ret = 0;
|
|
else if (ret != -ENOMEM)
|
|
cachefiles_io_error(cache,
|
|
"Can't remove xattr from %lu"
|
|
" (error %d)",
|
|
dentry->d_inode->i_ino, -ret);
|
|
}
|
|
|
|
_leave(" = %d", ret);
|
|
return ret;
|
|
}
|