original development tree for Linux kernel GTP module; now long in mainline.
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

277 lines
5.8 KiB

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>
12 years ago
  1. /*
  2. * Copyright (C) 2007 Red Hat. All rights reserved.
  3. *
  4. * This program is free software; you can redistribute it and/or
  5. * modify it under the terms of the GNU General Public
  6. * License v2 as published by the Free Software Foundation.
  7. *
  8. * This program is distributed in the hope that it will be useful,
  9. * but WITHOUT ANY WARRANTY; without even the implied warranty of
  10. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  11. * General Public License for more details.
  12. *
  13. * You should have received a copy of the GNU General Public
  14. * License along with this program; if not, write to the
  15. * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  16. * Boston, MA 021110-1307, USA.
  17. */
  18. #include <linux/fs.h>
  19. #include <linux/string.h>
  20. #include <linux/xattr.h>
  21. #include <linux/posix_acl_xattr.h>
  22. #include <linux/posix_acl.h>
  23. #include <linux/sched.h>
  24. #include <linux/slab.h>
  25. #include "ctree.h"
  26. #include "btrfs_inode.h"
  27. #include "xattr.h"
  28. struct posix_acl *btrfs_get_acl(struct inode *inode, int type)
  29. {
  30. int size;
  31. const char *name;
  32. char *value = NULL;
  33. struct posix_acl *acl;
  34. if (!IS_POSIXACL(inode))
  35. return NULL;
  36. acl = get_cached_acl(inode, type);
  37. if (acl != ACL_NOT_CACHED)
  38. return acl;
  39. switch (type) {
  40. case ACL_TYPE_ACCESS:
  41. name = POSIX_ACL_XATTR_ACCESS;
  42. break;
  43. case ACL_TYPE_DEFAULT:
  44. name = POSIX_ACL_XATTR_DEFAULT;
  45. break;
  46. default:
  47. BUG();
  48. }
  49. size = __btrfs_getxattr(inode, name, "", 0);
  50. if (size > 0) {
  51. value = kzalloc(size, GFP_NOFS);
  52. if (!value)
  53. return ERR_PTR(-ENOMEM);
  54. size = __btrfs_getxattr(inode, name, value, size);
  55. }
  56. if (size > 0) {
  57. acl = posix_acl_from_xattr(&init_user_ns, value, size);
  58. } else if (size == -ENOENT || size == -ENODATA || size == 0) {
  59. /* FIXME, who returns -ENOENT? I think nobody */
  60. acl = NULL;
  61. } else {
  62. acl = ERR_PTR(-EIO);
  63. }
  64. kfree(value);
  65. if (!IS_ERR(acl))
  66. set_cached_acl(inode, type, acl);
  67. return acl;
  68. }
  69. static int btrfs_xattr_acl_get(struct dentry *dentry, const char *name,
  70. void *value, size_t size, int type)
  71. {
  72. struct posix_acl *acl;
  73. int ret = 0;
  74. if (!IS_POSIXACL(dentry->d_inode))
  75. return -EOPNOTSUPP;
  76. acl = btrfs_get_acl(dentry->d_inode, type);
  77. if (IS_ERR(acl))
  78. return PTR_ERR(acl);
  79. if (acl == NULL)
  80. return -ENODATA;
  81. ret = posix_acl_to_xattr(&init_user_ns, acl, value, size);
  82. posix_acl_release(acl);
  83. return ret;
  84. }
  85. /*
  86. * Needs to be called with fs_mutex held
  87. */
  88. static int btrfs_set_acl(struct btrfs_trans_handle *trans,
  89. struct inode *inode, struct posix_acl *acl, int type)
  90. {
  91. int ret, size = 0;
  92. const char *name;
  93. char *value = NULL;
  94. if (acl) {
  95. ret = posix_acl_valid(acl);
  96. if (ret < 0)
  97. return ret;
  98. ret = 0;
  99. }
  100. switch (type) {
  101. case ACL_TYPE_ACCESS:
  102. name = POSIX_ACL_XATTR_ACCESS;
  103. if (acl) {
  104. ret = posix_acl_equiv_mode(acl, &inode->i_mode);
  105. if (ret < 0)
  106. return ret;
  107. }
  108. ret = 0;
  109. break;
  110. case ACL_TYPE_DEFAULT:
  111. if (!S_ISDIR(inode->i_mode))
  112. return acl ? -EINVAL : 0;
  113. name = POSIX_ACL_XATTR_DEFAULT;
  114. break;
  115. default:
  116. return -EINVAL;
  117. }
  118. if (acl) {
  119. size = posix_acl_xattr_size(acl->a_count);
  120. value = kmalloc(size, GFP_NOFS);
  121. if (!value) {
  122. ret = -ENOMEM;
  123. goto out;
  124. }
  125. ret = posix_acl_to_xattr(&init_user_ns, acl, value, size);
  126. if (ret < 0)
  127. goto out;
  128. }
  129. ret = __btrfs_setxattr(trans, inode, name, value, size, 0);
  130. out:
  131. kfree(value);
  132. if (!ret)
  133. set_cached_acl(inode, type, acl);
  134. return ret;
  135. }
  136. static int btrfs_xattr_acl_set(struct dentry *dentry, const char *name,
  137. const void *value, size_t size, int flags, int type)
  138. {
  139. int ret;
  140. struct posix_acl *acl = NULL;
  141. if (!inode_owner_or_capable(dentry->d_inode))
  142. return -EPERM;
  143. if (!IS_POSIXACL(dentry->d_inode))
  144. return -EOPNOTSUPP;
  145. if (value) {
  146. acl = posix_acl_from_xattr(&init_user_ns, value, size);
  147. if (IS_ERR(acl))
  148. return PTR_ERR(acl);
  149. if (acl) {
  150. ret = posix_acl_valid(acl);
  151. if (ret)
  152. goto out;
  153. }
  154. }
  155. ret = btrfs_set_acl(NULL, dentry->d_inode, acl, type);
  156. out:
  157. posix_acl_release(acl);
  158. return ret;
  159. }
  160. /*
  161. * btrfs_init_acl is already generally called under fs_mutex, so the locking
  162. * stuff has been fixed to work with that. If the locking stuff changes, we
  163. * need to re-evaluate the acl locking stuff.
  164. */
  165. int btrfs_init_acl(struct btrfs_trans_handle *trans,
  166. struct inode *inode, struct inode *dir)
  167. {
  168. struct posix_acl *acl = NULL;
  169. int ret = 0;
  170. /* this happens with subvols */
  171. if (!dir)
  172. return 0;
  173. if (!S_ISLNK(inode->i_mode)) {
  174. if (IS_POSIXACL(dir)) {
  175. acl = btrfs_get_acl(dir, ACL_TYPE_DEFAULT);
  176. if (IS_ERR(acl))
  177. return PTR_ERR(acl);
  178. }
  179. if (!acl)
  180. inode->i_mode &= ~current_umask();
  181. }
  182. if (IS_POSIXACL(dir) && acl) {
  183. if (S_ISDIR(inode->i_mode)) {
  184. ret = btrfs_set_acl(trans, inode, acl,
  185. ACL_TYPE_DEFAULT);
  186. if (ret)
  187. goto failed;
  188. }
  189. ret = posix_acl_create(&acl, GFP_NOFS, &inode->i_mode);
  190. if (ret < 0)
  191. return ret;
  192. if (ret > 0) {
  193. /* we need an acl */
  194. ret = btrfs_set_acl(trans, inode, acl, ACL_TYPE_ACCESS);
  195. } else {
  196. cache_no_acl(inode);
  197. }
  198. } else {
  199. cache_no_acl(inode);
  200. }
  201. failed:
  202. posix_acl_release(acl);
  203. return ret;
  204. }
  205. int btrfs_acl_chmod(struct inode *inode)
  206. {
  207. struct posix_acl *acl;
  208. int ret = 0;
  209. if (S_ISLNK(inode->i_mode))
  210. return -EOPNOTSUPP;
  211. if (!IS_POSIXACL(inode))
  212. return 0;
  213. acl = btrfs_get_acl(inode, ACL_TYPE_ACCESS);
  214. if (IS_ERR_OR_NULL(acl))
  215. return PTR_ERR(acl);
  216. ret = posix_acl_chmod(&acl, GFP_KERNEL, inode->i_mode);
  217. if (ret)
  218. return ret;
  219. ret = btrfs_set_acl(NULL, inode, acl, ACL_TYPE_ACCESS);
  220. posix_acl_release(acl);
  221. return ret;
  222. }
  223. const struct xattr_handler btrfs_xattr_acl_default_handler = {
  224. .prefix = POSIX_ACL_XATTR_DEFAULT,
  225. .flags = ACL_TYPE_DEFAULT,
  226. .get = btrfs_xattr_acl_get,
  227. .set = btrfs_xattr_acl_set,
  228. };
  229. const struct xattr_handler btrfs_xattr_acl_access_handler = {
  230. .prefix = POSIX_ACL_XATTR_ACCESS,
  231. .flags = ACL_TYPE_ACCESS,
  232. .get = btrfs_xattr_acl_get,
  233. .set = btrfs_xattr_acl_set,
  234. };