wok-next annotate linux/stuff/aufs2-2.6.36-fix.patch @ rev 10534

lincity-ng: update bdeps
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed May 25 17:22:18 2011 +0200 (2011-05-25)
parents
children
rev   line source
slaxemulator@7131 1 diff --git a/fs/file_table.c b/fs/file_table.c
slaxemulator@7131 2 index a04bdd8..fbf8908 100644
slaxemulator@7131 3 --- a/fs/file_table.c
slaxemulator@7131 4 +++ b/fs/file_table.c
slaxemulator@7131 5 @@ -20,7 +20,6 @@
slaxemulator@7131 6 #include <linux/cdev.h>
slaxemulator@7131 7 #include <linux/fsnotify.h>
slaxemulator@7131 8 #include <linux/sysctl.h>
slaxemulator@7131 9 -#include <linux/lglock.h>
slaxemulator@7131 10 #include <linux/percpu_counter.h>
slaxemulator@7131 11 #include <linux/percpu.h>
slaxemulator@7131 12 #include <linux/ima.h>
slaxemulator@7131 13 @@ -34,7 +33,6 @@ struct files_stat_struct files_stat = {
slaxemulator@7131 14 .max_files = NR_FILE
slaxemulator@7131 15 };
slaxemulator@7131 16
slaxemulator@7131 17 -DECLARE_LGLOCK(files_lglock);
slaxemulator@7131 18 DEFINE_LGLOCK(files_lglock);
slaxemulator@7131 19
slaxemulator@7131 20 /* SLAB cache for file structures */
slaxemulator@7131 21 @@ -394,37 +392,6 @@ void file_sb_list_del(struct file *file)
slaxemulator@7131 22 }
slaxemulator@7131 23 }
slaxemulator@7131 24
slaxemulator@7131 25 -#ifdef CONFIG_SMP
slaxemulator@7131 26 -
slaxemulator@7131 27 -/*
slaxemulator@7131 28 - * These macros iterate all files on all CPUs for a given superblock.
slaxemulator@7131 29 - * files_lglock must be held globally.
slaxemulator@7131 30 - */
slaxemulator@7131 31 -#define do_file_list_for_each_entry(__sb, __file) \
slaxemulator@7131 32 -{ \
slaxemulator@7131 33 - int i; \
slaxemulator@7131 34 - for_each_possible_cpu(i) { \
slaxemulator@7131 35 - struct list_head *list; \
slaxemulator@7131 36 - list = per_cpu_ptr((__sb)->s_files, i); \
slaxemulator@7131 37 - list_for_each_entry((__file), list, f_u.fu_list)
slaxemulator@7131 38 -
slaxemulator@7131 39 -#define while_file_list_for_each_entry \
slaxemulator@7131 40 - } \
slaxemulator@7131 41 -}
slaxemulator@7131 42 -
slaxemulator@7131 43 -#else
slaxemulator@7131 44 -
slaxemulator@7131 45 -#define do_file_list_for_each_entry(__sb, __file) \
slaxemulator@7131 46 -{ \
slaxemulator@7131 47 - struct list_head *list; \
slaxemulator@7131 48 - list = &(sb)->s_files; \
slaxemulator@7131 49 - list_for_each_entry((__file), list, f_u.fu_list)
slaxemulator@7131 50 -
slaxemulator@7131 51 -#define while_file_list_for_each_entry \
slaxemulator@7131 52 -}
slaxemulator@7131 53 -
slaxemulator@7131 54 -#endif
slaxemulator@7131 55 -
slaxemulator@7131 56 int fs_may_remount_ro(struct super_block *sb)
slaxemulator@7131 57 {
slaxemulator@7131 58 struct file *file;
slaxemulator@7131 59 diff --git a/fs/statfs.c b/fs/statfs.c
slaxemulator@7131 60 index 30ea8c8..9025c98 100644
slaxemulator@7131 61 --- a/fs/statfs.c
slaxemulator@7131 62 +++ b/fs/statfs.c
slaxemulator@7131 63 @@ -61,6 +61,7 @@ int statfs_by_dentry(struct dentry *dentry, struct kstatfs *buf)
slaxemulator@7131 64 buf->f_frsize = buf->f_bsize;
slaxemulator@7131 65 return retval;
slaxemulator@7131 66 }
slaxemulator@7131 67 +EXPORT_SYMBOL(statfs_by_dentry);
slaxemulator@7131 68
slaxemulator@7131 69 int vfs_statfs(struct path *path, struct kstatfs *buf)
slaxemulator@7131 70 {
slaxemulator@7131 71 diff --git a/include/linux/fs.h b/include/linux/fs.h
slaxemulator@7131 72 index 63d069b..741d296 100644
slaxemulator@7131 73 --- a/include/linux/fs.h
slaxemulator@7131 74 +++ b/include/linux/fs.h
slaxemulator@7131 75 @@ -9,6 +9,7 @@
slaxemulator@7131 76 #include <linux/limits.h>
slaxemulator@7131 77 #include <linux/ioctl.h>
slaxemulator@7131 78 #include <linux/blk_types.h>
slaxemulator@7131 79 +#include <linux/lglock.h>
slaxemulator@7131 80
slaxemulator@7131 81 /*
slaxemulator@7131 82 * It's silly to have NR_OPEN bigger than NR_FILE, but you can change
slaxemulator@7131 83 @@ -1814,6 +1815,7 @@ extern struct vfsmount *collect_mounts(struct path *);
slaxemulator@7131 84 extern void drop_collected_mounts(struct vfsmount *);
slaxemulator@7131 85 extern int iterate_mounts(int (*)(struct vfsmount *, void *), void *,
slaxemulator@7131 86 struct vfsmount *);
slaxemulator@7131 87 +extern int statfs_by_dentry(struct dentry *dentry, struct kstatfs *buf);
slaxemulator@7131 88 extern int vfs_statfs(struct path *, struct kstatfs *);
slaxemulator@7131 89 extern int statfs_by_dentry(struct dentry *, struct kstatfs *);
slaxemulator@7131 90 extern int freeze_super(struct super_block *super);
slaxemulator@7131 91 @@ -2481,5 +2483,39 @@ int __init get_filesystem_list(char *buf);
slaxemulator@7131 92 #define OPEN_FMODE(flag) ((__force fmode_t)(((flag + 1) & O_ACCMODE) | \
slaxemulator@7131 93 (flag & FMODE_NONOTIFY)))
slaxemulator@7131 94
slaxemulator@7131 95 +
slaxemulator@7131 96 +DECLARE_LGLOCK(files_lglock);
slaxemulator@7131 97 +
slaxemulator@7131 98 +#ifdef CONFIG_SMP
slaxemulator@7131 99 +
slaxemulator@7131 100 +/*
slaxemulator@7131 101 + * These macros iterate all files on all CPUs for a given superblock.
slaxemulator@7131 102 + * files_lglock must be held globally.
slaxemulator@7131 103 + */
slaxemulator@7131 104 +#define do_file_list_for_each_entry(__sb, __file) \
slaxemulator@7131 105 +{ \
slaxemulator@7131 106 + int i; \
slaxemulator@7131 107 + for_each_possible_cpu(i) { \
slaxemulator@7131 108 + struct list_head *list; \
slaxemulator@7131 109 + list = per_cpu_ptr((__sb)->s_files, i); \
slaxemulator@7131 110 + list_for_each_entry((__file), list, f_u.fu_list)
slaxemulator@7131 111 +
slaxemulator@7131 112 +#define while_file_list_for_each_entry \
slaxemulator@7131 113 + } \
slaxemulator@7131 114 +}
slaxemulator@7131 115 +
slaxemulator@7131 116 +#else
slaxemulator@7131 117 +
slaxemulator@7131 118 +#define do_file_list_for_each_entry(__sb, __file) \
slaxemulator@7131 119 +{ \
slaxemulator@7131 120 + struct list_head *list; \
slaxemulator@7131 121 + list = &(sb)->s_files; \
slaxemulator@7131 122 + list_for_each_entry((__file), list, f_u.fu_list)
slaxemulator@7131 123 +
slaxemulator@7131 124 +#define while_file_list_for_each_entry \
slaxemulator@7131 125 +}
slaxemulator@7131 126 +
slaxemulator@7131 127 +#endif
slaxemulator@7131 128 +
slaxemulator@7131 129 #endif /* __KERNEL__ */
slaxemulator@7131 130 #endif /* _LINUX_FS_H */