Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 16f7e0fe2ecc30f30652e8185e1772cdebe39109

Authored by Randy Dunlap
Committed by Linus Torvalds
1 parent c59ede7b78
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] capable/capability.h (fs/) 

fs: Use <linux/capability.h> where capable() is used.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Acked-by: Tim Schmielau <tim@physik3.uni-rostock.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 46 changed files with 52 additions and 0 deletions Side-by-side Diff

... ... @@ -10,6 +10,7 @@
10 10 #include <linux/mm.h>
11 11 #include <linux/string.h>
12 12 #include <linux/smp_lock.h>
  13 +#include <linux/capability.h>
13 14 #include <linux/fsnotify.h>
14 15 #include <linux/fcntl.h>
15 16 #include <linux/quotaops.h>
... ... @@ -10,6 +10,7 @@
10 10 *
11 11 * ------------------------------------------------------------------------- */
12 12  
  13 +#include <linux/capability.h>
13 14 #include <linux/errno.h>
14 15 #include <linux/stat.h>
15 16 #include <linux/param.h>
... ... @@ -12,6 +12,7 @@
12 12 *
13 13 * ------------------------------------------------------------------------- */
14 14  
  15 +#include <linux/capability.h>
15 16 #include <linux/errno.h>
16 17 #include <linux/stat.h>
17 18 #include <linux/param.h>
... ... @@ -26,6 +26,7 @@
26 26 #include <linux/percpu.h>
27 27 #include <linux/slab.h>
28 28 #include <linux/smp_lock.h>
  29 +#include <linux/capability.h>
29 30 #include <linux/blkdev.h>
30 31 #include <linux/file.h>
31 32 #include <linux/quotaops.h>
... ... @@ -14,6 +14,7 @@
14 14 #include <linux/types.h>
15 15 #include <linux/compat.h>
16 16 #include <linux/kernel.h>
  17 +#include <linux/capability.h>
17 18 #include <linux/compiler.h>
18 19 #include <linux/sched.h>
19 20 #include <linux/smp.h>
... ... @@ -18,6 +18,7 @@
18 18 #include <linux/slab.h>
19 19 #include <linux/list.h>
20 20 #include <linux/mount.h>
  21 +#include <linux/capability.h>
21 22 #include <linux/dcache.h>
22 23 #include <linux/mm.h>
23 24 #include <linux/errno.h>
... ... @@ -77,6 +77,7 @@
77 77 #include <linux/kmod.h>
78 78 #include <linux/namei.h>
79 79 #include <linux/buffer_head.h>
  80 +#include <linux/capability.h>
80 81 #include <linux/quotaops.h>
81 82  
82 83 #include <asm/uaccess.h>
... ... @@ -4,6 +4,7 @@
4 4 * Copyright (C) 2001-2003 Andreas Gruenbacher, <agruen@suse.de>
5 5 */
6 6  
  7 +#include <linux/capability.h>
7 8 #include <linux/init.h>
8 9 #include <linux/sched.h>
9 10 #include <linux/slab.h>
... ... @@ -16,6 +16,7 @@
16 16 #include <linux/quotaops.h>
17 17 #include <linux/sched.h>
18 18 #include <linux/buffer_head.h>
  19 +#include <linux/capability.h>
19 20  
20 21 /*
21 22 * balloc.c contains the blocks allocation and deallocation routines
... ... @@ -8,6 +8,7 @@
8 8 */
9 9  
10 10 #include "ext2.h"
  11 +#include <linux/capability.h>
11 12 #include <linux/time.h>
12 13 #include <linux/sched.h>
13 14 #include <asm/current.h>
fs/ext2/xattr_trusted.c
Diff comments   View file @ 16f7e0f
... ... @@ -7,6 +7,7 @@
7 7  
8 8 #include <linux/module.h>
9 9 #include <linux/string.h>
  10 +#include <linux/capability.h>
10 11 #include <linux/fs.h>
11 12 #include <linux/smp_lock.h>
12 13 #include <linux/ext2_fs.h>
... ... @@ -7,6 +7,7 @@
7 7 #include <linux/init.h>
8 8 #include <linux/sched.h>
9 9 #include <linux/slab.h>
  10 +#include <linux/capability.h>
10 11 #include <linux/fs.h>
11 12 #include <linux/ext3_jbd.h>
12 13 #include <linux/ext3_fs.h>
... ... @@ -13,6 +13,7 @@
13 13  
14 14 #include <linux/config.h>
15 15 #include <linux/time.h>
  16 +#include <linux/capability.h>
16 17 #include <linux/fs.h>
17 18 #include <linux/jbd.h>
18 19 #include <linux/ext3_fs.h>
... ... @@ -9,6 +9,7 @@
9 9  
10 10 #include <linux/fs.h>
11 11 #include <linux/jbd.h>
  12 +#include <linux/capability.h>
12 13 #include <linux/ext3_fs.h>
13 14 #include <linux/ext3_jbd.h>
14 15 #include <linux/time.h>
fs/ext3/xattr_trusted.c
Diff comments   View file @ 16f7e0f
... ... @@ -7,6 +7,7 @@
7 7  
8 8 #include <linux/module.h>
9 9 #include <linux/string.h>
  10 +#include <linux/capability.h>
10 11 #include <linux/fs.h>
11 12 #include <linux/smp_lock.h>
12 13 #include <linux/ext3_jbd.h>
... ... @@ -6,6 +6,7 @@
6 6 * regular file handling primitives for fat-based filesystems
7 7 */
8 8  
  9 +#include <linux/capability.h>
9 10 #include <linux/module.h>
10 11 #include <linux/time.h>
11 12 #include <linux/msdos_fs.h>
... ... @@ -9,6 +9,7 @@
9 9 #include <linux/mm.h>
10 10 #include <linux/fs.h>
11 11 #include <linux/file.h>
  12 +#include <linux/capability.h>
12 13 #include <linux/dnotify.h>
13 14 #include <linux/smp_lock.h>
14 15 #include <linux/slab.h>
... ... @@ -16,6 +16,7 @@
16 16 #include <linux/eventpoll.h>
17 17 #include <linux/rcupdate.h>
18 18 #include <linux/mount.h>
  19 +#include <linux/capability.h>
19 20 #include <linux/cdev.h>
20 21 #include <linux/fsnotify.h>
21 22  
... ... @@ -12,6 +12,7 @@
12 12 * hfsplus ioctls
13 13 */
14 14  
  15 +#include <linux/capability.h>
15 16 #include <linux/fs.h>
16 17 #include <linux/sched.h>
17 18 #include <linux/xattr.h>
fs/hugetlbfs/inode.c
Diff comments   View file @ 16f7e0f
... ... @@ -18,6 +18,7 @@
18 18 #include <linux/highmem.h>
19 19 #include <linux/init.h>
20 20 #include <linux/string.h>
  21 +#include <linux/capability.h>
21 22 #include <linux/backing-dev.h>
22 23 #include <linux/hugetlb.h>
23 24 #include <linux/pagevec.h>
... ... @@ -8,6 +8,7 @@
8 8 #include <linux/syscalls.h>
9 9 #include <linux/mm.h>
10 10 #include <linux/smp_lock.h>
  11 +#include <linux/capability.h>
11 12 #include <linux/file.h>
12 13 #include <linux/fs.h>
13 14 #include <linux/security.h>
... ... @@ -22,6 +22,7 @@
22 22 #include <linux/kernel.h>
23 23 #include <linux/ioprio.h>
24 24 #include <linux/blkdev.h>
  25 +#include <linux/capability.h>
25 26 #include <linux/syscalls.h>
26 27  
27 28 static int set_task_ioprio(struct task_struct *task, int ioprio)
... ... @@ -11,6 +11,7 @@
11 11 *
12 12 */
13 13  
  14 +#include <linux/capability.h>
14 15 #include <linux/config.h>
15 16 #include <linux/kernel.h>
16 17 #include <linux/sched.h>
... ... @@ -17,6 +17,7 @@
17 17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18 18 */
19 19  
  20 +#include <linux/capability.h>
20 21 #include <linux/fs.h>
21 22 #include <linux/xattr.h>
22 23 #include <linux/posix_acl_xattr.h>
... ... @@ -28,6 +28,7 @@
28 28 #include <linux/syscalls.h>
29 29 #include <linux/mount.h>
30 30 #include <linux/audit.h>
  31 +#include <linux/capability.h>
31 32 #include <linux/file.h>
32 33 #include <asm/namei.h>
33 34 #include <asm/uaccess.h>
... ... @@ -16,6 +16,7 @@
16 16 #include <linux/init.h>
17 17 #include <linux/quotaops.h>
18 18 #include <linux/acct.h>
  19 +#include <linux/capability.h>
19 20 #include <linux/module.h>
20 21 #include <linux/seq_file.h>
21 22 #include <linux/namespace.h>
... ... @@ -10,6 +10,7 @@
10 10 #include <linux/config.h>
11 11  
12 12 #include <asm/uaccess.h>
  13 +#include <linux/capability.h>
13 14 #include <linux/errno.h>
14 15 #include <linux/fs.h>
15 16 #include <linux/ioctl.h>
... ... @@ -23,6 +23,7 @@
23 23 * Boston, MA 021110-1307, USA.
24 24 */
25 25  
  26 +#include <linux/capability.h>
26 27 #include <linux/fs.h>
27 28 #include <linux/types.h>
28 29 #include <linux/slab.h>
... ... @@ -16,6 +16,7 @@
16 16 #include <linux/tty.h>
17 17 #include <linux/namei.h>
18 18 #include <linux/backing-dev.h>
  19 +#include <linux/capability.h>
19 20 #include <linux/security.h>
20 21 #include <linux/mount.h>
21 22 #include <linux/vfs.h>
... ... @@ -55,6 +55,7 @@
55 55 #include <linux/proc_fs.h>
56 56 #include <linux/stat.h>
57 57 #include <linux/init.h>
  58 +#include <linux/capability.h>
58 59 #include <linux/file.h>
59 60 #include <linux/string.h>
60 61 #include <linux/seq_file.h>
... ... @@ -14,6 +14,7 @@
14 14 #include <linux/proc_fs.h>
15 15 #include <linux/user.h>
16 16 #include <linux/a.out.h>
  17 +#include <linux/capability.h>
17 18 #include <linux/elf.h>
18 19 #include <linux/elfcore.h>
19 20 #include <linux/vmalloc.h>
... ... @@ -15,6 +15,7 @@
15 15 #include <linux/security.h>
16 16 #include <linux/syscalls.h>
17 17 #include <linux/buffer_head.h>
  18 +#include <linux/capability.h>
18 19 #include <linux/quotaops.h>
19 20  
20 21 /* Check validity of generic quotactl commands */
... ... @@ -2,6 +2,7 @@
2 2 * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README
3 3 */
4 4  
  5 +#include <linux/capability.h>
5 6 #include <linux/fs.h>
6 7 #include <linux/reiserfs_fs.h>
7 8 #include <linux/time.h>
... ... @@ -30,6 +30,7 @@
30 30 */
31 31  
32 32 #include <linux/reiserfs_fs.h>
  33 +#include <linux/capability.h>
33 34 #include <linux/dcache.h>
34 35 #include <linux/namei.h>
35 36 #include <linux/errno.h>
fs/reiserfs/xattr_acl.c
Diff comments   View file @ 16f7e0f
  1 +#include <linux/capability.h>
1 2 #include <linux/fs.h>
2 3 #include <linux/posix_acl.h>
3 4 #include <linux/reiserfs_fs.h>
fs/reiserfs/xattr_trusted.c
Diff comments   View file @ 16f7e0f
1 1 #include <linux/reiserfs_fs.h>
  2 +#include <linux/capability.h>
2 3 #include <linux/errno.h>
3 4 #include <linux/fs.h>
4 5 #include <linux/pagemap.h>
... ... @@ -8,6 +8,7 @@
8 8 */
9 9  
10 10 #include <linux/types.h>
  11 +#include <linux/capability.h>
11 12 #include <linux/errno.h>
12 13 #include <linux/slab.h>
13 14 #include <linux/fs.h>
... ... @@ -11,6 +11,7 @@
11 11 #include <linux/pagemap.h>
12 12 #include <linux/namei.h>
13 13 #include <linux/backing-dev.h>
  14 +#include <linux/capability.h>
14 15 #include "sysfs.h"
15 16  
16 17 extern struct super_block * sysfs_sb;
... ... @@ -31,6 +31,7 @@
31 31 #include <asm/uaccess.h>
32 32 #include <linux/kernel.h>
33 33 #include <linux/string.h> /* memset */
  34 +#include <linux/capability.h>
34 35 #include <linux/errno.h>
35 36 #include <linux/smp_lock.h>
36 37 #include <linux/pagemap.h>
... ... @@ -13,6 +13,7 @@
13 13 #include <linux/string.h>
14 14 #include <linux/quotaops.h>
15 15 #include <linux/buffer_head.h>
  16 +#include <linux/capability.h>
16 17 #include <linux/sched.h>
17 18 #include <linux/bitops.h>
18 19 #include <asm/byteorder.h>
fs/xfs/linux-2.6/xfs_ioctl.c
Diff comments   View file @ 16f7e0f
... ... @@ -52,6 +52,7 @@
52 52 #include "xfs_dfrag.h"
53 53 #include "xfs_fsops.h"
54 54  
  55 +#include <linux/capability.h>
55 56 #include <linux/dcache.h>
56 57 #include <linux/mount.h>
57 58 #include <linux/namei.h>
fs/xfs/linux-2.6/xfs_iops.c
Diff comments   View file @ 16f7e0f
... ... @@ -51,6 +51,7 @@
51 51 #include "xfs_buf_item.h"
52 52 #include "xfs_utils.h"
53 53  
  54 +#include <linux/capability.h>
54 55 #include <linux/xattr.h>
55 56 #include <linux/namei.h>
56 57  
fs/xfs/quota/xfs_qm_syscalls.c
Diff comments   View file @ 16f7e0f
... ... @@ -15,6 +15,9 @@
15 15 * along with this program; if not, write the Free Software Foundation,
16 16 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
17 17 */
  18 +
  19 +#include <linux/capability.h>
  20 +
18 21 #include "xfs.h"
19 22 #include "xfs_fs.h"
20 23 #include "xfs_bit.h"
... ... @@ -36,6 +36,7 @@
36 36 #include "xfs_mac.h"
37 37 #include "xfs_attr.h"
38 38  
  39 +#include <linux/capability.h>
39 40 #include <linux/posix_acl_xattr.h>
40 41  
41 42 STATIC int xfs_acl_setmode(vnode_t *, xfs_acl_t *, int *);
... ... @@ -15,6 +15,9 @@
15 15 * along with this program; if not, write the Free Software Foundation,
16 16 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
17 17 */
  18 +
  19 +#include <linux/capability.h>
  20 +
18 21 #include "xfs.h"
19 22 #include "xfs_fs.h"
20 23 #include "xfs_types.h"
fs/xfs/xfs_vnodeops.c
Diff comments   View file @ 16f7e0f
... ... @@ -15,6 +15,9 @@
15 15 * along with this program; if not, write the Free Software Foundation,
16 16 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
17 17 */
  18 +
  19 +#include <linux/capability.h>
  20 +
18 21 #include "xfs.h"
19 22 #include "xfs_fs.h"
20 23 #include "xfs_types.h"