diff options
author | Jens Axboe <jens.axboe@oracle.com> | 2010-03-19 03:05:10 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2010-03-19 03:05:10 -0400 |
commit | b4b7a4ef097f288f724420b473dbf92a89c0ab7e (patch) | |
tree | 23ad8101e3e77c32a8d1e1b95a9c1cd7f7a475b7 /fs | |
parent | e9ce335df51ff782035a15c261a3c0c9892a1767 (diff) | |
parent | a3d3203e4bb40f253b1541e310dc0f9305be7c84 (diff) |
Merge branch 'master' into for-linus
Conflicts:
block/Kconfig
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'fs')
72 files changed, 364 insertions, 1991 deletions
diff --git a/fs/9p/v9fs.h b/fs/9p/v9fs.h index 79000bf62491..6b801d1ddf4b 100644 --- a/fs/9p/v9fs.h +++ b/fs/9p/v9fs.h | |||
@@ -24,7 +24,7 @@ | |||
24 | /** | 24 | /** |
25 | * enum p9_session_flags - option flags for each 9P session | 25 | * enum p9_session_flags - option flags for each 9P session |
26 | * @V9FS_PROTO_2000U: whether or not to use 9P2000.u extensions | 26 | * @V9FS_PROTO_2000U: whether or not to use 9P2000.u extensions |
27 | * @V9FS_PROTO_2010L: whether or not to use 9P2010.l extensions | 27 | * @V9FS_PROTO_2000L: whether or not to use 9P2000.l extensions |
28 | * @V9FS_ACCESS_SINGLE: only the mounting user can access the hierarchy | 28 | * @V9FS_ACCESS_SINGLE: only the mounting user can access the hierarchy |
29 | * @V9FS_ACCESS_USER: a new attach will be issued for every user (default) | 29 | * @V9FS_ACCESS_USER: a new attach will be issued for every user (default) |
30 | * @V9FS_ACCESS_ANY: use a single attach for all users | 30 | * @V9FS_ACCESS_ANY: use a single attach for all users |
@@ -34,7 +34,7 @@ | |||
34 | */ | 34 | */ |
35 | enum p9_session_flags { | 35 | enum p9_session_flags { |
36 | V9FS_PROTO_2000U = 0x01, | 36 | V9FS_PROTO_2000U = 0x01, |
37 | V9FS_PROTO_2010L = 0x02, | 37 | V9FS_PROTO_2000L = 0x02, |
38 | V9FS_ACCESS_SINGLE = 0x04, | 38 | V9FS_ACCESS_SINGLE = 0x04, |
39 | V9FS_ACCESS_USER = 0x08, | 39 | V9FS_ACCESS_USER = 0x08, |
40 | V9FS_ACCESS_ANY = 0x0C, | 40 | V9FS_ACCESS_ANY = 0x0C, |
@@ -130,5 +130,5 @@ static inline int v9fs_proto_dotu(struct v9fs_session_info *v9ses) | |||
130 | 130 | ||
131 | static inline int v9fs_proto_dotl(struct v9fs_session_info *v9ses) | 131 | static inline int v9fs_proto_dotl(struct v9fs_session_info *v9ses) |
132 | { | 132 | { |
133 | return v9ses->flags & V9FS_PROTO_2010L; | 133 | return v9ses->flags & V9FS_PROTO_2000L; |
134 | } | 134 | } |
diff --git a/fs/9p/vfs_dir.c b/fs/9p/vfs_dir.c index 6580aa449541..d8a3afe4ff72 100644 --- a/fs/9p/vfs_dir.c +++ b/fs/9p/vfs_dir.c | |||
@@ -76,6 +76,15 @@ static inline int dt_type(struct p9_wstat *mistat) | |||
76 | return rettype; | 76 | return rettype; |
77 | } | 77 | } |
78 | 78 | ||
79 | static void p9stat_init(struct p9_wstat *stbuf) | ||
80 | { | ||
81 | stbuf->name = NULL; | ||
82 | stbuf->uid = NULL; | ||
83 | stbuf->gid = NULL; | ||
84 | stbuf->muid = NULL; | ||
85 | stbuf->extension = NULL; | ||
86 | } | ||
87 | |||
79 | /** | 88 | /** |
80 | * v9fs_dir_readdir - read a directory | 89 | * v9fs_dir_readdir - read a directory |
81 | * @filp: opened file structure | 90 | * @filp: opened file structure |
@@ -131,8 +140,8 @@ static int v9fs_dir_readdir(struct file *filp, void *dirent, filldir_t filldir) | |||
131 | rdir->head = 0; | 140 | rdir->head = 0; |
132 | rdir->tail = err; | 141 | rdir->tail = err; |
133 | } | 142 | } |
134 | |||
135 | while (rdir->head < rdir->tail) { | 143 | while (rdir->head < rdir->tail) { |
144 | p9stat_init(&st); | ||
136 | err = p9stat_read(rdir->buf + rdir->head, | 145 | err = p9stat_read(rdir->buf + rdir->head, |
137 | buflen - rdir->head, &st, | 146 | buflen - rdir->head, &st, |
138 | fid->clnt->proto_version); | 147 | fid->clnt->proto_version); |
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c index 36122683fae8..df52d488d2a6 100644 --- a/fs/9p/vfs_file.c +++ b/fs/9p/vfs_file.c | |||
@@ -114,7 +114,7 @@ static int v9fs_file_lock(struct file *filp, int cmd, struct file_lock *fl) | |||
114 | P9_DPRINTK(P9_DEBUG_VFS, "filp: %p lock: %p\n", filp, fl); | 114 | P9_DPRINTK(P9_DEBUG_VFS, "filp: %p lock: %p\n", filp, fl); |
115 | 115 | ||
116 | /* No mandatory locks */ | 116 | /* No mandatory locks */ |
117 | if (__mandatory_lock(inode)) | 117 | if (__mandatory_lock(inode) && fl->fl_type != F_UNLCK) |
118 | return -ENOLCK; | 118 | return -ENOLCK; |
119 | 119 | ||
120 | if ((IS_SETLK(cmd) || IS_SETLKW(cmd)) && fl->fl_type != F_UNLCK) { | 120 | if ((IS_SETLK(cmd) || IS_SETLKW(cmd)) && fl->fl_type != F_UNLCK) { |
@@ -215,7 +215,7 @@ v9fs_file_write(struct file *filp, const char __user * data, | |||
215 | struct p9_fid *fid; | 215 | struct p9_fid *fid; |
216 | struct p9_client *clnt; | 216 | struct p9_client *clnt; |
217 | struct inode *inode = filp->f_path.dentry->d_inode; | 217 | struct inode *inode = filp->f_path.dentry->d_inode; |
218 | int origin = *offset; | 218 | loff_t origin = *offset; |
219 | unsigned long pg_start, pg_end; | 219 | unsigned long pg_start, pg_end; |
220 | 220 | ||
221 | P9_DPRINTK(P9_DEBUG_VFS, "data %p count %d offset %x\n", data, | 221 | P9_DPRINTK(P9_DEBUG_VFS, "data %p count %d offset %x\n", data, |
diff --git a/fs/affs/bitmap.c b/fs/affs/bitmap.c index dc5ef14bdc1c..8306d53307ed 100644 --- a/fs/affs/bitmap.c +++ b/fs/affs/bitmap.c | |||
@@ -128,7 +128,7 @@ err_range: | |||
128 | /* | 128 | /* |
129 | * Allocate a block in the given allocation zone. | 129 | * Allocate a block in the given allocation zone. |
130 | * Since we have to byte-swap the bitmap on little-endian | 130 | * Since we have to byte-swap the bitmap on little-endian |
131 | * machines, this is rather expensive. Therefor we will | 131 | * machines, this is rather expensive. Therefore we will |
132 | * preallocate up to 16 blocks from the same word, if | 132 | * preallocate up to 16 blocks from the same word, if |
133 | * possible. We are not doing preallocations in the | 133 | * possible. We are not doing preallocations in the |
134 | * header zone, though. | 134 | * header zone, though. |
diff --git a/fs/anon_inodes.c b/fs/anon_inodes.c index 9f0bf13291e5..2de009565d8e 100644 --- a/fs/anon_inodes.c +++ b/fs/anon_inodes.c | |||
@@ -209,6 +209,7 @@ static struct inode *anon_inode_mkinode(void) | |||
209 | inode->i_mode = S_IRUSR | S_IWUSR; | 209 | inode->i_mode = S_IRUSR | S_IWUSR; |
210 | inode->i_uid = current_fsuid(); | 210 | inode->i_uid = current_fsuid(); |
211 | inode->i_gid = current_fsgid(); | 211 | inode->i_gid = current_fsgid(); |
212 | inode->i_flags |= S_PRIVATE; | ||
212 | inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; | 213 | inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; |
213 | return inode; | 214 | return inode; |
214 | } | 215 | } |
diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c index 6d6a16c5e9bb..2c32d00a6690 100644 --- a/fs/binfmt_elf_fdpic.c +++ b/fs/binfmt_elf_fdpic.c | |||
@@ -1374,7 +1374,7 @@ static inline void fill_note(struct memelfnote *note, const char *name, int type | |||
1374 | 1374 | ||
1375 | /* | 1375 | /* |
1376 | * fill up all the fields in prstatus from the given task struct, except | 1376 | * fill up all the fields in prstatus from the given task struct, except |
1377 | * registers which need to be filled up seperately. | 1377 | * registers which need to be filled up separately. |
1378 | */ | 1378 | */ |
1379 | static void fill_prstatus(struct elf_prstatus *prstatus, | 1379 | static void fill_prstatus(struct elf_prstatus *prstatus, |
1380 | struct task_struct *p, long signr) | 1380 | struct task_struct *p, long signr) |
@@ -264,13 +264,12 @@ EXPORT_SYMBOL(bio_init); | |||
264 | * bio_alloc_bioset - allocate a bio for I/O | 264 | * bio_alloc_bioset - allocate a bio for I/O |
265 | * @gfp_mask: the GFP_ mask given to the slab allocator | 265 | * @gfp_mask: the GFP_ mask given to the slab allocator |
266 | * @nr_iovecs: number of iovecs to pre-allocate | 266 | * @nr_iovecs: number of iovecs to pre-allocate |
267 | * @bs: the bio_set to allocate from. If %NULL, just use kmalloc | 267 | * @bs: the bio_set to allocate from. |
268 | * | 268 | * |
269 | * Description: | 269 | * Description: |
270 | * bio_alloc_bioset will first try its own mempool to satisfy the allocation. | 270 | * bio_alloc_bioset will try its own mempool to satisfy the allocation. |
271 | * If %__GFP_WAIT is set then we will block on the internal pool waiting | 271 | * If %__GFP_WAIT is set then we will block on the internal pool waiting |
272 | * for a &struct bio to become free. If a %NULL @bs is passed in, we will | 272 | * for a &struct bio to become free. |
273 | * fall back to just using @kmalloc to allocate the required memory. | ||
274 | * | 273 | * |
275 | * Note that the caller must set ->bi_destructor on successful return | 274 | * Note that the caller must set ->bi_destructor on successful return |
276 | * of a bio, to do the appropriate freeing of the bio once the reference | 275 | * of a bio, to do the appropriate freeing of the bio once the reference |
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 2b59201b955c..0427183e3e05 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
@@ -901,7 +901,7 @@ static int __setup_root(u32 nodesize, u32 leafsize, u32 sectorsize, | |||
901 | root->highest_objectid = 0; | 901 | root->highest_objectid = 0; |
902 | root->name = NULL; | 902 | root->name = NULL; |
903 | root->in_sysfs = 0; | 903 | root->in_sysfs = 0; |
904 | root->inode_tree.rb_node = NULL; | 904 | root->inode_tree = RB_ROOT; |
905 | 905 | ||
906 | INIT_LIST_HEAD(&root->dirty_list); | 906 | INIT_LIST_HEAD(&root->dirty_list); |
907 | INIT_LIST_HEAD(&root->orphan_list); | 907 | INIT_LIST_HEAD(&root->orphan_list); |
@@ -1673,7 +1673,7 @@ struct btrfs_root *open_ctree(struct super_block *sb, | |||
1673 | insert_inode_hash(fs_info->btree_inode); | 1673 | insert_inode_hash(fs_info->btree_inode); |
1674 | 1674 | ||
1675 | spin_lock_init(&fs_info->block_group_cache_lock); | 1675 | spin_lock_init(&fs_info->block_group_cache_lock); |
1676 | fs_info->block_group_cache_tree.rb_node = NULL; | 1676 | fs_info->block_group_cache_tree = RB_ROOT; |
1677 | 1677 | ||
1678 | extent_io_tree_init(&fs_info->freed_extents[0], | 1678 | extent_io_tree_init(&fs_info->freed_extents[0], |
1679 | fs_info->btree_inode->i_mapping, GFP_NOFS); | 1679 | fs_info->btree_inode->i_mapping, GFP_NOFS); |
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index b177ed319612..7073cbb1b2d4 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c | |||
@@ -104,8 +104,8 @@ void extent_io_exit(void) | |||
104 | void extent_io_tree_init(struct extent_io_tree *tree, | 104 | void extent_io_tree_init(struct extent_io_tree *tree, |
105 | struct address_space *mapping, gfp_t mask) | 105 | struct address_space *mapping, gfp_t mask) |
106 | { | 106 | { |
107 | tree->state.rb_node = NULL; | 107 | tree->state = RB_ROOT; |
108 | tree->buffer.rb_node = NULL; | 108 | tree->buffer = RB_ROOT; |
109 | tree->ops = NULL; | 109 | tree->ops = NULL; |
110 | tree->dirty_bytes = 0; | 110 | tree->dirty_bytes = 0; |
111 | spin_lock_init(&tree->lock); | 111 | spin_lock_init(&tree->lock); |
diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c index 428fcac45f90..28d87ba60ce8 100644 --- a/fs/btrfs/extent_map.c +++ b/fs/btrfs/extent_map.c | |||
@@ -35,7 +35,7 @@ void extent_map_exit(void) | |||
35 | */ | 35 | */ |
36 | void extent_map_tree_init(struct extent_map_tree *tree, gfp_t mask) | 36 | void extent_map_tree_init(struct extent_map_tree *tree, gfp_t mask) |
37 | { | 37 | { |
38 | tree->map.rb_node = NULL; | 38 | tree->map = RB_ROOT; |
39 | rwlock_init(&tree->lock); | 39 | rwlock_init(&tree->lock); |
40 | } | 40 | } |
41 | 41 | ||
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c index cb2849f03251..dd831ed31eea 100644 --- a/fs/btrfs/free-space-cache.c +++ b/fs/btrfs/free-space-cache.c | |||
@@ -870,7 +870,7 @@ __btrfs_return_cluster_to_free_space( | |||
870 | tree_insert_offset(&block_group->free_space_offset, | 870 | tree_insert_offset(&block_group->free_space_offset, |
871 | entry->offset, &entry->offset_index, 0); | 871 | entry->offset, &entry->offset_index, 0); |
872 | } | 872 | } |
873 | cluster->root.rb_node = NULL; | 873 | cluster->root = RB_ROOT; |
874 | 874 | ||
875 | out: | 875 | out: |
876 | spin_unlock(&cluster->lock); | 876 | spin_unlock(&cluster->lock); |
@@ -1355,7 +1355,7 @@ void btrfs_init_free_cluster(struct btrfs_free_cluster *cluster) | |||
1355 | { | 1355 | { |
1356 | spin_lock_init(&cluster->lock); | 1356 | spin_lock_init(&cluster->lock); |
1357 | spin_lock_init(&cluster->refill_lock); | 1357 | spin_lock_init(&cluster->refill_lock); |
1358 | cluster->root.rb_node = NULL; | 1358 | cluster->root = RB_ROOT; |
1359 | cluster->max_size = 0; | 1359 | cluster->max_size = 0; |
1360 | cluster->points_to_bitmap = false; | 1360 | cluster->points_to_bitmap = false; |
1361 | INIT_LIST_HEAD(&cluster->block_group_list); | 1361 | INIT_LIST_HEAD(&cluster->block_group_list); |
diff --git a/fs/btrfs/ordered-data.h b/fs/btrfs/ordered-data.h index 1fe1282ef47c..9116c6d0c5a9 100644 --- a/fs/btrfs/ordered-data.h +++ b/fs/btrfs/ordered-data.h | |||
@@ -129,7 +129,7 @@ static inline void | |||
129 | btrfs_ordered_inode_tree_init(struct btrfs_ordered_inode_tree *t) | 129 | btrfs_ordered_inode_tree_init(struct btrfs_ordered_inode_tree *t) |
130 | { | 130 | { |
131 | mutex_init(&t->mutex); | 131 | mutex_init(&t->mutex); |
132 | t->tree.rb_node = NULL; | 132 | t->tree = RB_ROOT; |
133 | t->last = NULL; | 133 | t->last = NULL; |
134 | } | 134 | } |
135 | 135 | ||
diff --git a/fs/btrfs/ref-cache.h b/fs/btrfs/ref-cache.h index bc283ad2db73..e2a55cb2072b 100644 --- a/fs/btrfs/ref-cache.h +++ b/fs/btrfs/ref-cache.h | |||
@@ -52,7 +52,7 @@ static inline size_t btrfs_leaf_ref_size(int nr_extents) | |||
52 | 52 | ||
53 | static inline void btrfs_leaf_ref_tree_init(struct btrfs_leaf_ref_tree *tree) | 53 | static inline void btrfs_leaf_ref_tree_init(struct btrfs_leaf_ref_tree *tree) |
54 | { | 54 | { |
55 | tree->root.rb_node = NULL; | 55 | tree->root = RB_ROOT; |
56 | INIT_LIST_HEAD(&tree->list); | 56 | INIT_LIST_HEAD(&tree->list); |
57 | spin_lock_init(&tree->lock); | 57 | spin_lock_init(&tree->lock); |
58 | } | 58 | } |
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index ab7ab5318745..0109e5606bad 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c | |||
@@ -170,14 +170,14 @@ struct async_merge { | |||
170 | 170 | ||
171 | static void mapping_tree_init(struct mapping_tree *tree) | 171 | static void mapping_tree_init(struct mapping_tree *tree) |
172 | { | 172 | { |
173 | tree->rb_root.rb_node = NULL; | 173 | tree->rb_root = RB_ROOT; |
174 | spin_lock_init(&tree->lock); | 174 | spin_lock_init(&tree->lock); |
175 | } | 175 | } |
176 | 176 | ||
177 | static void backref_cache_init(struct backref_cache *cache) | 177 | static void backref_cache_init(struct backref_cache *cache) |
178 | { | 178 | { |
179 | int i; | 179 | int i; |
180 | cache->rb_root.rb_node = NULL; | 180 | cache->rb_root = RB_ROOT; |
181 | for (i = 0; i < BTRFS_MAX_LEVEL; i++) | 181 | for (i = 0; i < BTRFS_MAX_LEVEL; i++) |
182 | INIT_LIST_HEAD(&cache->pending[i]); | 182 | INIT_LIST_HEAD(&cache->pending[i]); |
183 | spin_lock_init(&cache->lock); | 183 | spin_lock_init(&cache->lock); |
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 8a1ea6e64575..f8b4521de907 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c | |||
@@ -128,7 +128,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) | |||
128 | { | 128 | { |
129 | struct btrfs_fs_info *info = root->fs_info; | 129 | struct btrfs_fs_info *info = root->fs_info; |
130 | substring_t args[MAX_OPT_ARGS]; | 130 | substring_t args[MAX_OPT_ARGS]; |
131 | char *p, *num; | 131 | char *p, *num, *orig; |
132 | int intarg; | 132 | int intarg; |
133 | int ret = 0; | 133 | int ret = 0; |
134 | 134 | ||
@@ -143,6 +143,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) | |||
143 | if (!options) | 143 | if (!options) |
144 | return -ENOMEM; | 144 | return -ENOMEM; |
145 | 145 | ||
146 | orig = options; | ||
146 | 147 | ||
147 | while ((p = strsep(&options, ",")) != NULL) { | 148 | while ((p = strsep(&options, ",")) != NULL) { |
148 | int token; | 149 | int token; |
@@ -280,7 +281,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) | |||
280 | } | 281 | } |
281 | } | 282 | } |
282 | out: | 283 | out: |
283 | kfree(options); | 284 | kfree(orig); |
284 | return ret; | 285 | return ret; |
285 | } | 286 | } |
286 | 287 | ||
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c index a240b6fa81df..4ce16ef702a3 100644 --- a/fs/btrfs/sysfs.c +++ b/fs/btrfs/sysfs.c | |||
@@ -164,12 +164,12 @@ static void btrfs_root_release(struct kobject *kobj) | |||
164 | complete(&root->kobj_unregister); | 164 | complete(&root->kobj_unregister); |
165 | } | 165 | } |
166 | 166 | ||
167 | static struct sysfs_ops btrfs_super_attr_ops = { | 167 | static const struct sysfs_ops btrfs_super_attr_ops = { |
168 | .show = btrfs_super_attr_show, | 168 | .show = btrfs_super_attr_show, |
169 | .store = btrfs_super_attr_store, | 169 | .store = btrfs_super_attr_store, |
170 | }; | 170 | }; |
171 | 171 | ||
172 | static struct sysfs_ops btrfs_root_attr_ops = { | 172 | static const struct sysfs_ops btrfs_root_attr_ops = { |
173 | .show = btrfs_root_attr_show, | 173 | .show = btrfs_root_attr_show, |
174 | .store = btrfs_root_attr_store, | 174 | .store = btrfs_root_attr_store, |
175 | }; | 175 | }; |
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index b2acc79f1b34..2a36e236a492 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c | |||
@@ -69,7 +69,7 @@ static noinline int join_transaction(struct btrfs_root *root) | |||
69 | cur_trans->commit_done = 0; | 69 | cur_trans->commit_done = 0; |
70 | cur_trans->start_time = get_seconds(); | 70 | cur_trans->start_time = get_seconds(); |
71 | 71 | ||
72 | cur_trans->delayed_refs.root.rb_node = NULL; | 72 | cur_trans->delayed_refs.root = RB_ROOT; |
73 | cur_trans->delayed_refs.num_entries = 0; | 73 | cur_trans->delayed_refs.num_entries = 0; |
74 | cur_trans->delayed_refs.num_heads_ready = 0; | 74 | cur_trans->delayed_refs.num_heads_ready = 0; |
75 | cur_trans->delayed_refs.num_heads = 0; | 75 | cur_trans->delayed_refs.num_heads = 0; |
diff --git a/fs/buffer.c b/fs/buffer.c index 6fa530256bfd..c9c266db0624 100644 --- a/fs/buffer.c +++ b/fs/buffer.c | |||
@@ -2893,7 +2893,7 @@ int block_write_full_page_endio(struct page *page, get_block_t *get_block, | |||
2893 | 2893 | ||
2894 | /* | 2894 | /* |
2895 | * The page straddles i_size. It must be zeroed out on each and every | 2895 | * The page straddles i_size. It must be zeroed out on each and every |
2896 | * writepage invokation because it may be mmapped. "A file is mapped | 2896 | * writepage invocation because it may be mmapped. "A file is mapped |
2897 | * in multiples of the page size. For a file that is not a multiple of | 2897 | * in multiples of the page size. For a file that is not a multiple of |
2898 | * the page size, the remaining memory is zeroed when mapped, and | 2898 | * the page size, the remaining memory is zeroed when mapped, and |
2899 | * writes to that region are not written out to the file." | 2899 | * writes to that region are not written out to the file." |
@@ -3265,7 +3265,7 @@ static void recalc_bh_state(void) | |||
3265 | 3265 | ||
3266 | struct buffer_head *alloc_buffer_head(gfp_t gfp_flags) | 3266 | struct buffer_head *alloc_buffer_head(gfp_t gfp_flags) |
3267 | { | 3267 | { |
3268 | struct buffer_head *ret = kmem_cache_alloc(bh_cachep, gfp_flags); | 3268 | struct buffer_head *ret = kmem_cache_zalloc(bh_cachep, gfp_flags); |
3269 | if (ret) { | 3269 | if (ret) { |
3270 | INIT_LIST_HEAD(&ret->b_assoc_buffers); | 3270 | INIT_LIST_HEAD(&ret->b_assoc_buffers); |
3271 | get_cpu_var(bh_accounting).nr++; | 3271 | get_cpu_var(bh_accounting).nr++; |
@@ -3352,15 +3352,6 @@ int bh_submit_read(struct buffer_head *bh) | |||
3352 | } | 3352 | } |
3353 | EXPORT_SYMBOL(bh_submit_read); | 3353 | EXPORT_SYMBOL(bh_submit_read); |
3354 | 3354 | ||
3355 | static void | ||
3356 | init_buffer_head(void *data) | ||
3357 | { | ||
3358 | struct buffer_head *bh = data; | ||
3359 | |||
3360 | memset(bh, 0, sizeof(*bh)); | ||
3361 | INIT_LIST_HEAD(&bh->b_assoc_buffers); | ||
3362 | } | ||
3363 | |||
3364 | void __init buffer_init(void) | 3355 | void __init buffer_init(void) |
3365 | { | 3356 | { |
3366 | int nrpages; | 3357 | int nrpages; |
@@ -3369,7 +3360,7 @@ void __init buffer_init(void) | |||
3369 | sizeof(struct buffer_head), 0, | 3360 | sizeof(struct buffer_head), 0, |
3370 | (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC| | 3361 | (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC| |
3371 | SLAB_MEM_SPREAD), | 3362 | SLAB_MEM_SPREAD), |
3372 | init_buffer_head); | 3363 | NULL); |
3373 | 3364 | ||
3374 | /* | 3365 | /* |
3375 | * Limit the bh occupancy to 10% of ZONE_NORMAL | 3366 | * Limit the bh occupancy to 10% of ZONE_NORMAL |
diff --git a/fs/cifs/asn1.c b/fs/cifs/asn1.c index 20692fbfdb24..a20bea598933 100644 --- a/fs/cifs/asn1.c +++ b/fs/cifs/asn1.c | |||
@@ -136,7 +136,7 @@ asn1_enum_decode(struct asn1_ctx *ctx, __le32 *val) | |||
136 | return 0; | 136 | return 0; |
137 | } | 137 | } |
138 | 138 | ||
139 | ch = *(ctx->pointer)++; /* ch has 0xa, ptr points to lenght octet */ | 139 | ch = *(ctx->pointer)++; /* ch has 0xa, ptr points to length octet */ |
140 | if ((ch) == ASN1_ENUM) /* if ch value is ENUM, 0xa */ | 140 | if ((ch) == ASN1_ENUM) /* if ch value is ENUM, 0xa */ |
141 | *val = *(++(ctx->pointer)); /* value has enum value */ | 141 | *val = *(++(ctx->pointer)); /* value has enum value */ |
142 | else | 142 | else |
diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/cifs/cifs_dfs_ref.c index b44ce0a0711c..b1d61d0bdfc7 100644 --- a/fs/cifs/cifs_dfs_ref.c +++ b/fs/cifs/cifs_dfs_ref.c | |||
@@ -54,7 +54,7 @@ void cifs_dfs_release_automount_timer(void) | |||
54 | * Extracts sharename form full UNC. | 54 | * Extracts sharename form full UNC. |
55 | * i.e. strips from UNC trailing path that is not part of share | 55 | * i.e. strips from UNC trailing path that is not part of share |
56 | * name and fixup missing '\' in the begining of DFS node refferal | 56 | * name and fixup missing '\' in the begining of DFS node refferal |
57 | * if neccessary. | 57 | * if necessary. |
58 | * Returns pointer to share name on success or ERR_PTR on error. | 58 | * Returns pointer to share name on success or ERR_PTR on error. |
59 | * Caller is responsible for freeing returned string. | 59 | * Caller is responsible for freeing returned string. |
60 | */ | 60 | */ |
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index 9d17df3e0768..611835899844 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c | |||
@@ -3886,7 +3886,7 @@ parse_DFS_referrals(TRANSACTION2_GET_DFS_REFER_RSP *pSMBr, | |||
3886 | goto parse_DFS_referrals_exit; | 3886 | goto parse_DFS_referrals_exit; |
3887 | } | 3887 | } |
3888 | 3888 | ||
3889 | /* collect neccessary data from referrals */ | 3889 | /* collect necessary data from referrals */ |
3890 | for (i = 0; i < *num_of_nodes; i++) { | 3890 | for (i = 0; i < *num_of_nodes; i++) { |
3891 | char *temp; | 3891 | char *temp; |
3892 | int max_len; | 3892 | int max_len; |
diff --git a/fs/compat.c b/fs/compat.c index 00d90c2e66f0..030602d453b7 100644 --- a/fs/compat.c +++ b/fs/compat.c | |||
@@ -1795,6 +1795,24 @@ asmlinkage long compat_sys_select(int n, compat_ulong_t __user *inp, | |||
1795 | return ret; | 1795 | return ret; |
1796 | } | 1796 | } |
1797 | 1797 | ||
1798 | struct compat_sel_arg_struct { | ||
1799 | compat_ulong_t n; | ||
1800 | compat_uptr_t inp; | ||
1801 | compat_uptr_t outp; | ||
1802 | compat_uptr_t exp; | ||
1803 | compat_uptr_t tvp; | ||
1804 | }; | ||
1805 | |||
1806 | asmlinkage long compat_sys_old_select(struct compat_sel_arg_struct __user *arg) | ||
1807 | { | ||
1808 | struct compat_sel_arg_struct a; | ||
1809 | |||
1810 | if (copy_from_user(&a, arg, sizeof(a))) | ||
1811 | return -EFAULT; | ||
1812 | return compat_sys_select(a.n, compat_ptr(a.inp), compat_ptr(a.outp), | ||
1813 | compat_ptr(a.exp), compat_ptr(a.tvp)); | ||
1814 | } | ||
1815 | |||
1798 | #ifdef HAVE_SET_RESTORE_SIGMASK | 1816 | #ifdef HAVE_SET_RESTORE_SIGMASK |
1799 | static long do_compat_pselect(int n, compat_ulong_t __user *inp, | 1817 | static long do_compat_pselect(int n, compat_ulong_t __user *inp, |
1800 | compat_ulong_t __user *outp, compat_ulong_t __user *exp, | 1818 | compat_ulong_t __user *outp, compat_ulong_t __user *exp, |
diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c index 26a8bd40400a..f994a7dfda85 100644 --- a/fs/dlm/lockspace.c +++ b/fs/dlm/lockspace.c | |||
@@ -148,7 +148,7 @@ static void lockspace_kobj_release(struct kobject *k) | |||
148 | kfree(ls); | 148 | kfree(ls); |
149 | } | 149 | } |
150 | 150 | ||
151 | static struct sysfs_ops dlm_attr_ops = { | 151 | static const struct sysfs_ops dlm_attr_ops = { |
152 | .show = dlm_attr_show, | 152 | .show = dlm_attr_show, |
153 | .store = dlm_attr_store, | 153 | .store = dlm_attr_store, |
154 | }; | 154 | }; |
diff --git a/fs/dlm/member.c b/fs/dlm/member.c index 84f70bfb0baf..b12532e553f8 100644 --- a/fs/dlm/member.c +++ b/fs/dlm/member.c | |||
@@ -312,7 +312,7 @@ int dlm_ls_stop(struct dlm_ls *ls) | |||
312 | /* | 312 | /* |
313 | * This in_recovery lock does two things: | 313 | * This in_recovery lock does two things: |
314 | * 1) Keeps this function from returning until all threads are out | 314 | * 1) Keeps this function from returning until all threads are out |
315 | * of locking routines and locking is truely stopped. | 315 | * of locking routines and locking is truly stopped. |
316 | * 2) Keeps any new requests from being processed until it's unlocked | 316 | * 2) Keeps any new requests from being processed until it's unlocked |
317 | * when recovery is complete. | 317 | * when recovery is complete. |
318 | */ | 318 | */ |
diff --git a/fs/ext3/super.c b/fs/ext3/super.c index e844accbf55d..1bee604cc6cd 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c | |||
@@ -164,7 +164,7 @@ void ext3_msg(struct super_block *sb, const char *prefix, | |||
164 | * write out the superblock safely. | 164 | * write out the superblock safely. |
165 | * | 165 | * |
166 | * We'll just use the journal_abort() error code to record an error in | 166 | * We'll just use the journal_abort() error code to record an error in |
167 | * the journal instead. On recovery, the journal will compain about | 167 | * the journal instead. On recovery, the journal will complain about |
168 | * that error until we've noted it down and cleared it. | 168 | * that error until we've noted it down and cleared it. |
169 | */ | 169 | */ |
170 | 170 | ||
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 506713a2ebd8..54df209d2eed 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c | |||
@@ -69,7 +69,7 @@ | |||
69 | * | 69 | * |
70 | * pa_lstart -> the logical start block for this prealloc space | 70 | * pa_lstart -> the logical start block for this prealloc space |
71 | * pa_pstart -> the physical start block for this prealloc space | 71 | * pa_pstart -> the physical start block for this prealloc space |
72 | * pa_len -> lenght for this prealloc space | 72 | * pa_len -> length for this prealloc space |
73 | * pa_free -> free space available in this prealloc space | 73 | * pa_free -> free space available in this prealloc space |
74 | * | 74 | * |
75 | * The inode preallocation space is used looking at the _logical_ start | 75 | * The inode preallocation space is used looking at the _logical_ start |
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 2b83b96cb2eb..ba191dae8730 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
@@ -302,7 +302,7 @@ void ext4_journal_abort_handle(const char *caller, const char *err_fn, | |||
302 | * write out the superblock safely. | 302 | * write out the superblock safely. |
303 | * | 303 | * |
304 | * We'll just use the jbd2_journal_abort() error code to record an error in | 304 | * We'll just use the jbd2_journal_abort() error code to record an error in |
305 | * the journal instead. On recovery, the journal will compain about | 305 | * the journal instead. On recovery, the journal will complain about |
306 | * that error until we've noted it down and cleared it. | 306 | * that error until we've noted it down and cleared it. |
307 | */ | 307 | */ |
308 | 308 | ||
@@ -2358,7 +2358,7 @@ static void ext4_sb_release(struct kobject *kobj) | |||
2358 | } | 2358 | } |
2359 | 2359 | ||
2360 | 2360 | ||
2361 | static struct sysfs_ops ext4_attr_ops = { | 2361 | static const struct sysfs_ops ext4_attr_ops = { |
2362 | .show = ext4_attr_show, | 2362 | .show = ext4_attr_show, |
2363 | .store = ext4_attr_store, | 2363 | .store = ext4_attr_store, |
2364 | }; | 2364 | }; |
diff --git a/fs/fat/inode.c b/fs/fat/inode.c index fbeecdc194dc..0ce143bd7d56 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c | |||
@@ -558,7 +558,7 @@ static int fat_statfs(struct dentry *dentry, struct kstatfs *buf) | |||
558 | buf->f_bavail = sbi->free_clusters; | 558 | buf->f_bavail = sbi->free_clusters; |
559 | buf->f_fsid.val[0] = (u32)id; | 559 | buf->f_fsid.val[0] = (u32)id; |
560 | buf->f_fsid.val[1] = (u32)(id >> 32); | 560 | buf->f_fsid.val[1] = (u32)(id >> 32); |
561 | buf->f_namelen = sbi->options.isvfat ? 260 : 12; | 561 | buf->f_namelen = sbi->options.isvfat ? FAT_LFN_LEN : 12; |
562 | 562 | ||
563 | return 0; | 563 | return 0; |
564 | } | 564 | } |
diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c index f565f24019b5..c1ef50154868 100644 --- a/fs/fat/namei_vfat.c +++ b/fs/fat/namei_vfat.c | |||
@@ -502,14 +502,14 @@ xlate_to_uni(const unsigned char *name, int len, unsigned char *outname, | |||
502 | *outlen = utf8s_to_utf16s(name, len, (wchar_t *)outname); | 502 | *outlen = utf8s_to_utf16s(name, len, (wchar_t *)outname); |
503 | if (*outlen < 0) | 503 | if (*outlen < 0) |
504 | return *outlen; | 504 | return *outlen; |
505 | else if (*outlen > 255) | 505 | else if (*outlen > FAT_LFN_LEN) |
506 | return -ENAMETOOLONG; | 506 | return -ENAMETOOLONG; |
507 | 507 | ||
508 | op = &outname[*outlen * sizeof(wchar_t)]; | 508 | op = &outname[*outlen * sizeof(wchar_t)]; |
509 | } else { | 509 | } else { |
510 | if (nls) { | 510 | if (nls) { |
511 | for (i = 0, ip = name, op = outname, *outlen = 0; | 511 | for (i = 0, ip = name, op = outname, *outlen = 0; |
512 | i < len && *outlen <= 255; | 512 | i < len && *outlen <= FAT_LFN_LEN; |
513 | *outlen += 1) | 513 | *outlen += 1) |
514 | { | 514 | { |
515 | if (escape && (*ip == ':')) { | 515 | if (escape && (*ip == ':')) { |
@@ -549,7 +549,7 @@ xlate_to_uni(const unsigned char *name, int len, unsigned char *outname, | |||
549 | return -ENAMETOOLONG; | 549 | return -ENAMETOOLONG; |
550 | } else { | 550 | } else { |
551 | for (i = 0, ip = name, op = outname, *outlen = 0; | 551 | for (i = 0, ip = name, op = outname, *outlen = 0; |
552 | i < len && *outlen <= 255; | 552 | i < len && *outlen <= FAT_LFN_LEN; |
553 | i++, *outlen += 1) | 553 | i++, *outlen += 1) |
554 | { | 554 | { |
555 | *op++ = *ip++; | 555 | *op++ = *ip++; |
@@ -701,6 +701,15 @@ static int vfat_find(struct inode *dir, struct qstr *qname, | |||
701 | return fat_search_long(dir, qname->name, len, sinfo); | 701 | return fat_search_long(dir, qname->name, len, sinfo); |
702 | } | 702 | } |
703 | 703 | ||
704 | /* | ||
705 | * (nfsd's) anonymous disconnected dentry? | ||
706 | * NOTE: !IS_ROOT() is not anonymous (I.e. d_splice_alias() did the job). | ||
707 | */ | ||
708 | static int vfat_d_anon_disconn(struct dentry *dentry) | ||
709 | { | ||
710 | return IS_ROOT(dentry) && (dentry->d_flags & DCACHE_DISCONNECTED); | ||
711 | } | ||
712 | |||
704 | static struct dentry *vfat_lookup(struct inode *dir, struct dentry *dentry, | 713 | static struct dentry *vfat_lookup(struct inode *dir, struct dentry *dentry, |
705 | struct nameidata *nd) | 714 | struct nameidata *nd) |
706 | { | 715 | { |
@@ -729,11 +738,11 @@ static struct dentry *vfat_lookup(struct inode *dir, struct dentry *dentry, | |||
729 | } | 738 | } |
730 | 739 | ||
731 | alias = d_find_alias(inode); | 740 | alias = d_find_alias(inode); |
732 | if (alias && !(alias->d_flags & DCACHE_DISCONNECTED)) { | 741 | if (alias && !vfat_d_anon_disconn(alias)) { |
733 | /* | 742 | /* |
734 | * This inode has non DCACHE_DISCONNECTED dentry. This | 743 | * This inode has non anonymous-DCACHE_DISCONNECTED |
735 | * means, the user did ->lookup() by an another name | 744 | * dentry. This means, the user did ->lookup() by an |
736 | * (longname vs 8.3 alias of it) in past. | 745 | * another name (longname vs 8.3 alias of it) in past. |
737 | * | 746 | * |
738 | * Switch to new one for reason of locality if possible. | 747 | * Switch to new one for reason of locality if possible. |
739 | */ | 748 | */ |
@@ -743,7 +752,9 @@ static struct dentry *vfat_lookup(struct inode *dir, struct dentry *dentry, | |||
743 | iput(inode); | 752 | iput(inode); |
744 | unlock_super(sb); | 753 | unlock_super(sb); |
745 | return alias; | 754 | return alias; |
746 | } | 755 | } else |
756 | dput(alias); | ||
757 | |||
747 | out: | 758 | out: |
748 | unlock_super(sb); | 759 | unlock_super(sb); |
749 | dentry->d_op = sb->s_root->d_op; | 760 | dentry->d_op = sb->s_root->d_op; |
diff --git a/fs/fscache/Kconfig b/fs/fscache/Kconfig index 864dac20a242..cc94bb9563f2 100644 --- a/fs/fscache/Kconfig +++ b/fs/fscache/Kconfig | |||
@@ -1,7 +1,6 @@ | |||
1 | 1 | ||
2 | config FSCACHE | 2 | config FSCACHE |
3 | tristate "General filesystem local caching manager" | 3 | tristate "General filesystem local caching manager" |
4 | depends on EXPERIMENTAL | ||
5 | select SLOW_WORK | 4 | select SLOW_WORK |
6 | help | 5 | help |
7 | This option enables a generic filesystem caching manager that can be | 6 | This option enables a generic filesystem caching manager that can be |
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 1a822ce2b24b..ec14d19ce501 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c | |||
@@ -850,7 +850,7 @@ static void fuse_send_init(struct fuse_conn *fc, struct fuse_req *req) | |||
850 | req->in.args[0].size = sizeof(*arg); | 850 | req->in.args[0].size = sizeof(*arg); |
851 | req->in.args[0].value = arg; | 851 | req->in.args[0].value = arg; |
852 | req->out.numargs = 1; | 852 | req->out.numargs = 1; |
853 | /* Variable length arguement used for backward compatibility | 853 | /* Variable length argument used for backward compatibility |
854 | with interface version < 7.5. Rest of init_out is zeroed | 854 | with interface version < 7.5. Rest of init_out is zeroed |
855 | by do_get_request(), so a short reply is not a problem */ | 855 | by do_get_request(), so a short reply is not a problem */ |
856 | req->out.argvar = 1; | 856 | req->out.argvar = 1; |
diff --git a/fs/gfs2/Kconfig b/fs/gfs2/Kconfig index 4dcddf83326f..a47b43107112 100644 --- a/fs/gfs2/Kconfig +++ b/fs/gfs2/Kconfig | |||
@@ -8,7 +8,6 @@ config GFS2_FS | |||
8 | select FS_POSIX_ACL | 8 | select FS_POSIX_ACL |
9 | select CRC32 | 9 | select CRC32 |
10 | select SLOW_WORK | 10 | select SLOW_WORK |
11 | select QUOTA | ||
12 | select QUOTACTL | 11 | select QUOTACTL |
13 | help | 12 | help |
14 | A cluster filesystem. | 13 | A cluster filesystem. |
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c index a6abbae8a278..e6dd2aec6f82 100644 --- a/fs/gfs2/file.c +++ b/fs/gfs2/file.c | |||
@@ -640,7 +640,7 @@ static int gfs2_lock(struct file *file, int cmd, struct file_lock *fl) | |||
640 | 640 | ||
641 | if (!(fl->fl_flags & FL_POSIX)) | 641 | if (!(fl->fl_flags & FL_POSIX)) |
642 | return -ENOLCK; | 642 | return -ENOLCK; |
643 | if (__mandatory_lock(&ip->i_inode)) | 643 | if (__mandatory_lock(&ip->i_inode) && fl->fl_type != F_UNLCK) |
644 | return -ENOLCK; | 644 | return -ENOLCK; |
645 | 645 | ||
646 | if (cmd == F_CANCELLK) { | 646 | if (cmd == F_CANCELLK) { |
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h index b8025e51cabf..3aac46f6853e 100644 --- a/fs/gfs2/incore.h +++ b/fs/gfs2/incore.h | |||
@@ -616,7 +616,7 @@ struct gfs2_sbd { | |||
616 | unsigned int sd_log_blks_reserved; | 616 | unsigned int sd_log_blks_reserved; |
617 | unsigned int sd_log_commited_buf; | 617 | unsigned int sd_log_commited_buf; |
618 | unsigned int sd_log_commited_databuf; | 618 | unsigned int sd_log_commited_databuf; |
619 | unsigned int sd_log_commited_revoke; | 619 | int sd_log_commited_revoke; |
620 | 620 | ||
621 | unsigned int sd_log_num_buf; | 621 | unsigned int sd_log_num_buf; |
622 | unsigned int sd_log_num_revoke; | 622 | unsigned int sd_log_num_revoke; |
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c index 4511b08fc451..e5bf4b59d46e 100644 --- a/fs/gfs2/log.c +++ b/fs/gfs2/log.c | |||
@@ -417,7 +417,7 @@ static unsigned int calc_reserved(struct gfs2_sbd *sdp) | |||
417 | databufhdrs_needed = (sdp->sd_log_commited_databuf + | 417 | databufhdrs_needed = (sdp->sd_log_commited_databuf + |
418 | (dbuf_limit - 1)) / dbuf_limit; | 418 | (dbuf_limit - 1)) / dbuf_limit; |
419 | 419 | ||
420 | if (sdp->sd_log_commited_revoke) | 420 | if (sdp->sd_log_commited_revoke > 0) |
421 | revokes = gfs2_struct2blk(sdp, sdp->sd_log_commited_revoke, | 421 | revokes = gfs2_struct2blk(sdp, sdp->sd_log_commited_revoke, |
422 | sizeof(u64)); | 422 | sizeof(u64)); |
423 | 423 | ||
@@ -790,7 +790,6 @@ static void log_refund(struct gfs2_sbd *sdp, struct gfs2_trans *tr) | |||
790 | gfs2_assert_withdraw(sdp, (((int)sdp->sd_log_commited_buf) >= 0) || | 790 | gfs2_assert_withdraw(sdp, (((int)sdp->sd_log_commited_buf) >= 0) || |
791 | (((int)sdp->sd_log_commited_databuf) >= 0)); | 791 | (((int)sdp->sd_log_commited_databuf) >= 0)); |
792 | sdp->sd_log_commited_revoke += tr->tr_num_revoke - tr->tr_num_revoke_rm; | 792 | sdp->sd_log_commited_revoke += tr->tr_num_revoke - tr->tr_num_revoke_rm; |
793 | gfs2_assert_withdraw(sdp, ((int)sdp->sd_log_commited_revoke) >= 0); | ||
794 | reserved = calc_reserved(sdp); | 793 | reserved = calc_reserved(sdp); |
795 | gfs2_assert_withdraw(sdp, sdp->sd_log_blks_reserved + tr->tr_reserved >= reserved); | 794 | gfs2_assert_withdraw(sdp, sdp->sd_log_blks_reserved + tr->tr_reserved >= reserved); |
796 | unused = sdp->sd_log_blks_reserved - reserved + tr->tr_reserved; | 795 | unused = sdp->sd_log_blks_reserved - reserved + tr->tr_reserved; |
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c index a054b526dc08..c1309ed1c496 100644 --- a/fs/gfs2/ops_fstype.c +++ b/fs/gfs2/ops_fstype.c | |||
@@ -1001,7 +1001,7 @@ static const struct lm_lockops nolock_ops = { | |||
1001 | /** | 1001 | /** |
1002 | * gfs2_lm_mount - mount a locking protocol | 1002 | * gfs2_lm_mount - mount a locking protocol |
1003 | * @sdp: the filesystem | 1003 | * @sdp: the filesystem |
1004 | * @args: mount arguements | 1004 | * @args: mount arguments |
1005 | * @silent: if 1, don't complain if the FS isn't a GFS2 fs | 1005 | * @silent: if 1, don't complain if the FS isn't a GFS2 fs |
1006 | * | 1006 | * |
1007 | * Returns: errno | 1007 | * Returns: errno |
diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c index b5f1a46133c8..419042f7f0b6 100644 --- a/fs/gfs2/sys.c +++ b/fs/gfs2/sys.c | |||
@@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct kobject *kobj, struct attribute *attr, | |||
49 | return a->store ? a->store(sdp, buf, len) : len; | 49 | return a->store ? a->store(sdp, buf, len) : len; |
50 | } | 50 | } |
51 | 51 | ||
52 | static struct sysfs_ops gfs2_attr_ops = { | 52 | static const struct sysfs_ops gfs2_attr_ops = { |
53 | .show = gfs2_attr_show, | 53 | .show = gfs2_attr_show, |
54 | .store = gfs2_attr_store, | 54 | .store = gfs2_attr_store, |
55 | }; | 55 | }; |
@@ -574,7 +574,7 @@ static int gfs2_uevent(struct kset *kset, struct kobject *kobj, | |||
574 | return 0; | 574 | return 0; |
575 | } | 575 | } |
576 | 576 | ||
577 | static struct kset_uevent_ops gfs2_uevent_ops = { | 577 | static const struct kset_uevent_ops gfs2_uevent_ops = { |
578 | .uevent = gfs2_uevent, | 578 | .uevent = gfs2_uevent, |
579 | }; | 579 | }; |
580 | 580 | ||
diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c index 99e9fea11077..5ae71e75a491 100644 --- a/fs/jbd/transaction.c +++ b/fs/jbd/transaction.c | |||
@@ -1398,7 +1398,7 @@ int journal_stop(handle_t *handle) | |||
1398 | * the case where our storage is so fast that it is more optimal to go | 1398 | * the case where our storage is so fast that it is more optimal to go |
1399 | * ahead and force a flush and wait for the transaction to be committed | 1399 | * ahead and force a flush and wait for the transaction to be committed |
1400 | * than it is to wait for an arbitrary amount of time for new writers to | 1400 | * than it is to wait for an arbitrary amount of time for new writers to |
1401 | * join the transaction. We acheive this by measuring how long it takes | 1401 | * join the transaction. We achieve this by measuring how long it takes |
1402 | * to commit a transaction, and compare it with how long this | 1402 | * to commit a transaction, and compare it with how long this |
1403 | * transaction has been running, and if run time < commit time then we | 1403 | * transaction has been running, and if run time < commit time then we |
1404 | * sleep for the delta and commit. This greatly helps super fast disks | 1404 | * sleep for the delta and commit. This greatly helps super fast disks |
diff --git a/fs/locks.c b/fs/locks.c index ae9ded026b7c..ab24d49fc048 100644 --- a/fs/locks.c +++ b/fs/locks.c | |||
@@ -1455,7 +1455,7 @@ EXPORT_SYMBOL(generic_setlease); | |||
1455 | * leases held by processes on this node. | 1455 | * leases held by processes on this node. |
1456 | * | 1456 | * |
1457 | * There is also no break_lease method; filesystems that | 1457 | * There is also no break_lease method; filesystems that |
1458 | * handle their own leases shoud break leases themselves from the | 1458 | * handle their own leases should break leases themselves from the |
1459 | * filesystem's open, create, and (on truncate) setattr methods. | 1459 | * filesystem's open, create, and (on truncate) setattr methods. |
1460 | * | 1460 | * |
1461 | * Warning: the only current setlease methods exist only to disable | 1461 | * Warning: the only current setlease methods exist only to disable |
diff --git a/fs/mpage.c b/fs/mpage.c index 42381bd6543b..598d54e200eb 100644 --- a/fs/mpage.c +++ b/fs/mpage.c | |||
@@ -561,7 +561,7 @@ page_is_mapped: | |||
561 | if (page->index >= end_index) { | 561 | if (page->index >= end_index) { |
562 | /* | 562 | /* |
563 | * The page straddles i_size. It must be zeroed out on each | 563 | * The page straddles i_size. It must be zeroed out on each |
564 | * and every writepage invokation because it may be mmapped. | 564 | * and every writepage invocation because it may be mmapped. |
565 | * "A file is mapped in multiples of the page size. For a file | 565 | * "A file is mapped in multiples of the page size. For a file |
566 | * that is not a multiple of the page size, the remaining memory | 566 | * that is not a multiple of the page size, the remaining memory |
567 | * is zeroed when mapped, and writes to that region are not | 567 | * is zeroed when mapped, and writes to that region are not |
diff --git a/fs/namei.c b/fs/namei.c index 48e60a187325..1c0fca6e899e 100644 --- a/fs/namei.c +++ b/fs/namei.c | |||
@@ -2544,7 +2544,7 @@ SYSCALL_DEFINE2(link, const char __user *, oldname, const char __user *, newname | |||
2544 | * e) conversion from fhandle to dentry may come in the wrong moment - when | 2544 | * e) conversion from fhandle to dentry may come in the wrong moment - when |
2545 | * we are removing the target. Solution: we will have to grab ->i_mutex | 2545 | * we are removing the target. Solution: we will have to grab ->i_mutex |
2546 | * in the fhandle_to_dentry code. [FIXME - current nfsfh.c relies on | 2546 | * in the fhandle_to_dentry code. [FIXME - current nfsfh.c relies on |
2547 | * ->i_mutex on parents, which works but leads to some truely excessive | 2547 | * ->i_mutex on parents, which works but leads to some truly excessive |
2548 | * locking]. | 2548 | * locking]. |
2549 | */ | 2549 | */ |
2550 | static int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry, | 2550 | static int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry, |
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 78c7e24e5129..c47b4d7bafa7 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c | |||
@@ -1528,7 +1528,7 @@ static void write_cinfo(__be32 **p, struct nfsd4_change_info *c) | |||
1528 | } } while (0); | 1528 | } } while (0); |
1529 | 1529 | ||
1530 | /* Encode as an array of strings the string given with components | 1530 | /* Encode as an array of strings the string given with components |
1531 | * seperated @sep. | 1531 | * separated @sep. |
1532 | */ | 1532 | */ |
1533 | static __be32 nfsd4_encode_components(char sep, char *components, | 1533 | static __be32 nfsd4_encode_components(char sep, char *components, |
1534 | __be32 **pp, int *buflen) | 1534 | __be32 **pp, int *buflen) |
diff --git a/fs/nilfs2/alloc.h b/fs/nilfs2/alloc.h index f4543ac4f560..5cccf874d692 100644 --- a/fs/nilfs2/alloc.h +++ b/fs/nilfs2/alloc.h | |||
@@ -42,7 +42,7 @@ void *nilfs_palloc_block_get_entry(const struct inode *, __u64, | |||
42 | const struct buffer_head *, void *); | 42 | const struct buffer_head *, void *); |
43 | 43 | ||
44 | /** | 44 | /** |
45 | * nilfs_palloc_req - persistent alloctor request and reply | 45 | * nilfs_palloc_req - persistent allocator request and reply |
46 | * @pr_entry_nr: entry number (vblocknr or inode number) | 46 | * @pr_entry_nr: entry number (vblocknr or inode number) |
47 | * @pr_desc_bh: buffer head of the buffer containing block group descriptors | 47 | * @pr_desc_bh: buffer head of the buffer containing block group descriptors |
48 | * @pr_bitmap_bh: buffer head of the buffer containing a block group bitmap | 48 | * @pr_bitmap_bh: buffer head of the buffer containing a block group bitmap |
diff --git a/fs/nilfs2/dat.c b/fs/nilfs2/dat.c index 9d1e5de91afb..013146755683 100644 --- a/fs/nilfs2/dat.c +++ b/fs/nilfs2/dat.c | |||
@@ -288,7 +288,7 @@ int nilfs_dat_mark_dirty(struct inode *dat, __u64 vblocknr) | |||
288 | * @vblocknrs and @nitems. | 288 | * @vblocknrs and @nitems. |
289 | * | 289 | * |
290 | * Return Value: On success, 0 is returned. On error, one of the following | 290 | * Return Value: On success, 0 is returned. On error, one of the following |
291 | * nagative error codes is returned. | 291 | * negative error codes is returned. |
292 | * | 292 | * |
293 | * %-EIO - I/O error. | 293 | * %-EIO - I/O error. |
294 | * | 294 | * |
diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c index 0092840492ee..85c89dfc71f0 100644 --- a/fs/nilfs2/dir.c +++ b/fs/nilfs2/dir.c | |||
@@ -396,7 +396,7 @@ nilfs_find_entry(struct inode *dir, const struct qstr *qstr, | |||
396 | /* next page is past the blocks we've got */ | 396 | /* next page is past the blocks we've got */ |
397 | if (unlikely(n > (dir->i_blocks >> (PAGE_CACHE_SHIFT - 9)))) { | 397 | if (unlikely(n > (dir->i_blocks >> (PAGE_CACHE_SHIFT - 9)))) { |
398 | nilfs_error(dir->i_sb, __func__, | 398 | nilfs_error(dir->i_sb, __func__, |
399 | "dir %lu size %lld exceeds block cout %llu", | 399 | "dir %lu size %lld exceeds block count %llu", |
400 | dir->i_ino, dir->i_size, | 400 | dir->i_ino, dir->i_size, |
401 | (unsigned long long)dir->i_blocks); | 401 | (unsigned long long)dir->i_blocks); |
402 | goto out; | 402 | goto out; |
diff --git a/fs/nilfs2/gcinode.c b/fs/nilfs2/gcinode.c index e16a6664dfa2..8880a9e281e7 100644 --- a/fs/nilfs2/gcinode.c +++ b/fs/nilfs2/gcinode.c | |||
@@ -28,10 +28,10 @@ | |||
28 | * gcinodes), and this file provides lookup function of the dummy | 28 | * gcinodes), and this file provides lookup function of the dummy |
29 | * inodes and their buffer read function. | 29 | * inodes and their buffer read function. |
30 | * | 30 | * |
31 | * Since NILFS2 keeps up multiple checkpoints/snapshots accross GC, it | 31 | * Since NILFS2 keeps up multiple checkpoints/snapshots across GC, it |
32 | * has to treat blocks that belong to a same file but have different | 32 | * has to treat blocks that belong to a same file but have different |
33 | * checkpoint numbers. To avoid interference among generations, dummy | 33 | * checkpoint numbers. To avoid interference among generations, dummy |
34 | * inodes are managed separatly from actual inodes, and their lookup | 34 | * inodes are managed separately from actual inodes, and their lookup |
35 | * function (nilfs_gc_iget) is designed to be specified with a | 35 | * function (nilfs_gc_iget) is designed to be specified with a |
36 | * checkpoint number argument as well as an inode number. | 36 | * checkpoint number argument as well as an inode number. |
37 | * | 37 | * |
diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c index a2692bbc7b50..fc246dba112a 100644 --- a/fs/nilfs2/page.c +++ b/fs/nilfs2/page.c | |||
@@ -292,7 +292,7 @@ void nilfs_free_private_page(struct page *page) | |||
292 | * @src: source page | 292 | * @src: source page |
293 | * @copy_dirty: flag whether to copy dirty states on the page's buffer heads. | 293 | * @copy_dirty: flag whether to copy dirty states on the page's buffer heads. |
294 | * | 294 | * |
295 | * This fuction is for both data pages and btnode pages. The dirty flag | 295 | * This function is for both data pages and btnode pages. The dirty flag |
296 | * should be treated by caller. The page must not be under i/o. | 296 | * should be treated by caller. The page must not be under i/o. |
297 | * Both src and dst page must be locked | 297 | * Both src and dst page must be locked |
298 | */ | 298 | */ |
@@ -388,7 +388,7 @@ repeat: | |||
388 | } | 388 | } |
389 | 389 | ||
390 | /** | 390 | /** |
391 | * nilfs_copy_back_pages -- copy back pages to orignal cache from shadow cache | 391 | * nilfs_copy_back_pages -- copy back pages to original cache from shadow cache |
392 | * @dmap: destination page cache | 392 | * @dmap: destination page cache |
393 | * @smap: source page cache | 393 | * @smap: source page cache |
394 | * | 394 | * |
diff --git a/fs/nilfs2/segbuf.c b/fs/nilfs2/segbuf.c index ab56fe44e377..636eaafd6ea2 100644 --- a/fs/nilfs2/segbuf.c +++ b/fs/nilfs2/segbuf.c | |||
@@ -32,7 +32,7 @@ | |||
32 | struct nilfs_write_info { | 32 | struct nilfs_write_info { |
33 | struct the_nilfs *nilfs; | 33 | struct the_nilfs *nilfs; |
34 | struct bio *bio; | 34 | struct bio *bio; |
35 | int start, end; /* The region to be submitted */ | 35 | int start, end; /* The region to be submitted */ |
36 | int rest_blocks; | 36 | int rest_blocks; |
37 | int max_pages; | 37 | int max_pages; |
38 | int nr_vecs; | 38 | int nr_vecs; |
@@ -174,7 +174,7 @@ int nilfs_segbuf_reset(struct nilfs_segment_buffer *segbuf, unsigned flags, | |||
174 | } | 174 | } |
175 | 175 | ||
176 | /* | 176 | /* |
177 | * Setup segument summary | 177 | * Setup segment summary |
178 | */ | 178 | */ |
179 | void nilfs_segbuf_fill_in_segsum(struct nilfs_segment_buffer *segbuf) | 179 | void nilfs_segbuf_fill_in_segsum(struct nilfs_segment_buffer *segbuf) |
180 | { | 180 | { |
@@ -470,8 +470,8 @@ static int nilfs_segbuf_submit_bh(struct nilfs_segment_buffer *segbuf, | |||
470 | * | 470 | * |
471 | * %-ENOMEM - Insufficient memory available. | 471 | * %-ENOMEM - Insufficient memory available. |
472 | */ | 472 | */ |
473 | int nilfs_segbuf_write(struct nilfs_segment_buffer *segbuf, | 473 | static int nilfs_segbuf_write(struct nilfs_segment_buffer *segbuf, |
474 | struct the_nilfs *nilfs) | 474 | struct the_nilfs *nilfs) |
475 | { | 475 | { |
476 | struct nilfs_write_info wi; | 476 | struct nilfs_write_info wi; |
477 | struct buffer_head *bh; | 477 | struct buffer_head *bh; |
@@ -514,7 +514,7 @@ int nilfs_segbuf_write(struct nilfs_segment_buffer *segbuf, | |||
514 | * | 514 | * |
515 | * %-EIO - I/O error | 515 | * %-EIO - I/O error |
516 | */ | 516 | */ |
517 | int nilfs_segbuf_wait(struct nilfs_segment_buffer *segbuf) | 517 | static int nilfs_segbuf_wait(struct nilfs_segment_buffer *segbuf) |
518 | { | 518 | { |
519 | int err = 0; | 519 | int err = 0; |
520 | 520 | ||
diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c index ada2f1b947a3..69576a95e13f 100644 --- a/fs/nilfs2/segment.c +++ b/fs/nilfs2/segment.c | |||
@@ -141,7 +141,7 @@ int nilfs_init_transaction_cache(void) | |||
141 | } | 141 | } |
142 | 142 | ||
143 | /** | 143 | /** |
144 | * nilfs_detroy_transaction_cache - destroy the cache for transaction info | 144 | * nilfs_destroy_transaction_cache - destroy the cache for transaction info |
145 | * | 145 | * |
146 | * nilfs_destroy_transaction_cache() frees the slab cache for the struct | 146 | * nilfs_destroy_transaction_cache() frees the slab cache for the struct |
147 | * nilfs_transaction_info. | 147 | * nilfs_transaction_info. |
@@ -201,7 +201,7 @@ static int nilfs_prepare_segment_lock(struct nilfs_transaction_info *ti) | |||
201 | * This function allocates a nilfs_transaction_info struct to keep context | 201 | * This function allocates a nilfs_transaction_info struct to keep context |
202 | * information on it. It is initialized and hooked onto the current task in | 202 | * information on it. It is initialized and hooked onto the current task in |
203 | * the outermost call. If a pre-allocated struct is given to @ti, it is used | 203 | * the outermost call. If a pre-allocated struct is given to @ti, it is used |
204 | * instead; othewise a new struct is assigned from a slab. | 204 | * instead; otherwise a new struct is assigned from a slab. |
205 | * | 205 | * |
206 | * When @vacancy_check flag is set, this function will check the amount of | 206 | * When @vacancy_check flag is set, this function will check the amount of |
207 | * free space, and will wait for the GC to reclaim disk space if low capacity. | 207 | * free space, and will wait for the GC to reclaim disk space if low capacity. |
@@ -2214,7 +2214,7 @@ static int nilfs_segctor_do_construct(struct nilfs_sc_info *sci, int mode) | |||
2214 | } | 2214 | } |
2215 | 2215 | ||
2216 | /** | 2216 | /** |
2217 | * nilfs_secgtor_start_timer - set timer of background write | 2217 | * nilfs_segctor_start_timer - set timer of background write |
2218 | * @sci: nilfs_sc_info | 2218 | * @sci: nilfs_sc_info |
2219 | * | 2219 | * |
2220 | * If the timer has already been set, it ignores the new request. | 2220 | * If the timer has already been set, it ignores the new request. |
@@ -2854,7 +2854,7 @@ static void nilfs_segctor_destroy(struct nilfs_sc_info *sci) | |||
2854 | * @sbi: nilfs_sb_info | 2854 | * @sbi: nilfs_sb_info |
2855 | * | 2855 | * |
2856 | * nilfs_attach_segment_constructor() allocates a struct nilfs_sc_info, | 2856 | * nilfs_attach_segment_constructor() allocates a struct nilfs_sc_info, |
2857 | * initilizes it, and starts the segment constructor. | 2857 | * initializes it, and starts the segment constructor. |
2858 | * | 2858 | * |
2859 | * Return Value: On success, 0 is returned. On error, one of the following | 2859 | * Return Value: On success, 0 is returned. On error, one of the following |
2860 | * negative error code is returned. | 2860 | * negative error code is returned. |
diff --git a/fs/nilfs2/segment.h b/fs/nilfs2/segment.h index 3155e0c7f415..82dfd6a686b9 100644 --- a/fs/nilfs2/segment.h +++ b/fs/nilfs2/segment.h | |||
@@ -30,7 +30,7 @@ | |||
30 | #include "sb.h" | 30 | #include "sb.h" |
31 | 31 | ||
32 | /** | 32 | /** |
33 | * struct nilfs_recovery_info - Recovery infomation | 33 | * struct nilfs_recovery_info - Recovery information |
34 | * @ri_need_recovery: Recovery status | 34 | * @ri_need_recovery: Recovery status |
35 | * @ri_super_root: Block number of the last super root | 35 | * @ri_super_root: Block number of the last super root |
36 | * @ri_ri_cno: Number of the last checkpoint | 36 | * @ri_ri_cno: Number of the last checkpoint |
@@ -71,7 +71,7 @@ struct nilfs_recovery_info { | |||
71 | */ | 71 | */ |
72 | struct nilfs_cstage { | 72 | struct nilfs_cstage { |
73 | int scnt; | 73 | int scnt; |
74 | unsigned flags; | 74 | unsigned flags; |
75 | struct nilfs_inode_info *dirty_file_ptr; | 75 | struct nilfs_inode_info *dirty_file_ptr; |
76 | struct nilfs_inode_info *gc_inode_ptr; | 76 | struct nilfs_inode_info *gc_inode_ptr; |
77 | }; | 77 | }; |
diff --git a/fs/nilfs2/sufile.c b/fs/nilfs2/sufile.c index b6c36d0cc331..3c6cc6005c2e 100644 --- a/fs/nilfs2/sufile.c +++ b/fs/nilfs2/sufile.c | |||
@@ -18,7 +18,7 @@ | |||
18 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
19 | * | 19 | * |
20 | * Written by Koji Sato <koji@osrg.net>. | 20 | * Written by Koji Sato <koji@osrg.net>. |
21 | * Rivised by Ryusuke Konishi <ryusuke@osrg.net>. | 21 | * Revised by Ryusuke Konishi <ryusuke@osrg.net>. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c index 92579cc4c935..0cdbc5e7655a 100644 --- a/fs/nilfs2/super.c +++ b/fs/nilfs2/super.c | |||
@@ -436,7 +436,7 @@ static int nilfs_statfs(struct dentry *dentry, struct kstatfs *buf) | |||
436 | /* | 436 | /* |
437 | * Compute the overhead | 437 | * Compute the overhead |
438 | * | 438 | * |
439 | * When distributing meta data blocks outside semgent structure, | 439 | * When distributing meta data blocks outside segment structure, |
440 | * We must count them as the overhead. | 440 | * We must count them as the overhead. |
441 | */ | 441 | */ |
442 | overhead = 0; | 442 | overhead = 0; |
@@ -866,7 +866,7 @@ static int nilfs_remount(struct super_block *sb, int *flags, char *data) | |||
866 | if ((*flags & MS_RDONLY) && | 866 | if ((*flags & MS_RDONLY) && |
867 | sbi->s_snapshot_cno != old_opts.snapshot_cno) { | 867 | sbi->s_snapshot_cno != old_opts.snapshot_cno) { |
868 | printk(KERN_WARNING "NILFS (device %s): couldn't " | 868 | printk(KERN_WARNING "NILFS (device %s): couldn't " |
869 | "remount to a different snapshot. \n", | 869 | "remount to a different snapshot.\n", |
870 | sb->s_id); | 870 | sb->s_id); |
871 | err = -EINVAL; | 871 | err = -EINVAL; |
872 | goto restore_opts; | 872 | goto restore_opts; |
diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c index 92733d5651d2..33871f7e4f01 100644 --- a/fs/nilfs2/the_nilfs.c +++ b/fs/nilfs2/the_nilfs.c | |||
@@ -386,7 +386,7 @@ static int nilfs_store_disk_layout(struct the_nilfs *nilfs, | |||
386 | 386 | ||
387 | nilfs->ns_blocks_per_segment = le32_to_cpu(sbp->s_blocks_per_segment); | 387 | nilfs->ns_blocks_per_segment = le32_to_cpu(sbp->s_blocks_per_segment); |
388 | if (nilfs->ns_blocks_per_segment < NILFS_SEG_MIN_BLOCKS) { | 388 | if (nilfs->ns_blocks_per_segment < NILFS_SEG_MIN_BLOCKS) { |
389 | printk(KERN_ERR "NILFS: too short segment. \n"); | 389 | printk(KERN_ERR "NILFS: too short segment.\n"); |
390 | return -EINVAL; | 390 | return -EINVAL; |
391 | } | 391 | } |
392 | 392 | ||
diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog deleted file mode 100644 index 37c11e194372..000000000000 --- a/fs/ntfs/ChangeLog +++ /dev/null | |||
@@ -1,1702 +0,0 @@ | |||
1 | ToDo/Notes: | ||
2 | - Find and fix bugs. | ||
3 | - The only places in the kernel where a file is resized are | ||
4 | ntfs_file_write*() and ntfs_truncate() for both of which i_mutex is | ||
5 | held. Just have to be careful in read-/writepage and other helpers | ||
6 | not running under i_mutex that we play nice. Also need to be careful | ||
7 | with initialized_size extension in ntfs_file_write*() and writepage. | ||
8 | UPDATE: The only things that need to be checked are the compressed | ||
9 | write and the other attribute resize/write cases like index | ||
10 | attributes, etc. For now none of these are implemented so are safe. | ||
11 | - Implement filling in of holes in aops.c::ntfs_writepage() and its | ||
12 | helpers. | ||
13 | - Implement mft.c::sync_mft_mirror_umount(). We currently will just | ||
14 | leave the volume dirty on umount if the final iput(vol->mft_ino) | ||
15 | causes a write of any mirrored mft records due to the mft mirror | ||
16 | inode having been discarded already. Whether this can actually ever | ||
17 | happen is unclear however so it is worth waiting until someone hits | ||
18 | the problem. | ||
19 | |||
20 | 2.1.29 - Fix a deadlock at mount time. | ||
21 | |||
22 | - During mount the VFS holds s_umount lock on the superblock. So when | ||
23 | we try to empty the journal $LogFile contents by calling | ||
24 | ntfs_attr_set() when the machine does not have much memory and the | ||
25 | journal is large ntfs_attr_set() results in the VM trying to balance | ||
26 | dirty pages which in turn tries to that the s_umount lock and thus we | ||
27 | get a deadlock. The solution is to not use ntfs_attr_set() and | ||
28 | instead do the zeroing by hand at the block level rather than page | ||
29 | cache level. | ||
30 | - Fix sparse warnings. | ||
31 | |||
32 | 2.1.28 - Fix a deadlock. | ||
33 | |||
34 | - Fix deadlock in fs/ntfs/inode.c::ntfs_put_inode(). Thanks to Sergey | ||
35 | Vlasov for the report and detailed analysis of the deadlock. The fix | ||
36 | involved getting rid of ntfs_put_inode() altogether and hence NTFS no | ||
37 | longer has a ->put_inode super operation. | ||
38 | |||
39 | 2.1.27 - Various bug fixes and cleanups. | ||
40 | |||
41 | - Fix two compiler warnings on Alpha. Thanks to Andrew Morton for | ||
42 | reporting them. | ||
43 | - Fix an (innocent) off-by-one error in the runlist code. | ||
44 | - Fix a buggette in an "should be impossible" case handling where we | ||
45 | continued the attribute lookup loop instead of aborting it. | ||
46 | - Use buffer_migrate_page() for the ->migratepage function of all ntfs | ||
47 | address space operations. | ||
48 | - Fix comparison of $MFT and $MFTMirr to not bail out when there are | ||
49 | unused, invalid mft records which are the same in both $MFT and | ||
50 | $MFTMirr. | ||
51 | - Add support for sparse files which have a compression unit of 0. | ||
52 | - Remove all the make_bad_inode() calls. This should only be called | ||
53 | from read inode and new inode code paths. | ||
54 | - Limit name length in fs/ntfs/unistr.c::ntfs_nlstoucs() to maximum | ||
55 | allowed by NTFS, i.e. 255 Unicode characters, not including the | ||
56 | terminating NULL (which is not stored on disk). | ||
57 | - Improve comments on file attribute flags in fs/ntfs/layout.h. | ||
58 | - Fix a bug in fs/ntfs/inode.c::ntfs_read_locked_index_inode() where we | ||
59 | forgot to update a temporary variable so loading index inodes which | ||
60 | have an index allocation attribute failed. | ||
61 | - Add a missing call to flush_dcache_mft_record_page() in | ||
62 | fs/ntfs/inode.c::ntfs_write_inode(). | ||
63 | - Handle the recently introduced -ENAMETOOLONG return value from | ||
64 | fs/ntfs/unistr.c::ntfs_nlstoucs() in fs/ntfs/namei.c::ntfs_lookup(). | ||
65 | - Semaphore to mutex conversion. (Ingo Molnar) | ||
66 | |||
67 | 2.1.26 - Minor bug fixes and updates. | ||
68 | |||
69 | - Fix a potential overflow in file.c where a cast to s64 was missing in | ||
70 | a left shift of a page index. | ||
71 | - The struct inode has had its i_sem semaphore changed to a mutex named | ||
72 | i_mutex. | ||
73 | - We have struct kmem_cache now so use it instead of the typedef | ||
74 | kmem_cache_t. (Pekka Enberg) | ||
75 | - Implement support for sector sizes above 512 bytes (up to the maximum | ||
76 | supported by NTFS which is 4096 bytes). | ||
77 | - Do more detailed reporting of why we cannot mount read-write by | ||
78 | special casing the VOLUME_MODIFIED_BY_CHKDSK flag. | ||
79 | - Miscellaneous updates to layout.h. | ||
80 | - Cope with attribute list attribute having invalid flags. Windows | ||
81 | copes with this and even chkdsk does not detect or fix this so we | ||
82 | have to cope with it, too. Thanks to Pawel Kot for reporting the | ||
83 | problem. | ||
84 | |||
85 | 2.1.25 - (Almost) fully implement write(2) and truncate(2). | ||
86 | |||
87 | - Change ntfs_map_runlist_nolock(), ntfs_attr_find_vcn_nolock() and | ||
88 | {__,}ntfs_cluster_free() to also take an optional attribute search | ||
89 | context as argument. This allows calling these functions with the | ||
90 | mft record mapped. Update all callers. | ||
91 | - Fix potential deadlock in ntfs_mft_data_extend_allocation_nolock() | ||
92 | error handling by passing in the active search context when calling | ||
93 | ntfs_cluster_free(). | ||
94 | - Change ntfs_cluster_alloc() to take an extra boolean parameter | ||
95 | specifying whether the cluster are being allocated to extend an | ||
96 | attribute or to fill a hole. | ||
97 | - Change ntfs_attr_make_non_resident() to call ntfs_cluster_alloc() | ||
98 | with @is_extension set to TRUE and remove the runlist terminator | ||
99 | fixup code as this is now done by ntfs_cluster_alloc(). | ||
100 | - Change ntfs_attr_make_non_resident to take the attribute value size | ||
101 | as an extra parameter. This is needed since we need to know the size | ||
102 | before we can map the mft record and our callers always know it. The | ||
103 | reason we cannot simply read the size from the vfs inode i_size is | ||
104 | that this is not necessarily uptodate. This happens when | ||
105 | ntfs_attr_make_non_resident() is called in the ->truncate call path. | ||
106 | - Fix ntfs_attr_make_non_resident() to update the vfs inode i_blocks | ||
107 | which is zero for a resident attribute but should no longer be zero | ||
108 | once the attribute is non-resident as it then has real clusters | ||
109 | allocated. | ||
110 | - Add fs/ntfs/attrib.[hc]::ntfs_attr_extend_allocation(), a function to | ||
111 | extend the allocation of an attributes. Optionally, the data size, | ||
112 | but not the initialized size can be extended, too. | ||
113 | - Implement fs/ntfs/inode.[hc]::ntfs_truncate(). It only supports | ||
114 | uncompressed and unencrypted files and it never creates sparse files | ||
115 | at least for the moment (making a file sparse requires us to modify | ||
116 | its directory entries and we do not support directory operations at | ||
117 | the moment). Also, support for highly fragmented files, i.e. ones | ||
118 | whose data attribute is split across multiple extents, is severly | ||
119 | limited. When such a case is encountered, EOPNOTSUPP is returned. | ||
120 | - Enable ATTR_SIZE attribute changes in ntfs_setattr(). This completes | ||
121 | the initial implementation of file truncation. Now both open(2)ing | ||
122 | a file with the O_TRUNC flag and the {,f}truncate(2) system calls | ||
123 | will resize a file appropriately. The limitations are that only | ||
124 | uncompressed and unencrypted files are supported. Also, there is | ||
125 | only very limited support for highly fragmented files (the ones whose | ||
126 | $DATA attribute is split into multiple attribute extents). | ||
127 | - In attrib.c::ntfs_attr_set() call balance_dirty_pages_ratelimited() | ||
128 | and cond_resched() in the main loop as we could be dirtying a lot of | ||
129 | pages and this ensures we play nice with the VM and the system as a | ||
130 | whole. | ||
131 | - Implement file operations ->write, ->aio_write, ->writev for regular | ||
132 | files. This replaces the old use of generic_file_write(), et al and | ||
133 | the address space operations ->prepare_write and ->commit_write. | ||
134 | This means that both sparse and non-sparse (unencrypted and | ||
135 | uncompressed) files can now be extended using the normal write(2) | ||
136 | code path. There are two limitations at present and these are that | ||
137 | we never create sparse files and that we only have limited support | ||
138 | for highly fragmented files, i.e. ones whose data attribute is split | ||
139 | across multiple extents. When such a case is encountered, | ||
140 | EOPNOTSUPP is returned. | ||
141 | - $EA attributes can be both resident and non-resident. | ||
142 | - Use %z for size_t to fix compilation warnings. (Andrew Morton) | ||
143 | - Fix compilation warnings with gcc-4.0.2 on SUSE 10.0. | ||
144 | - Document extended attribute ($EA) NEED_EA flag. (Based on libntfs | ||
145 | patch by Yura Pakhuchiy.) | ||
146 | |||
147 | 2.1.24 - Lots of bug fixes and support more clean journal states. | ||
148 | |||
149 | - Support journals ($LogFile) which have been modified by chkdsk. This | ||
150 | means users can boot into Windows after we marked the volume dirty. | ||
151 | The Windows boot will run chkdsk and then reboot. The user can then | ||
152 | immediately boot into Linux rather than having to do a full Windows | ||
153 | boot first before rebooting into Linux and we will recognize such a | ||
154 | journal and empty it as it is clean by definition. Note, this only | ||
155 | works if chkdsk left the journal in an obviously clean state. | ||
156 | - Support journals ($LogFile) with only one restart page as well as | ||
157 | journals with two different restart pages. We sanity check both and | ||
158 | either use the only sane one or the more recent one of the two in the | ||
159 | case that both are valid. | ||
160 | - Add fs/ntfs/malloc.h::ntfs_malloc_nofs_nofail() which is analogous to | ||
161 | ntfs_malloc_nofs() but it performs allocations with __GFP_NOFAIL and | ||
162 | hence cannot fail. | ||
163 | - Use ntfs_malloc_nofs_nofail() in the two critical regions in | ||
164 | fs/ntfs/runlist.c::ntfs_runlists_merge(). This means we no longer | ||
165 | need to panic() if the allocation fails as it now cannot fail. | ||
166 | - Fix two nasty runlist merging bugs that had gone unnoticed so far. | ||
167 | Thanks to Stefano Picerno for the bug report. | ||
168 | - Remove two bogus BUG_ON()s from fs/ntfs/mft.c. | ||
169 | - Fix handling of valid but empty mapping pairs array in | ||
170 | fs/ntfs/runlist.c::ntfs_mapping_pairs_decompress(). | ||
171 | - Report unrepresentable inodes during ntfs_readdir() as KERN_WARNING | ||
172 | messages and include the inode number. Thanks to Yura Pakhuchiy for | ||
173 | pointing this out. | ||
174 | - Change ntfs_rl_truncate_nolock() to throw away the runlist if the new | ||
175 | length is zero. | ||
176 | - Add runlist.[hc]::ntfs_rl_punch_nolock() which punches a caller | ||
177 | specified hole into a runlist. | ||
178 | - Fix a bug in fs/ntfs/index.c::ntfs_index_lookup(). When the returned | ||
179 | index entry is in the index root, we forgot to set the @ir pointer in | ||
180 | the index context. Thanks to Yura Pakhuchiy for finding this bug. | ||
181 | - Remove bogus setting of PageError in ntfs_read_compressed_block(). | ||
182 | - Add fs/ntfs/attrib.[hc]::ntfs_resident_attr_value_resize(). | ||
183 | - Fix a bug in ntfs_map_runlist_nolock() where we forgot to protect | ||
184 | access to the allocated size in the ntfs inode with the size lock. | ||
185 | - Fix ntfs_attr_vcn_to_lcn_nolock() and ntfs_attr_find_vcn_nolock() to | ||
186 | return LCN_ENOENT when there is no runlist and the allocated size is | ||
187 | zero. | ||
188 | - Fix load_attribute_list() to handle the case of a NULL runlist. | ||
189 | - Fix handling of sparse attributes in ntfs_attr_make_non_resident(). | ||
190 | - Add BUG() checks to ntfs_attr_make_non_resident() and ntfs_attr_set() | ||
191 | to ensure that these functions are never called for compressed or | ||
192 | encrypted attributes. | ||
193 | - Fix cluster (de)allocators to work when the runlist is NULL and more | ||
194 | importantly to take a locked runlist rather than them locking it | ||
195 | which leads to lock reversal. | ||
196 | - Truncate {a,c,m}time to the ntfs supported time granularity when | ||
197 | updating the times in the inode in ntfs_setattr(). | ||
198 | - Fixup handling of sparse, compressed, and encrypted attributes in | ||
199 | fs/ntfs/inode.c::ntfs_read_locked_{,attr_,index_}inode(), | ||
200 | fs/ntfs/aops.c::ntfs_{read,write}page(). | ||
201 | - Make ntfs_write_block() not instantiate sparse blocks if they contain | ||
202 | only zeroes. | ||
203 | - Optimize fs/ntfs/aops.c::ntfs_write_block() by extending the page | ||
204 | lock protection over the buffer submission for i/o which allows the | ||
205 | removal of the get_bh()/put_bh() pairs for each buffer. | ||
206 | - Fix fs/ntfs/aops.c::ntfs_{read,write}_block() to handle the case | ||
207 | where a concurrent truncate has truncated the runlist under our feet. | ||
208 | - Fix page_has_buffers()/page_buffers() handling in fs/ntfs/aops.c. | ||
209 | - In fs/ntfs/aops.c::ntfs_end_buffer_async_read(), use a bit spin lock | ||
210 | in the first buffer head instead of a driver global spin lock to | ||
211 | improve scalability. | ||
212 | - Minor fix to error handling and error message display in | ||
213 | fs/ntfs/aops.c::ntfs_prepare_nonresident_write(). | ||
214 | - Change the mount options {u,f,d}mask to always parse the number as | ||
215 | an octal number to conform to how chmod(1) works, too. Thanks to | ||
216 | Giuseppe Bilotta and Horst von Brand for pointing out the errors of | ||
217 | my ways. | ||
218 | - Fix various bugs in the runlist merging code. (Based on libntfs | ||
219 | changes by Richard Russon.) | ||
220 | - Fix sparse warnings that have crept in over time. | ||
221 | - Change ntfs_cluster_free() to require a write locked runlist on entry | ||
222 | since we otherwise get into a lock reversal deadlock if a read locked | ||
223 | runlist is passed in. In the process also change it to take an ntfs | ||
224 | inode instead of a vfs inode as parameter. | ||
225 | - Fix the definition of the CHKD ntfs record magic. It had an off by | ||
226 | two error causing it to be CHKB instead of CHKD. | ||
227 | - Fix a stupid bug in __ntfs_bitmap_set_bits_in_run() which caused the | ||
228 | count to become negative and hence we had a wild memset() scribbling | ||
229 | all over the system's ram. | ||
230 | |||
231 | 2.1.23 - Implement extension of resident files and make writing safe as well as | ||
232 | many bug fixes, cleanups, and enhancements... | ||
233 | |||
234 | - Add printk rate limiting for ntfs_warning() and ntfs_error() when | ||
235 | compiled without debug. This avoids a possible denial of service | ||
236 | attack. Thanks to Carl-Daniel Hailfinger from SuSE for pointing this | ||
237 | out. | ||
238 | - Fix compilation warnings on ia64. (Randy Dunlap) | ||
239 | - Use i_size_{read,write}() instead of reading i_size by hand and cache | ||
240 | the value where apropriate. | ||
241 | - Add size_lock to the ntfs_inode structure. This is an rw spinlock | ||
242 | and it locks against access to the inode sizes. Note, ->size_lock | ||
243 | is also accessed from irq context so you must use the _irqsave and | ||
244 | _irqrestore lock and unlock functions, respectively. Protect all | ||
245 | accesses to allocated_size, initialized_size, and compressed_size. | ||
246 | - Minor optimization to fs/ntfs/super.c::ntfs_statfs() and its helpers. | ||
247 | - Implement extension of resident files in the regular file write code | ||
248 | paths (fs/ntfs/aops.c::ntfs_{prepare,commit}_write()). At present | ||
249 | this only works until the data attribute becomes too big for the mft | ||
250 | record after which we abort the write returning -EOPNOTSUPP from | ||
251 | ntfs_prepare_write(). | ||
252 | - Add disable_sparse mount option together with a per volume sparse | ||
253 | enable bit which is set appropriately and a per inode sparse disable | ||
254 | bit which is preset on some system file inodes as appropriate. | ||
255 | - Enforce that sparse support is disabled on NTFS volumes pre 3.0. | ||
256 | - Fix a bug in fs/ntfs/runlist.c::ntfs_mapping_pairs_decompress() in | ||
257 | the creation of the unmapped runlist element for the base attribute | ||
258 | extent. | ||
259 | - Split ntfs_map_runlist() into ntfs_map_runlist() and a non-locking | ||
260 | helper ntfs_map_runlist_nolock() which is used by ntfs_map_runlist(). | ||
261 | This allows us to map runlist fragments with the runlist lock already | ||
262 | held without having to drop and reacquire it around the call. Adapt | ||
263 | all callers. | ||
264 | - Change ntfs_find_vcn() to ntfs_find_vcn_nolock() which takes a locked | ||
265 | runlist. This allows us to find runlist elements with the runlist | ||
266 | lock already held without having to drop and reacquire it around the | ||
267 | call. Adapt all callers. | ||
268 | - Change time to u64 in time.h::ntfs2utc() as it otherwise generates a | ||
269 | warning in the do_div() call on sparc32. Thanks to Meelis Roos for | ||
270 | the report and analysis of the warning. | ||
271 | - Fix a nasty runlist merge bug when merging two holes. | ||
272 | - Set the ntfs_inode->allocated_size to the real allocated size in the | ||
273 | mft record for resident attributes (fs/ntfs/inode.c). | ||
274 | - Small readability cleanup to use "a" instead of "ctx->attr" | ||
275 | everywhere (fs/ntfs/inode.c). | ||
276 | - Make fs/ntfs/namei.c::ntfs_get_{parent,dentry} static and move the | ||
277 | definition of ntfs_export_ops from fs/ntfs/super.c to namei.c. Also, | ||
278 | declare ntfs_export_ops in fs/ntfs/ntfs.h. | ||
279 | - Correct sparse file handling. The compressed values need to be | ||
280 | checked and set in the ntfs inode as done for compressed files and | ||
281 | the compressed size needs to be used for vfs inode->i_blocks instead | ||
282 | of the allocated size, again, as done for compressed files. | ||
283 | - Add AT_EA in addition to AT_DATA to whitelist for being allowed to be | ||
284 | non-resident in fs/ntfs/attrib.c::ntfs_attr_can_be_non_resident(). | ||
285 | - Add fs/ntfs/attrib.c::ntfs_attr_vcn_to_lcn_nolock() used by the new | ||
286 | write code. | ||
287 | - Fix bug in fs/ntfs/attrib.c::ntfs_find_vcn_nolock() where after | ||
288 | dropping the read lock and taking the write lock we were not checking | ||
289 | whether someone else did not already do the work we wanted to do. | ||
290 | - Rename fs/ntfs/attrib.c::ntfs_find_vcn_nolock() to | ||
291 | ntfs_attr_find_vcn_nolock() and update all callers. | ||
292 | - Add fs/ntfs/attrib.[hc]::ntfs_attr_make_non_resident(). | ||
293 | - Fix sign of various error return values to be negative in | ||
294 | fs/ntfs/lcnalloc.c. | ||
295 | - Modify ->readpage and ->writepage (fs/ntfs/aops.c) so they detect and | ||
296 | handle the case where an attribute is converted from resident to | ||
297 | non-resident by a concurrent file write. | ||
298 | - Remove checks for NULL before calling kfree() since kfree() does the | ||
299 | checking itself. (Jesper Juhl) | ||
300 | - Some utilities modify the boot sector but do not update the checksum. | ||
301 | Thus, relax the checking in fs/ntfs/super.c::is_boot_sector_ntfs() to | ||
302 | only emit a warning when the checksum is incorrect rather than | ||
303 | refusing the mount. Thanks to Bernd Casimir for pointing this | ||
304 | problem out. | ||
305 | - Update attribute definition handling. | ||
306 | - Add NTFS_MAX_CLUSTER_SIZE and NTFS_MAX_PAGES_PER_CLUSTER constants. | ||
307 | - Use NTFS_MAX_CLUSTER_SIZE in super.c instead of hard coding 0x10000. | ||
308 | - Use MAX_BUF_PER_PAGE instead of variable sized array allocation for | ||
309 | better code generation and one less sparse warning in fs/ntfs/aops.c. | ||
310 | - Remove spurious void pointer casts from fs/ntfs/. (Pekka Enberg) | ||
311 | - Use C99 style structure initialization after memory allocation where | ||
312 | possible (fs/ntfs/{attrib.c,index.c,super.c}). Thanks to Al Viro and | ||
313 | Pekka Enberg. | ||
314 | - Stamp the transaction log ($UsnJrnl), aka user space journal, if it | ||
315 | is active on the volume and we are mounting read-write or remounting | ||
316 | from read-only to read-write. | ||
317 | - Fix a bug in address space operations error recovery code paths where | ||
318 | if the runlist was not mapped at all and a mapping error occured we | ||
319 | would leave the runlist locked on exit to the function so that the | ||
320 | next access to the same file would try to take the lock and deadlock. | ||
321 | - Detect the case when Windows has been suspended to disk on the volume | ||
322 | to be mounted and if this is the case do not allow (re)mounting | ||
323 | read-write. This is done by parsing hiberfil.sys if present. | ||
324 | - Fix several occurences of a bug where we would perform 'var & ~const' | ||
325 | with a 64-bit variable and a int, i.e. 32-bit, constant. This causes | ||
326 | the higher order 32-bits of the 64-bit variable to be zeroed. To fix | ||
327 | this cast the 'const' to the same 64-bit type as 'var'. | ||
328 | - Change the runlist terminator of the newly allocated cluster(s) to | ||
329 | LCN_ENOENT in ntfs_attr_make_non_resident(). Otherwise the runlist | ||
330 | code gets confused. | ||
331 | - Add an extra parameter @last_vcn to ntfs_get_size_for_mapping_pairs() | ||
332 | and ntfs_mapping_pairs_build() to allow the runlist encoding to be | ||
333 | partial which is desirable when filling holes in sparse attributes. | ||
334 | Update all callers. | ||
335 | - Change ntfs_map_runlist_nolock() to only decompress the mapping pairs | ||
336 | if the requested vcn is inside it. Otherwise we get into problems | ||
337 | when we try to map an out of bounds vcn because we then try to map | ||
338 | the already mapped runlist fragment which causes | ||
339 | ntfs_mapping_pairs_decompress() to fail and return error. Update | ||
340 | ntfs_attr_find_vcn_nolock() accordingly. | ||
341 | - Fix a nasty deadlock that appeared in recent kernels. | ||
342 | The situation: VFS inode X on a mounted ntfs volume is dirty. For | ||
343 | same inode X, the ntfs_inode is dirty and thus corresponding on-disk | ||
344 | inode, i.e. mft record, which is in a dirty PAGE_CACHE_PAGE belonging | ||
345 | to the table of inodes, i.e. $MFT, inode 0. | ||
346 | What happens: | ||
347 | Process 1: sys_sync()/umount()/whatever... calls | ||
348 | __sync_single_inode() for $MFT -> do_writepages() -> write_page for | ||
349 | the dirty page containing the on-disk inode X, the page is now locked | ||
350 | -> ntfs_write_mst_block() which clears PageUptodate() on the page to | ||
351 | prevent anyone else getting hold of it whilst it does the write out. | ||
352 | This is necessary as the on-disk inode needs "fixups" applied before | ||
353 | the write to disk which are removed again after the write and | ||
354 | PageUptodate is then set again. It then analyses the page looking | ||
355 | for dirty on-disk inodes and when it finds one it calls | ||
356 | ntfs_may_write_mft_record() to see if it is safe to write this | ||
357 | on-disk inode. This then calls ilookup5() to check if the | ||
358 | corresponding VFS inode is in icache(). This in turn calls ifind() | ||
359 | which waits on the inode lock via wait_on_inode whilst holding the | ||
360 | global inode_lock. | ||
361 | Process 2: pdflush results in a call to __sync_single_inode for the | ||
362 | same VFS inode X on the ntfs volume. This locks the inode (I_LOCK) | ||
363 | then calls write-inode -> ntfs_write_inode -> map_mft_record() -> | ||
364 | read_cache_page() for the page (in page cache of table of inodes | ||
365 | $MFT, inode 0) containing the on-disk inode. This page has | ||
366 | PageUptodate() clear because of Process 1 (see above) so | ||
367 | read_cache_page() blocks when it tries to take the page lock for the | ||
368 | page so it can call ntfs_read_page(). | ||
369 | Thus Process 1 is holding the page lock on the page containing the | ||
370 | on-disk inode X and it is waiting on the inode X to be unlocked in | ||
371 | ifind() so it can write the page out and then unlock the page. | ||
372 | And Process 2 is holding the inode lock on inode X and is waiting for | ||
373 | the page to be unlocked so it can call ntfs_readpage() or discover | ||
374 | that Process 1 set PageUptodate() again and use the page. | ||
375 | Thus we have a deadlock due to ifind() waiting on the inode lock. | ||
376 | The solution: The fix is to use the newly introduced | ||
377 | ilookup5_nowait() which does not wait on the inode's lock and hence | ||
378 | avoids the deadlock. This is safe as we do not care about the VFS | ||
379 | inode and only use the fact that it is in the VFS inode cache and the | ||
380 | fact that the vfs and ntfs inodes are one struct in memory to find | ||
381 | the ntfs inode in memory if present. Also, the ntfs inode has its | ||
382 | own locking so it does not matter if the vfs inode is locked. | ||
383 | - Fix bug in mft record writing where we forgot to set the device in | ||
384 | the buffers when mapping them after the VM had discarded them. | ||
385 | Thanks to Martin MOKREJÃ… for the bug report. | ||
386 | |||
387 | 2.1.22 - Many bug and race fixes and error handling improvements. | ||
388 | |||
389 | - Improve error handling in fs/ntfs/inode.c::ntfs_truncate(). | ||
390 | - Change fs/ntfs/inode.c::ntfs_truncate() to return an error code | ||
391 | instead of void and provide a helper ntfs_truncate_vfs() for the | ||
392 | vfs ->truncate method. | ||
393 | - Add a new ntfs inode flag NInoTruncateFailed() and modify | ||
394 | fs/ntfs/inode.c::ntfs_truncate() to set and clear it appropriately. | ||
395 | - Fix min_size and max_size definitions in ATTR_DEF structure in | ||
396 | fs/ntfs/layout.h to be signed. | ||
397 | - Add attribute definition handling helpers to fs/ntfs/attrib.[hc]: | ||
398 | ntfs_attr_size_bounds_check(), ntfs_attr_can_be_non_resident(), and | ||
399 | ntfs_attr_can_be_resident(), which in turn use the new private helper | ||
400 | ntfs_attr_find_in_attrdef(). | ||
401 | - In fs/ntfs/aops.c::mark_ntfs_record_dirty(), take the | ||
402 | mapping->private_lock around the dirtying of the buffer heads | ||
403 | analagous to the way it is done in __set_page_dirty_buffers(). | ||
404 | - Ensure the mft record size does not exceed the PAGE_CACHE_SIZE at | ||
405 | mount time as this cannot work with the current implementation. | ||
406 | - Check for location of attribute name and improve error handling in | ||
407 | general in fs/ntfs/inode.c::ntfs_read_locked_inode() and friends. | ||
408 | - In fs/ntfs/aops.c::ntfs_writepage(), if the page is fully outside | ||
409 | i_size, i.e. race with truncate, invalidate the buffers on the page | ||
410 | so that they become freeable and hence the page does not leak. | ||
411 | - Remove unused function fs/ntfs/runlist.c::ntfs_rl_merge(). (Adrian | ||
412 | Bunk) | ||
413 | - Fix stupid bug in fs/ntfs/attrib.c::ntfs_attr_find() that resulted in | ||
414 | a NULL pointer dereference in the error code path when a corrupt | ||
415 | attribute was found. (Thanks to Domen Puncer for the bug report.) | ||
416 | - Add MODULE_VERSION() to fs/ntfs/super.c. | ||
417 | - Make several functions and variables static. (Adrian Bunk) | ||
418 | - Modify fs/ntfs/aops.c::mark_ntfs_record_dirty() so it allocates | ||
419 | buffers for the page if they are not present and then marks the | ||
420 | buffers belonging to the ntfs record dirty. This causes the buffers | ||
421 | to become busy and hence they are safe from removal until the page | ||
422 | has been written out. | ||
423 | - Fix stupid bug in fs/ntfs/attrib.c::ntfs_external_attr_find() in the | ||
424 | error handling code path that resulted in a BUG() due to trying to | ||
425 | unmap an extent mft record when the mapping of it had failed and it | ||
426 | thus was not mapped. (Thanks to Ken MacFerrin for the bug report.) | ||
427 | - Drop the runlist lock after the vcn has been read in | ||
428 | fs/ntfs/lcnalloc.c::__ntfs_cluster_free(). | ||
429 | - Rewrite handling of multi sector transfer errors. We now do not set | ||
430 | PageError() when such errors are detected in the async i/o handler | ||
431 | fs/ntfs/aops.c::ntfs_end_buffer_async_read(). All users of mst | ||
432 | protected attributes now check the magic of each ntfs record as they | ||
433 | use it and act appropriately. This has the effect of making errors | ||
434 | granular per ntfs record rather than per page which solves the case | ||
435 | where we cannot access any of the ntfs records in a page when a | ||
436 | single one of them had an mst error. (Thanks to Ken MacFerrin for | ||
437 | the bug report.) | ||
438 | - Fix error handling in fs/ntfs/quota.c::ntfs_mark_quotas_out_of_date() | ||
439 | where we failed to release i_mutex on the $Quota/$Q attribute inode. | ||
440 | - Fix bug in handling of bad inodes in fs/ntfs/namei.c::ntfs_lookup(). | ||
441 | - Add mapping of unmapped buffers to all remaining code paths, i.e. | ||
442 | fs/ntfs/aops.c::ntfs_write_mst_block(), mft.c::ntfs_sync_mft_mirror(), | ||
443 | and write_mft_record_nolock(). From now on we require that the | ||
444 | complete runlist for the mft mirror is always mapped into memory. | ||
445 | - Add creation of buffers to fs/ntfs/mft.c::ntfs_sync_mft_mirror(). | ||
446 | - Improve error handling in fs/ntfs/aops.c::ntfs_{read,write}_block(). | ||
447 | - Cleanup fs/ntfs/aops.c::ntfs_{read,write}page() since we know that a | ||
448 | resident attribute will be smaller than a page which makes the code | ||
449 | simpler. Also make the code more tolerant to concurrent ->truncate. | ||
450 | |||
451 | 2.1.21 - Fix some races and bugs, rewrite mft write code, add mft allocator. | ||
452 | |||
453 | - Implement extent mft record deallocation | ||
454 | fs/ntfs/mft.c::ntfs_extent_mft_record_free(). | ||
455 | - Splitt runlist related functions off from attrib.[hc] to runlist.[hc]. | ||
456 | - Add vol->mft_data_pos and initialize it at mount time. | ||
457 | - Rename init_runlist() to ntfs_init_runlist(), ntfs_vcn_to_lcn() to | ||
458 | ntfs_rl_vcn_to_lcn(), decompress_mapping_pairs() to | ||
459 | ntfs_mapping_pairs_decompress(), ntfs_merge_runlists() to | ||
460 | ntfs_runlists_merge() and adapt all callers. | ||
461 | - Add fs/ntfs/runlist.[hc]::ntfs_get_nr_significant_bytes(), | ||
462 | ntfs_get_size_for_mapping_pairs(), ntfs_write_significant_bytes(), | ||
463 | and ntfs_mapping_pairs_build(), adapted from libntfs. | ||
464 | - Make fs/ntfs/lcnalloc.c::ntfs_cluster_free_from_rl_nolock() not | ||
465 | static and add a declaration for it to lcnalloc.h. | ||
466 | - Add fs/ntfs/lcnalloc.h::ntfs_cluster_free_from_rl() which is a static | ||
467 | inline wrapper for ntfs_cluster_free_from_rl_nolock() which takes the | ||
468 | cluster bitmap lock for the duration of the call. | ||
469 | - Add fs/ntfs/attrib.[hc]::ntfs_attr_record_resize(). | ||
470 | - Implement the equivalent of memset() for an ntfs attribute in | ||
471 | fs/ntfs/attrib.[hc]::ntfs_attr_set() and switch | ||
472 | fs/ntfs/logfile.c::ntfs_empty_logfile() to using it. | ||
473 | - Remove unnecessary casts from LCN_* constants. | ||
474 | - Implement fs/ntfs/runlist.c::ntfs_rl_truncate_nolock(). | ||
475 | - Add MFT_RECORD_OLD as a copy of MFT_RECORD in fs/ntfs/layout.h and | ||
476 | change MFT_RECORD to contain the NTFS 3.1+ specific fields. | ||
477 | - Add a helper function fs/ntfs/aops.c::mark_ntfs_record_dirty() which | ||
478 | marks all buffers belonging to an ntfs record dirty, followed by | ||
479 | marking the page the ntfs record is in dirty and also marking the vfs | ||
480 | inode containing the ntfs record dirty (I_DIRTY_PAGES). | ||
481 | - Switch fs/ntfs/index.h::ntfs_index_entry_mark_dirty() to using the | ||
482 | new helper fs/ntfs/aops.c::mark_ntfs_record_dirty() and remove the no | ||
483 | longer needed fs/ntfs/index.[hc]::__ntfs_index_entry_mark_dirty(). | ||
484 | - Move ntfs_{un,}map_page() from ntfs.h to aops.h and fix resulting | ||
485 | include errors. | ||
486 | - Move the typedefs for runlist_element and runlist from types.h to | ||
487 | runlist.h and fix resulting include errors. | ||
488 | - Remove unused {__,}format_mft_record() from fs/ntfs/mft.c. | ||
489 | - Modify fs/ntfs/mft.c::__mark_mft_record_dirty() to use the helper | ||
490 | mark_ntfs_record_dirty() which also changes the behaviour in that we | ||
491 | now set the buffers belonging to the mft record dirty as well as the | ||
492 | page itself. | ||
493 | - Update fs/ntfs/mft.c::write_mft_record_nolock() and sync_mft_mirror() | ||
494 | to cope with the fact that there now are dirty buffers in mft pages. | ||
495 | - Update fs/ntfs/inode.c::ntfs_write_inode() to also use the helper | ||
496 | mark_ntfs_record_dirty() and thus to set the buffers belonging to the | ||
497 | mft record dirty as well as the page itself. | ||
498 | - Fix compiler warnings on x86-64 in fs/ntfs/dir.c. (Randy Dunlap, | ||
499 | slightly modified by me) | ||
500 | - Add fs/ntfs/mft.c::try_map_mft_record() which fails with -EALREADY if | ||
501 | the mft record is already locked and otherwise behaves the same way | ||
502 | as fs/ntfs/mft.c::map_mft_record(). | ||
503 | - Modify fs/ntfs/mft.c::write_mft_record_nolock() so that it only | ||
504 | writes the mft record if the buffers belonging to it are dirty. | ||
505 | Otherwise we assume that it was written out by other means already. | ||
506 | - Attempting to write outside initialized size is _not_ a bug so remove | ||
507 | the bug check from fs/ntfs/aops.c::ntfs_write_mst_block(). It is in | ||
508 | fact required to write outside initialized size when preparing to | ||
509 | extend the initialized size. | ||
510 | - Map the page instead of using page_address() before writing to it in | ||
511 | fs/ntfs/aops.c::ntfs_mft_writepage(). | ||
512 | - Provide exclusion between opening an inode / mapping an mft record | ||
513 | and accessing the mft record in fs/ntfs/mft.c::ntfs_mft_writepage() | ||
514 | by setting the page not uptodate throughout ntfs_mft_writepage(). | ||
515 | - Clear the page uptodate flag in fs/ntfs/aops.c::ntfs_write_mst_block() | ||
516 | to ensure noone can see the page whilst the mst fixups are applied. | ||
517 | - Add the helper fs/ntfs/mft.c::ntfs_may_write_mft_record() which | ||
518 | checks if an mft record may be written out safely obtaining any | ||
519 | necessary locks in the process. This is used by | ||
520 | fs/ntfs/aops.c::ntfs_write_mst_block(). | ||
521 | - Modify fs/ntfs/aops.c::ntfs_write_mst_block() to also work for | ||
522 | writing mft records and improve its error handling in the process. | ||
523 | Now if any of the records in the page fail to be written out, all | ||
524 | other records will be written out instead of aborting completely. | ||
525 | - Remove ntfs_mft_aops and update all users to use ntfs_mst_aops. | ||
526 | - Modify fs/ntfs/inode.c::ntfs_read_locked_inode() to set the | ||
527 | ntfs_mst_aops for all inodes which are NInoMstProtected() and | ||
528 | ntfs_aops for all other inodes. | ||
529 | - Rename fs/ntfs/mft.c::sync_mft_mirror{,_umount}() to | ||
530 | ntfs_sync_mft_mirror{,_umount}() and change their parameters so they | ||
531 | no longer require an ntfs inode to be present. Update all callers. | ||
532 | - Cleanup the error handling in fs/ntfs/mft.c::ntfs_sync_mft_mirror(). | ||
533 | - Clear the page uptodate flag in fs/ntfs/mft.c::ntfs_sync_mft_mirror() | ||
534 | to ensure noone can see the page whilst the mst fixups are applied. | ||
535 | - Remove the no longer needed fs/ntfs/mft.c::ntfs_mft_writepage() and | ||
536 | fs/ntfs/mft.c::try_map_mft_record(). | ||
537 | - Fix callers of fs/ntfs/aops.c::mark_ntfs_record_dirty() to call it | ||
538 | with the ntfs inode which contains the page rather than the ntfs | ||
539 | inode the mft record of which is in the page. | ||
540 | - Fix race condition in fs/ntfs/inode.c::ntfs_put_inode() by moving the | ||
541 | index inode bitmap inode release code from there to | ||
542 | fs/ntfs/inode.c::ntfs_clear_big_inode(). (Thanks to Christoph | ||
543 | Hellwig for spotting this.) | ||
544 | - Fix race condition in fs/ntfs/inode.c::ntfs_put_inode() by taking the | ||
545 | inode semaphore around the code that sets ni->itype.index.bmp_ino to | ||
546 | NULL and reorganize the code to optimize it a bit. (Thanks to | ||
547 | Christoph Hellwig for spotting this.) | ||
548 | - Modify fs/ntfs/aops.c::mark_ntfs_record_dirty() to no longer take the | ||
549 | ntfs inode as a parameter as this is confusing and misleading and the | ||
550 | needed ntfs inode is available via NTFS_I(page->mapping->host). | ||
551 | Adapt all callers to this change. | ||
552 | - Modify fs/ntfs/mft.c::write_mft_record_nolock() and | ||
553 | fs/ntfs/aops.c::ntfs_write_mst_block() to only check the dirty state | ||
554 | of the first buffer in a record and to take this as the ntfs record | ||
555 | dirty state. We cannot look at the dirty state for subsequent | ||
556 | buffers because we might be racing with | ||
557 | fs/ntfs/aops.c::mark_ntfs_record_dirty(). | ||
558 | - Move the static inline ntfs_init_big_inode() from fs/ntfs/inode.c to | ||
559 | inode.h and make fs/ntfs/inode.c::__ntfs_init_inode() non-static and | ||
560 | add a declaration for it to inode.h. Fix some compilation issues | ||
561 | that resulted due to #includes and header file interdependencies. | ||
562 | - Simplify setup of i_mode in fs/ntfs/inode.c::ntfs_read_locked_inode(). | ||
563 | - Add helpers fs/ntfs/layout.h::MK_MREF() and MK_LE_MREF(). | ||
564 | - Modify fs/ntfs/mft.c::map_extent_mft_record() to only verify the mft | ||
565 | record sequence number if it is specified (i.e. not zero). | ||
566 | - Add fs/ntfs/mft.[hc]::ntfs_mft_record_alloc() and various helper | ||
567 | functions used by it. | ||
568 | - Update Documentation/filesystems/ntfs.txt with instructions on how to | ||
569 | use the Device-Mapper driver with NTFS ftdisk/LDM raid. This removes | ||
570 | the linear raid problem with the Software RAID / MD driver when one | ||
571 | or more of the devices has an odd number of sectors. | ||
572 | |||
573 | 2.1.20 - Fix two stupid bugs introduced in 2.1.18 release. | ||
574 | |||
575 | - Fix stupid bug in fs/ntfs/attrib.c::ntfs_attr_reinit_search_ctx() | ||
576 | where we did not clear ctx->al_entry but it was still set due to | ||
577 | changes in ntfs_attr_lookup() and ntfs_external_attr_find() in | ||
578 | particular. | ||
579 | - Fix another stupid bug in fs/ntfs/attrib.c::ntfs_external_attr_find() | ||
580 | where we forgot to unmap the extent mft record when we had finished | ||
581 | enumerating an attribute which caused a bug check to trigger when the | ||
582 | VFS calls ->clear_inode. | ||
583 | |||
584 | 2.1.19 - Many cleanups, improvements, and a minor bug fix. | ||
585 | |||
586 | - Update ->setattr (fs/ntfs/inode.c::ntfs_setattr()) to refuse to | ||
587 | change the uid, gid, and mode of an inode as we do not support NTFS | ||
588 | ACLs yet. | ||
589 | - Remove BKL use from ntfs_setattr() syncing up with the rest of the | ||
590 | kernel. | ||
591 | - Get rid of the ugly transparent union in fs/ntfs/dir.c::ntfs_readdir() | ||
592 | and ntfs_filldir() as per suggestion from Al Viro. | ||
593 | - Change '\0' and L'\0' to simply 0 as per advice from Linus Torvalds. | ||
594 | - Update ->truncate (fs/ntfs/inode.c::ntfs_truncate()) to check if the | ||
595 | inode size has changed and to only output an error if so. | ||
596 | - Rename fs/ntfs/attrib.h::attribute_value_length() to ntfs_attr_size(). | ||
597 | - Add le{16,32,64} as well as sle{16,32,64} data types to | ||
598 | fs/ntfs/types.h. | ||
599 | - Change ntfschar to be le16 instead of u16 in fs/ntfs/types.h. | ||
600 | - Add le versions of VCN, LCN, and LSN called leVCN, leLCN, and leLSN, | ||
601 | respectively, to fs/ntfs/types.h. | ||
602 | - Update endianness conversion macros in fs/ntfs/endian.h to use the | ||
603 | new types as appropriate. | ||
604 | - Do proper type casting when using sle64_to_cpup() in fs/ntfs/dir.c | ||
605 | and index.c. | ||
606 | - Add leMFT_REF data type to fs/ntfs/layout.h. | ||
607 | - Update all NTFS header files with the new little endian data types. | ||
608 | Affected files are fs/ntfs/layout.h, logfile.h, and time.h. | ||
609 | - Do proper type casting when using ntfs_is_*_recordp() in | ||
610 | fs/ntfs/logfile.c, mft.c, and super.c. | ||
611 | - Fix all the sparse bitwise warnings. Had to change all the typedef | ||
612 | enums storing little endian values to simple enums plus a typedef for | ||
613 | the datatype to make sparse happy. | ||
614 | - Fix a bug found by the new sparse bitwise warnings where the default | ||
615 | upcase table was defined as a pointer to wchar_t rather than ntfschar | ||
616 | in fs/ntfs/ntfs.h and super.c. | ||
617 | - Change {const_,}cpu_to_le{16,32}(0) to just 0 as suggested by Al Viro. | ||
618 | |||
619 | 2.1.18 - Fix scheduling latencies at mount time as well as an endianness bug. | ||
620 | |||
621 | - Remove vol->nr_mft_records as it was pretty meaningless and optimize | ||
622 | the calculation of total/free inodes as used by statfs(). | ||
623 | - Fix scheduling latencies in ntfs_fill_super() by dropping the BKL | ||
624 | because the code itself is using the ntfs_lock semaphore which | ||
625 | provides safe locking. (Ingo Molnar) | ||
626 | - Fix a potential bug in fs/ntfs/mft.c::map_extent_mft_record() that | ||
627 | could occur in the future for when we start closing/freeing extent | ||
628 | inodes if we don't set base_ni->ext.extent_ntfs_inos to NULL after | ||
629 | we free it. | ||
630 | - Rename {find,lookup}_attr() to ntfs_attr_{find,lookup}() as well as | ||
631 | find_external_attr() to ntfs_external_attr_find() to cleanup the | ||
632 | namespace a bit and to be more consistent with libntfs. | ||
633 | - Rename {{re,}init,get,put}_attr_search_ctx() to | ||
634 | ntfs_attr_{{re,}init,get,put}_search_ctx() as well as the type | ||
635 | attr_search_context to ntfs_attr_search_ctx. | ||
636 | - Force use of ntfs_attr_find() in ntfs_attr_lookup() when searching | ||
637 | for the attribute list attribute itself. | ||
638 | - Fix endianness bug in ntfs_external_attr_find(). | ||
639 | - Change ntfs_{external_,}attr_find() to return 0 on success, -ENOENT | ||
640 | if the attribute is not found, and -EIO on real error. In the case | ||
641 | of -ENOENT, the search context is updated to describe the attribute | ||
642 | before which the attribute being searched for would need to be | ||
643 | inserted if such an action were to be desired and in the case of | ||
644 | ntfs_external_attr_find() the search context is also updated to | ||
645 | indicate the attribute list entry before which the attribute list | ||
646 | entry of the attribute being searched for would need to be inserted | ||
647 | if such an action were to be desired. Also make ntfs_find_attr() | ||
648 | static and remove its prototype from attrib.h as it is not used | ||
649 | anywhere other than attrib.c. Update ntfs_attr_lookup() and all | ||
650 | callers of ntfs_{external,}attr_{find,lookup}() for the new return | ||
651 | values. | ||
652 | - Minor cleanup of fs/ntfs/inode.c::ntfs_init_locked_inode(). | ||
653 | |||
654 | 2.1.17 - Fix bugs in mount time error code paths and other updates. | ||
655 | |||
656 | - Implement bitmap modification code (fs/ntfs/bitmap.[hc]). This | ||
657 | includes functions to set/clear a single bit or a run of bits. | ||
658 | - Add fs/ntfs/attrib.[hc]::ntfs_find_vcn() which returns the locked | ||
659 | runlist element containing a particular vcn. It also takes care of | ||
660 | mapping any needed runlist fragments. | ||
661 | - Implement cluster (de-)allocation code (fs/ntfs/lcnalloc.[hc]). | ||
662 | - Load attribute definition table from $AttrDef at mount time. | ||
663 | - Fix bugs in mount time error code paths involving (de)allocation of | ||
664 | the default and volume upcase tables. | ||
665 | - Remove ntfs_nr_mounts as it is no longer used. | ||
666 | |||
667 | 2.1.16 - Implement access time updates, file sync, async io, and read/writev. | ||
668 | |||
669 | - Add support for readv/writev and aio_read/aio_write (fs/ntfs/file.c). | ||
670 | This is done by setting the appropriate file operations pointers to | ||
671 | the generic helper functions provided by mm/filemap.c. | ||
672 | - Implement fsync, fdatasync, and msync both for files (fs/ntfs/file.c) | ||
673 | and directories (fs/ntfs/dir.c). | ||
674 | - Add support for {a,m,c}time updates to inode.c::ntfs_write_inode(). | ||
675 | Note, except for the root directory and any other system files opened | ||
676 | by the user, the system files will not have their access times | ||
677 | updated as they are only accessed at the inode level an hence the | ||
678 | file level functions which cause the times to be updated are never | ||
679 | invoked. | ||
680 | |||
681 | 2.1.15 - Invalidate quotas when (re)mounting read-write. | ||
682 | |||
683 | - Add new element itype.index.collation_rule to the ntfs inode | ||
684 | structure and set it appropriately in ntfs_read_locked_inode(). | ||
685 | - Implement a new inode type "index" to allow efficient access to the | ||
686 | indices found in various system files and adapt inode handling | ||
687 | accordingly (fs/ntfs/inode.[hc]). An index inode is essentially an | ||
688 | attribute inode (NInoAttr() is true) with an attribute type of | ||
689 | AT_INDEX_ALLOCATION. As such, it is no longer allowed to call | ||
690 | ntfs_attr_iget() with an attribute type of AT_INDEX_ALLOCATION as | ||
691 | there would be no way to distinguish between normal attribute inodes | ||
692 | and index inodes. The function to obtain an index inode is | ||
693 | ntfs_index_iget() and it uses the helper function | ||
694 | ntfs_read_locked_index_inode(). Note, we do not overload | ||
695 | ntfs_attr_iget() as indices consist of multiple attributes so using | ||
696 | ntfs_attr_iget() to obtain an index inode would be confusing. | ||
697 | - Ensure that there is no overflow when doing page->index << | ||
698 | PAGE_CACHE_SHIFT by casting page->index to s64 in fs/ntfs/aops.c. | ||
699 | - Use atomic kmap instead of kmap() in fs/ntfs/aops.c::ntfs_read_page() | ||
700 | and ntfs_read_block(). | ||
701 | - Use case sensitive attribute lookups instead of case insensitive ones. | ||
702 | - Lock all page cache pages belonging to mst protected attributes while | ||
703 | accessing them to ensure we never see corrupt data while the page is | ||
704 | under writeout. | ||
705 | - Add framework for generic ntfs collation (fs/ntfs/collation.[hc]). | ||
706 | We have ntfs_is_collation_rule_supported() to check if the collation | ||
707 | rule you want to use is supported and ntfs_collation() which actually | ||
708 | collates two data items. We currently only support COLLATION_BINARY | ||
709 | and COLLATION_NTOFS_ULONG but support for other collation rules will | ||
710 | be added as the need arises. | ||
711 | - Add a new type, ntfs_index_context, to allow retrieval of an index | ||
712 | entry using the corresponding index key. To get an index context, | ||
713 | use ntfs_index_ctx_get() and to release it, use ntfs_index_ctx_put(). | ||
714 | This also adds a new slab cache for the index contexts. To lookup a | ||
715 | key in an index inode, use ntfs_index_lookup(). After modifying an | ||
716 | index entry, call ntfs_index_entry_flush_dcache_page() followed by | ||
717 | ntfs_index_entry_mark_dirty() to ensure the changes are written out | ||
718 | to disk. For details see fs/ntfs/index.[hc]. Note, at present, if | ||
719 | an index entry is in the index allocation attribute rather than the | ||
720 | index root attribute it will not be written out (you will get a | ||
721 | warning message about discarded changes instead). | ||
722 | - Load the quota file ($Quota) and check if quota tracking is enabled | ||
723 | and if so, mark the quotas out of date. This causes windows to | ||
724 | rescan the volume on boot and update all quota entries. | ||
725 | - Add a set_page_dirty address space operation for ntfs_m[fs]t_aops. | ||
726 | It is simply set to __set_page_dirty_nobuffers() to make sure that | ||
727 | running set_page_dirty() on a page containing mft/ntfs records will | ||
728 | not affect the dirty state of the page buffers. | ||
729 | - Add fs/ntfs/index.c::__ntfs_index_entry_mark_dirty() which sets all | ||
730 | buffers that are inside the ntfs record in the page dirty after which | ||
731 | it sets the page dirty. This allows ->writepage to only write the | ||
732 | dirty index records rather than having to write all the records in | ||
733 | the page. Modify fs/ntfs/index.h::ntfs_index_entry_mark_dirty() to | ||
734 | use this rather than __set_page_dirty_nobuffers(). | ||
735 | - Implement fs/ntfs/aops.c::ntfs_write_mst_block() which enables the | ||
736 | writing of page cache pages belonging to mst protected attributes | ||
737 | like the index allocation attribute in directory indices and other | ||
738 | indices like $Quota/$Q, etc. This means that the quota is now marked | ||
739 | out of date on all volumes rather than only on ones where the quota | ||
740 | defaults entry is in the index root attribute of the $Quota/$Q index. | ||
741 | |||
742 | 2.1.14 - Fix an NFSd caused deadlock reported by several users. | ||
743 | |||
744 | - Modify fs/ntfs/ntfs_readdir() to copy the index root attribute value | ||
745 | to a buffer so that we can put the search context and unmap the mft | ||
746 | record before calling the filldir() callback. We need to do this | ||
747 | because of NFSd which calls ->lookup() from its filldir callback() | ||
748 | and this causes NTFS to deadlock as ntfs_lookup() maps the mft record | ||
749 | of the directory and since ntfs_readdir() has got it mapped already | ||
750 | ntfs_lookup() deadlocks. | ||
751 | |||
752 | 2.1.13 - Enable overwriting of resident files and housekeeping of system files. | ||
753 | |||
754 | - Implement writing of mft records (fs/ntfs/mft.[hc]), which includes | ||
755 | keeping the mft mirror in sync with the mft when mirrored mft records | ||
756 | are written. The functions are write_mft_record{,_nolock}(). The | ||
757 | implementation is quite rudimentary for now with lots of things not | ||
758 | implemented yet but I am not sure any of them can actually occur so | ||
759 | I will wait for people to hit each one and only then implement it. | ||
760 | - Commit open system inodes at umount time. This should make it | ||
761 | virtually impossible for sync_mft_mirror_umount() to ever be needed. | ||
762 | - Implement ->write_inode (fs/ntfs/inode.c::ntfs_write_inode()) for the | ||
763 | ntfs super operations. This gives us inode writing via the VFS inode | ||
764 | dirty code paths. Note: Access time updates are not implemented yet. | ||
765 | - Implement fs/ntfs/mft.[hc]::{,__}mark_mft_record_dirty() and make | ||
766 | fs/ntfs/aops.c::ntfs_writepage() and ntfs_commit_write() use it, thus | ||
767 | finally enabling resident file overwrite! (-8 This also includes a | ||
768 | placeholder for ->writepage (ntfs_mft_writepage()), which for now | ||
769 | just redirties the page and returns. Also, at umount time, we for | ||
770 | now throw away all mft data page cache pages after the last call to | ||
771 | ntfs_commit_inode() in the hope that all inodes will have been | ||
772 | written out by then and hence no dirty (meta)data will be lost. We | ||
773 | also check for this case and emit an error message telling the user | ||
774 | to run chkdsk. | ||
775 | - Use set_page_writeback() and end_page_writeback() in the resident | ||
776 | attribute code path of fs/ntfs/aops.c::ntfs_writepage() otherwise | ||
777 | the radix-tree tag PAGECACHE_TAG_DIRTY remains set even though the | ||
778 | page is clean. | ||
779 | - Implement ntfs_mft_writepage() so it now checks if any of the mft | ||
780 | records in the page are dirty and if so redirties the page and | ||
781 | returns. Otherwise it just returns (after doing set_page_writeback(), | ||
782 | unlock_page(), end_page_writeback() or the radix-tree tag | ||
783 | PAGECACHE_TAG_DIRTY remains set even though the page is clean), thus | ||
784 | alowing the VM to do with the page as it pleases. Also, at umount | ||
785 | time, now only throw away dirty mft (meta)data pages if dirty inodes | ||
786 | are present and ask the user to email us if they see this happening. | ||
787 | - Add functions ntfs_{clear,set}_volume_flags(), to modify the volume | ||
788 | information flags (fs/ntfs/super.c). | ||
789 | - Mark the volume dirty when (re)mounting read-write and mark it clean | ||
790 | when unmounting or remounting read-only. If any volume errors are | ||
791 | found, the volume is left marked dirty to force chkdsk to run. | ||
792 | - Add code to set the NT4 compatibility flag when (re)mounting | ||
793 | read-write for newer NTFS versions but leave it commented out for now | ||
794 | since we do not make any modifications that are NTFS 1.2 specific yet | ||
795 | and since setting this flag breaks Captive-NTFS which is not nice. | ||
796 | This code must be enabled once we start writing NTFS 1.2 specific | ||
797 | changes otherwise Windows NTFS driver might crash / cause corruption. | ||
798 | |||
799 | 2.1.12 - Fix the second fix to the decompression engine and some cleanups. | ||
800 | |||
801 | - Add a new address space operations struct, ntfs_mst_aops, for mst | ||
802 | protected attributes. This is because the default ntfs_aops do not | ||
803 | make sense with mst protected data and were they to write anything to | ||
804 | such an attribute they would cause data corruption so we provide | ||
805 | ntfs_mst_aops which does not have any write related operations set. | ||
806 | - Cleanup dirty ntfs inode handling (fs/ntfs/inode.[hc]) which also | ||
807 | includes an adapted ntfs_commit_inode() and an implementation of | ||
808 | ntfs_write_inode() which for now just cleans dirty inodes without | ||
809 | writing them (it does emit a warning that this is happening). | ||
810 | - Undo the second decompression engine fix (see 2.1.9 release ChangeLog | ||
811 | entry) as it was only fixing a theoretical bug but at the same time | ||
812 | it badly broke the handling of sparse and uncompressed compression | ||
813 | blocks. | ||
814 | |||
815 | 2.1.11 - Driver internal cleanups. | ||
816 | |||
817 | - Only build logfile.o if building the driver with read-write support. | ||
818 | - Really final white space cleanups. | ||
819 | - Use generic_ffs() instead of ffs() in logfile.c which allows the | ||
820 | log_page_size variable to be optimized by gcc into a constant. | ||
821 | - Rename uchar_t to ntfschar everywhere as uchar_t is unsigned 1-byte | ||
822 | char as defined by POSIX and as found on some systems. | ||
823 | |||
824 | 2.1.10 - Force read-only (re)mounting of volumes with unsupported volume flags. | ||
825 | |||
826 | - Finish off the white space cleanups (remove trailing spaces, etc). | ||
827 | - Clean up ntfs_fill_super() and ntfs_read_inode_mount() by removing | ||
828 | the kludges around the first iget(). Instead of (re)setting ->s_op | ||
829 | we have the $MFT inode set up by explicit new_inode() / set ->i_ino / | ||
830 | insert_inode_hash() / call ntfs_read_inode_mount() directly. This | ||
831 | kills the need for second super_operations and allows to return error | ||
832 | from ntfs_read_inode_mount() without resorting to ugly "poisoning" | ||
833 | tricks. (Al Viro) | ||
834 | - Force read-only (re)mounting if any of the following bits are set in | ||
835 | the volume information flags: | ||
836 | VOLUME_IS_DIRTY, VOLUME_RESIZE_LOG_FILE, | ||
837 | VOLUME_UPGRADE_ON_MOUNT, VOLUME_DELETE_USN_UNDERWAY, | ||
838 | VOLUME_REPAIR_OBJECT_ID, VOLUME_MODIFIED_BY_CHKDSK | ||
839 | To make this easier we define VOLUME_MUST_MOUNT_RO_MASK with all the | ||
840 | above bits set so the test is made easy. | ||
841 | |||
842 | 2.1.9 - Fix two bugs in decompression engine. | ||
843 | |||
844 | - Fix a bug where we would not always detect that we have reached the | ||
845 | end of a compression block because we were ending at minus one byte | ||
846 | which is effectively the same as being at the end. The fix is to | ||
847 | check whether the uncompressed buffer has been fully filled and if so | ||
848 | we assume we have reached the end of the compression block. A big | ||
849 | thank you to Marcin Gibuła for the bug report, the assistance in | ||
850 | tracking down the bug and testing the fix. | ||
851 | - Fix a possible bug where when a compressed read is truncated to the | ||
852 | end of the file, the offset inside the last page was not truncated. | ||
853 | |||
854 | 2.1.8 - Handle $MFT mirror and $LogFile, improve time handling, and cleanups. | ||
855 | |||
856 | - Use get_bh() instead of manual atomic_inc() in fs/ntfs/compress.c. | ||
857 | - Modify fs/ntfs/time.c::ntfs2utc(), get_current_ntfs_time(), and | ||
858 | utc2ntfs() to work with struct timespec instead of time_t on the | ||
859 | Linux UTC time side thus preserving the full precision of the NTFS | ||
860 | time and only loosing up to 99 nano-seconds in the Linux UTC time. | ||
861 | - Move fs/ntfs/time.c to fs/ntfs/time.h and make the time functions | ||
862 | static inline. | ||
863 | - Remove unused ntfs_dirty_inode(). | ||
864 | - Cleanup super operations declaration in fs/ntfs/super.c. | ||
865 | - Wrap flush_dcache_mft_record_page() in #ifdef NTFS_RW. | ||
866 | - Add NInoTestSetFoo() and NInoTestClearFoo() macro magic to | ||
867 | fs/ntfs/inode.h and use it to declare NInoTest{Set,Clear}Dirty. | ||
868 | - Move typedefs for ntfs_attr and test_t from fs/ntfs/inode.c to | ||
869 | fs/ntfs/inode.h so they can be used elsewhere. | ||
870 | - Determine the mft mirror size as the number of mirrored mft records | ||
871 | and store it in ntfs_volume->mftmirr_size (fs/ntfs/super.c). | ||
872 | - Load the mft mirror at mount time and compare the mft records stored | ||
873 | in it to the ones in the mft. Force a read-only mount if the two do | ||
874 | not match (fs/ntfs/super.c). | ||
875 | - Fix type casting related warnings on 64-bit architectures. Thanks | ||
876 | to Meelis Roos for reporting them. | ||
877 | - Move %L to %ll as %L is floating point and %ll is integer which is | ||
878 | what we want. | ||
879 | - Read the journal ($LogFile) and determine if the volume has been | ||
880 | shutdown cleanly and force a read-only mount if not (fs/ntfs/super.c | ||
881 | and fs/ntfs/logfile.c). This is a little bit of a crude check in | ||
882 | that we only look at the restart areas and not at the actual log | ||
883 | records so that there will be a very small number of cases where we | ||
884 | think that a volume is dirty when in fact it is clean. This should | ||
885 | only affect volumes that have not been shutdown cleanly and did not | ||
886 | have any pending, non-check-pointed i/o. | ||
887 | - If the $LogFile indicates a clean shutdown and a read-write (re)mount | ||
888 | is requested, empty $LogFile by overwriting it with 0xff bytes to | ||
889 | ensure that Windows cannot cause data corruption by replaying a stale | ||
890 | journal after Linux has written to the volume. | ||
891 | |||
892 | 2.1.7 - Enable NFS exporting of mounted NTFS volumes. | ||
893 | |||
894 | - Set i_generation in the VFS inode from the seq_no of the NTFS inode. | ||
895 | - Make ntfs_lookup() NFS export safe, i.e. use d_splice_alias(), etc. | ||
896 | - Implement ->get_dentry() in fs/ntfs/namei.c::ntfs_get_dentry() as the | ||
897 | default doesn't allow inode number 0 which is a valid inode on NTFS | ||
898 | and even if it did allow that it uses iget() instead of ntfs_iget() | ||
899 | which makes it useless for us. | ||
900 | - Implement ->get_parent() in fs/ntfs/namei.c::ntfs_get_parent() as the | ||
901 | default just returns -EACCES which is not very useful. | ||
902 | - Define export operations (->s_export_op) for NTFS (ntfs_export_ops) | ||
903 | and set them up in the super block at mount time (super.c) this | ||
904 | allows mounted NTFS volumes to be exported via NFS. | ||
905 | - Add missing return -EOPNOTSUPP; in | ||
906 | fs/ntfs/aops.c::ntfs_commit_nonresident_write(). | ||
907 | - Enforce no atime and no dir atime updates at mount/remount time as | ||
908 | they are not implemented yet anyway. | ||
909 | - Move a few assignments in fs/ntfs/attrib.c::load_attribute_list() to | ||
910 | after a NULL check. Thanks to Dave Jones for pointing this out. | ||
911 | |||
912 | 2.1.6 - Fix minor bug in handling of compressed directories. | ||
913 | |||
914 | - Fix bug in handling of compressed directories. A compressed | ||
915 | directory is not really compressed so when we set the ->i_blocks | ||
916 | field of a compressed directory inode we were setting it from the | ||
917 | non-existing field ni->itype.compressed.size which gave random | ||
918 | results... For directories we now always use ni->allocated_size. | ||
919 | |||
920 | 2.1.5 - Fix minor bug in attribute list attribute handling. | ||
921 | |||
922 | - Fix bug in attribute list handling. Actually it is not as much a bug | ||
923 | as too much protection in that we were not allowing attribute lists | ||
924 | which waste space on disk while Windows XP clearly allows it and in | ||
925 | fact creates such attribute lists so our driver was failing. | ||
926 | - Update NTFS documentation ready for 2.6 kernel release. | ||
927 | |||
928 | 2.1.4 - Reduce compiler requirements. | ||
929 | |||
930 | - Remove all uses of unnamed structs and unions in the driver to make | ||
931 | old and newer gcc versions happy. Makes it a bit uglier IMO but at | ||
932 | least people will stop hassling me about it. | ||
933 | |||
934 | 2.1.3 - Important bug fixes in corner cases. | ||
935 | |||
936 | - super.c::parse_ntfs_boot_sector(): Correct the check for 64-bit | ||
937 | clusters. (Philipp Thomas) | ||
938 | - attrib.c::load_attribute_list(): Fix bug when initialized_size is a | ||
939 | multiple of the block_size but not the cluster size. (Szabolcs | ||
940 | Szakacsits) | ||
941 | |||
942 | 2.1.2 - Important bug fixes aleviating the hangs in statfs. | ||
943 | |||
944 | - Fix buggy free cluster and free inode determination logic. | ||
945 | |||
946 | 2.1.1 - Minor updates. | ||
947 | |||
948 | - Add handling for initialized_size != data_size in compressed files. | ||
949 | - Reduce function local stack usage from 0x3d4 bytes to just noise in | ||
950 | fs/ntfs/upcase.c. (Randy Dunlap) | ||
951 | - Remove compiler warnings for newer gcc. | ||
952 | - Pages are no longer kmapped by mm/filemap.c::generic_file_write() | ||
953 | around calls to ->{prepare,commit}_write. Adapt NTFS appropriately | ||
954 | in fs/ntfs/aops.c::ntfs_prepare_nonresident_write() by using | ||
955 | kmap_atomic(KM_USER0). | ||
956 | |||
957 | 2.1.0 - First steps towards write support: implement file overwrite. | ||
958 | |||
959 | - Add configuration option for developmental write support with an | ||
960 | appropriately scary configuration help text. | ||
961 | - Initial implementation of fs/ntfs/aops.c::ntfs_writepage() and its | ||
962 | helper fs/ntfs/aops.c::ntfs_write_block(). This enables mmap(2) based | ||
963 | overwriting of existing files on ntfs. Note: Resident files are | ||
964 | only written into memory, and not written out to disk at present, so | ||
965 | avoid writing to files smaller than about 1kiB. | ||
966 | - Initial implementation of fs/ntfs/aops.c::ntfs_prepare_write(), its | ||
967 | helper fs/ntfs/aops.c::ntfs_prepare_nonresident_write() and their | ||
968 | counterparts, fs/ntfs/aops.c::ntfs_commit_write(), and | ||
969 | fs/ntfs/aops.c::ntfs_commit_nonresident_write(), respectively. Also, | ||
970 | add generic_file_write() to the ntfs file operations (fs/ntfs/file.c). | ||
971 | This enables write(2) based overwriting of existing files on ntfs. | ||
972 | Note: As with mmap(2) based overwriting, resident files are only | ||
973 | written into memory, and not written out to disk at present, so avoid | ||
974 | writing to files smaller than about 1kiB. | ||
975 | - Implement ->truncate (fs/ntfs/inode.c::ntfs_truncate()) and | ||
976 | ->setattr() (fs/ntfs/inode.c::ntfs_setattr()) inode operations for | ||
977 | files with the purpose of intercepting and aborting all i_size | ||
978 | changes which we do not support yet. ntfs_truncate() actually only | ||
979 | emits a warning message but AFAICS our interception of i_size changes | ||
980 | elsewhere means ntfs_truncate() never gets called for i_size changes. | ||
981 | It is only called from generic_file_write() when we fail in | ||
982 | ntfs_prepare_{,nonresident_}write() in order to discard any | ||
983 | instantiated buffers beyond i_size. Thus i_size is not actually | ||
984 | changed so our warning message is enough. Unfortunately it is not | ||
985 | possible to easily determine if i_size is being changed or not hence | ||
986 | we just emit an appropriately worded error message. | ||
987 | |||
988 | 2.0.25 - Small bug fixes and cleanups. | ||
989 | |||
990 | - Unlock the page in an out of memory error code path in | ||
991 | fs/ntfs/aops.c::ntfs_read_block(). | ||
992 | - If fs/ntfs/aops.c::ntfs_read_page() is called on an uptodate page, | ||
993 | just unlock the page and return. (This can happen due to ->writepage | ||
994 | clearing PageUptodate() during write out of MstProtected() | ||
995 | attributes. | ||
996 | - Remove leaked write code again. | ||
997 | |||
998 | 2.0.24 - Cleanups. | ||
999 | |||
1000 | - Treat BUG_ON() as ASSERT() not VERIFY(), i.e. do not use side effects | ||
1001 | inside BUG_ON(). (Adam J. Richter) | ||
1002 | - Split logical OR expressions inside BUG_ON() into individual BUG_ON() | ||
1003 | calls for improved debugging. (Adam J. Richter) | ||
1004 | - Add errors flag to the ntfs volume state, accessed via | ||
1005 | NVol{,Set,Clear}Errors(vol). | ||
1006 | - Do not allow read-write remounts of read-only volumes with errors. | ||
1007 | - Clarify comment for ntfs file operation sendfile which was added by | ||
1008 | Christoph Hellwig a while ago (just using generic_file_sendfile()) | ||
1009 | to say that ntfs ->sendfile is only used for the case where the | ||
1010 | source data is on the ntfs partition and the destination is | ||
1011 | somewhere else, i.e. nothing we need to concern ourselves with. | ||
1012 | - Add generic_file_write() as our ntfs file write operation. | ||
1013 | |||
1014 | 2.0.23 - Major bug fixes (races, deadlocks, non-i386 architectures). | ||
1015 | |||
1016 | - Massive internal locking changes to mft record locking. Fixes lock | ||
1017 | recursion and replaces the mrec_lock read/write semaphore with a | ||
1018 | mutex. Also removes the now superfluous mft_count. This fixes several | ||
1019 | race conditions and deadlocks, especially in the future write code. | ||
1020 | - Fix ntfs over loopback for compressed files by adding an | ||
1021 | optimization barrier. (gcc was screwing up otherwise ?) | ||
1022 | - Miscellaneous cleanups all over the code and a fix or two in error | ||
1023 | handling code paths. | ||
1024 | Thanks go to Christoph Hellwig for pointing out the following two: | ||
1025 | - Remove now unused function fs/ntfs/malloc.h::vmalloc_nofs(). | ||
1026 | - Fix ntfs_free() for ia64 and parisc by checking for VMALLOC_END, too. | ||
1027 | |||
1028 | 2.0.22 - Cleanups, mainly to ntfs_readdir(), and use C99 initializers. | ||
1029 | |||
1030 | - Change fs/ntfs/dir.c::ntfs_reddir() to only read/write ->f_pos once | ||
1031 | at entry/exit respectively. | ||
1032 | - Use C99 initializers for structures. | ||
1033 | - Remove unused variable blocks from fs/ntfs/aops.c::ntfs_read_block(). | ||
1034 | |||
1035 | 2.0.21 - Check for, and refuse to work with too large files/directories/volumes. | ||
1036 | |||
1037 | - Limit volume size at mount time to 2TiB on architectures where | ||
1038 | unsigned long is 32-bits (fs/ntfs/super.c::parse_ntfs_boot_sector()). | ||
1039 | This is the most we can do without overflowing the 32-bit limit of | ||
1040 | the block device size imposed on us by sb_bread() and sb_getblk() | ||
1041 | for the time being. | ||
1042 | - Limit file/directory size at open() time to 16TiB on architectures | ||
1043 | where unsigned long is 32-bits (fs/ntfs/file.c::ntfs_file_open() and | ||
1044 | fs/ntfs/dir.c::ntfs_dir_open()). This is the most we can do without | ||
1045 | overflowing the page cache page index. | ||
1046 | |||
1047 | 2.0.20 - Support non-resident directory index bitmaps, fix page leak in readdir. | ||
1048 | |||
1049 | - Move the directory index bitmap to use an attribute inode instead of | ||
1050 | having special fields for it inside the ntfs inode structure. This | ||
1051 | means that the index bitmaps now use the page cache for i/o, too, | ||
1052 | and also as a side effect we get support for non-resident index | ||
1053 | bitmaps for free. | ||
1054 | - Simplify/cleanup error handling in fs/ntfs/dir.c::ntfs_readdir() and | ||
1055 | fix a page leak that manifested itself in some cases. | ||
1056 | - Add fs/ntfs/inode.c::ntfs_put_inode(), which we need to release the | ||
1057 | index bitmap inode on the final iput(). | ||
1058 | |||
1059 | 2.0.19 - Fix race condition, improvements, and optimizations in i/o interface. | ||
1060 | |||
1061 | - Apply block optimization added to fs/ntfs/aops.c::ntfs_read_block() | ||
1062 | to fs/ntfs/compress.c::ntfs_file_read_compressed_block() as well. | ||
1063 | - Drop the "file" from ntfs_file_read_compressed_block(). | ||
1064 | - Rename fs/ntfs/aops.c::ntfs_enb_buffer_read_async() to | ||
1065 | ntfs_end_buffer_async_read() (more like the fs/buffer.c counterpart). | ||
1066 | - Update ntfs_end_buffer_async_read() with the improved logic from | ||
1067 | its updated counterpart fs/buffer.c::end_buffer_async_read(). Apply | ||
1068 | further logic improvements to better determine when we set PageError. | ||
1069 | - Update submission of buffers in fs/ntfs/aops.c::ntfs_read_block() to | ||
1070 | check for the buffers being uptodate first in line with the updated | ||
1071 | fs/buffer.c::block_read_full_page(). This plugs a small race | ||
1072 | condition. | ||
1073 | |||
1074 | 2.0.18 - Fix race condition in reading of compressed files. | ||
1075 | |||
1076 | - There was a narrow window between checking a buffer head for being | ||
1077 | uptodate and locking it in ntfs_file_read_compressed_block(). We now | ||
1078 | lock the buffer and then check whether it is uptodate or not. | ||
1079 | |||
1080 | 2.0.17 - Cleanups and optimizations - shrinking the ToDo list. | ||
1081 | |||
1082 | - Modify fs/ntfs/inode.c::ntfs_read_locked_inode() to return an error | ||
1083 | code and update callers, i.e. ntfs_iget(), to pass that error code | ||
1084 | up instead of just using -EIO. | ||
1085 | - Modifications to super.c to ensure that both mount and remount | ||
1086 | cannot set any write related options when the driver is compiled | ||
1087 | read-only. | ||
1088 | - Optimize block resolution in fs/ntfs/aops.c::ntfs_read_block() to | ||
1089 | cache the current runlist element. This should improve performance | ||
1090 | when reading very large and/or very fragmented data. | ||
1091 | |||
1092 | 2.0.16 - Convert access to $MFT/$BITMAP to attribute inode API. | ||
1093 | |||
1094 | - Fix a stupid bug introduced in 2.0.15 where we were unmapping the | ||
1095 | wrong inode in fs/ntfs/inode.c::ntfs_attr_iget(). | ||
1096 | - Fix debugging check in fs/ntfs/aops.c::ntfs_read_block(). | ||
1097 | - Convert $MFT/$BITMAP access to attribute inode API and remove all | ||
1098 | remnants of the ugly mftbmp address space and operations hack. This | ||
1099 | means we finally have only one readpage function as well as only one | ||
1100 | async io completion handler. Yey! The mft bitmap is now just an | ||
1101 | attribute inode and is accessed from vol->mftbmp_ino just as if it | ||
1102 | were a normal file. Fake inodes rule. (-: | ||
1103 | |||
1104 | 2.0.15 - Fake inodes based attribute i/o via the pagecache, fixes and cleanups. | ||
1105 | |||
1106 | - Fix silly bug in fs/ntfs/super.c::parse_options() which was causing | ||
1107 | remounts to fail when the partition had an entry in /etc/fstab and | ||
1108 | the entry specified the nls= option. | ||
1109 | - Apply same macro magic used in fs/ntfs/inode.h to fs/ntfs/volume.h to | ||
1110 | expand all the helper functions NVolFoo(), NVolSetFoo(), and | ||
1111 | NVolClearFoo(). | ||
1112 | - Move copyright statement from driver initialisation message to | ||
1113 | module description (fs/super.c). This makes the initialisation | ||
1114 | message fit on one line and fits in better with rest of kernel. | ||
1115 | - Update fs/ntfs/attrib.c::map_run_list() to work on both real and | ||
1116 | attribute inodes, and both for files and directories. | ||
1117 | - Implement fake attribute inodes allowing all attribute i/o to go via | ||
1118 | the page cache and to use all the normal vfs/mm functionality: | ||
1119 | - Add ntfs_attr_iget() and its helper ntfs_read_locked_attr_inode() | ||
1120 | to fs/ntfs/inode.c. | ||
1121 | - Add needed cleanup code to ntfs_clear_big_inode(). | ||
1122 | - Merge address space operations for files and directories (aops.c), | ||
1123 | now just have ntfs_aops: | ||
1124 | - Rename: | ||
1125 | end_buffer_read_attr_async() -> ntfs_end_buffer_read_async(), | ||
1126 | ntfs_attr_read_block() -> ntfs_read_block(), | ||
1127 | ntfs_file_read_page() -> ntfs_readpage(). | ||
1128 | - Rewrite fs/ntfs/aops.c::ntfs_readpage() to work on both real and | ||
1129 | attribute inodes, and both for files and directories. | ||
1130 | - Remove obsolete fs/ntfs/aops.c::ntfs_mst_readpage(). | ||
1131 | |||
1132 | 2.0.14 - Run list merging code cleanup, minor locking changes, typo fixes. | ||
1133 | |||
1134 | - Change fs/ntfs/super.c::ntfs_statfs() to not rely on BKL by moving | ||
1135 | the locking out of super.c::get_nr_free_mft_records() and taking and | ||
1136 | dropping the mftbmp_lock rw_semaphore in ntfs_statfs() itself. | ||
1137 | - Bring attribute runlist merging code (fs/ntfs/attrib.c) in sync with | ||
1138 | current userspace ntfs library code. This means that if a merge | ||
1139 | fails the original runlists are always left unmodified instead of | ||
1140 | being silently corrupted. | ||
1141 | - Misc typo fixes. | ||
1142 | |||
1143 | 2.0.13 - Use iget5_locked() in preparation for fake inodes and small cleanups. | ||
1144 | |||
1145 | - Remove nr_mft_bits and the now superfluous union with nr_mft_records | ||
1146 | from ntfs_volume structure. | ||
1147 | - Remove nr_lcn_bits and the now superfluous union with nr_clusters | ||
1148 | from ntfs_volume structure. | ||
1149 | - Use iget5_locked() and friends instead of conventional iget(). Wrap | ||
1150 | the call in fs/ntfs/inode.c::ntfs_iget() and update callers of iget() | ||
1151 | to use ntfs_iget(). Leave only one iget() call at mount time so we | ||
1152 | don't need an ntfs_iget_mount(). | ||
1153 | - Change fs/ntfs/inode.c::ntfs_new_extent_inode() to take mft_no as an | ||
1154 | additional argument. | ||
1155 | |||
1156 | 2.0.12 - Initial cleanup of address space operations following 2.0.11 changes. | ||
1157 | |||
1158 | - Merge fs/ntfs/aops.c::end_buffer_read_mst_async() and | ||
1159 | fs/ntfs/aops.c::end_buffer_read_file_async() into one function | ||
1160 | fs/ntfs/aops.c::end_buffer_read_attr_async() using NInoMstProtected() | ||
1161 | to determine whether to apply mst fixups or not. | ||
1162 | - Above change allows merging fs/ntfs/aops.c::ntfs_file_read_block() | ||
1163 | and fs/ntfs/aops.c::ntfs_mst_readpage() into one function | ||
1164 | fs/ntfs/aops.c::ntfs_attr_read_block(). Also, create a tiny wrapper | ||
1165 | fs/ntfs/aops.c::ntfs_mst_readpage() to transform the parameters from | ||
1166 | the VFS readpage function prototype to the ntfs_attr_read_block() | ||
1167 | function prototype. | ||
1168 | |||
1169 | 2.0.11 - Initial preparations for fake inode based attribute i/o. | ||
1170 | |||
1171 | - Move definition of ntfs_inode_state_bits to fs/ntfs/inode.h and | ||
1172 | do some macro magic (adapted from include/linux/buffer_head.h) to | ||
1173 | expand all the helper functions NInoFoo(), NInoSetFoo(), and | ||
1174 | NInoClearFoo(). | ||
1175 | - Add new flag to ntfs_inode_state_bits: NI_Sparse. | ||
1176 | - Add new fields to ntfs_inode structure to allow use of fake inodes | ||
1177 | for attribute i/o: type, name, name_len. Also add new state bits: | ||
1178 | NI_Attr, which, if set, indicates the inode is a fake inode, and | ||
1179 | NI_MstProtected, which, if set, indicates the attribute uses multi | ||
1180 | sector transfer protection, i.e. fixups need to be applied after | ||
1181 | reads and before/after writes. | ||
1182 | - Rename fs/ntfs/inode.c::ntfs_{new,clear,destroy}_inode() to | ||
1183 | ntfs_{new,clear,destroy}_extent_inode() and update callers. | ||
1184 | - Use ntfs_clear_extent_inode() in fs/ntfs/inode.c::__ntfs_clear_inode() | ||
1185 | instead of ntfs_destroy_extent_inode(). | ||
1186 | - Cleanup memory deallocations in {__,}ntfs_clear_{,big_}inode(). | ||
1187 | - Make all operations on ntfs inode state bits use the NIno* functions. | ||
1188 | - Set up the new ntfs inode fields and state bits in | ||
1189 | fs/ntfs/inode.c::ntfs_read_inode() and add appropriate cleanup of | ||
1190 | allocated memory to __ntfs_clear_inode(). | ||
1191 | - Cleanup ntfs_inode structure a bit for better ordering of elements | ||
1192 | w.r.t. their size to allow better packing of the structure in memory. | ||
1193 | |||
1194 | 2.0.10 - There can only be 2^32 - 1 inodes on an NTFS volume. | ||
1195 | |||
1196 | - Add check at mount time to verify that the number of inodes on the | ||
1197 | volume does not exceed 2^32 - 1, which is the maximum allowed for | ||
1198 | NTFS according to Microsoft. | ||
1199 | - Change mft_no member of ntfs_inode structure to be unsigned long. | ||
1200 | Update all users. This makes ntfs_inode->mft_no just a copy of struct | ||
1201 | inode->i_ino. But we can't just always use struct inode->i_ino and | ||
1202 | remove mft_no because extent inodes do not have an attached struct | ||
1203 | inode. | ||
1204 | |||
1205 | 2.0.9 - Decompression engine now uses a single buffer and other cleanups. | ||
1206 | |||
1207 | - Change decompression engine to use a single buffer protected by a | ||
1208 | spin lock instead of per-CPU buffers. (Rusty Russell) | ||
1209 | - Do not update cb_pos when handling a partial final page during | ||
1210 | decompression of a sparse compression block, as the value is later | ||
1211 | reset without being read/used. (Rusty Russell) | ||
1212 | - Switch to using the new KM_BIO_SRC_IRQ for atomic kmap()s. (Andrew | ||
1213 | Morton) | ||
1214 | - Change buffer size in ntfs_readdir()/ntfs_filldir() to use | ||
1215 | NLS_MAX_CHARSET_SIZE which makes the buffers almost 1kiB each but | ||
1216 | it also makes everything safer so it is a good thing. | ||
1217 | - Miscellaneous minor cleanups to comments. | ||
1218 | |||
1219 | 2.0.8 - Major updates for handling of case sensitivity and dcache aliasing. | ||
1220 | |||
1221 | Big thanks go to Al Viro and other inhabitants of #kernel for investing | ||
1222 | their time to discuss the case sensitivity and dcache aliasing issues. | ||
1223 | |||
1224 | - Remove unused source file fs/ntfs/attraops.c. | ||
1225 | - Remove show_inodes mount option(s), thus dropping support for | ||
1226 | displaying of short file names. | ||
1227 | - Remove deprecated mount option posix. | ||
1228 | - Restore show_sys_files mount option. | ||
1229 | - Add new mount option case_sensitive, to determine if the driver | ||
1230 | treats file names as case sensitive or not. If case sensitive, create | ||
1231 | file names in the POSIX namespace. Otherwise create file names in the | ||
1232 | LONG/WIN32 namespace. Note, files remain accessible via their short | ||
1233 | file name, if it exists. | ||
1234 | - Remove really dumb logic bug in boot sector recovery code. | ||
1235 | - Fix dcache aliasing issues wrt short/long file names via changes | ||
1236 | to fs/ntfs/dir.c::ntfs_lookup_inode_by_name() and | ||
1237 | fs/ntfs/namei.c::ntfs_lookup(): | ||
1238 | - Add additional argument to ntfs_lookup_inode_by_name() in which we | ||
1239 | return information about the matching file name if the case is not | ||
1240 | matching or the match is a short file name. See comments above the | ||
1241 | function definition for details. | ||
1242 | - Change ntfs_lookup() to only create dcache entries for the correctly | ||
1243 | cased file name and only for the WIN32 namespace counterpart of DOS | ||
1244 | namespace file names. This ensures we have only one dentry per | ||
1245 | directory and also removes all dcache aliasing issues between short | ||
1246 | and long file names once we add write support. See comments above | ||
1247 | function for details. | ||
1248 | - Fix potential 1 byte overflow in fs/ntfs/unistr.c::ntfs_ucstonls(). | ||
1249 | |||
1250 | 2.0.7 - Minor cleanups and updates for changes in core kernel code. | ||
1251 | |||
1252 | - Remove much of the NULL struct element initializers. | ||
1253 | - Various updates to make compatible with recent kernels. | ||
1254 | - Remove defines of MAX_BUF_PER_PAGE and include linux/buffer_head.h | ||
1255 | in fs/ntfs/ntfs.h instead. | ||
1256 | - Remove no longer needed KERNEL_VERSION checks. We are now in the | ||
1257 | kernel proper so they are no longer needed. | ||
1258 | |||
1259 | 2.0.6 - Major bugfix to make compatible with other kernel changes. | ||
1260 | |||
1261 | - Initialize the mftbmp address space properly now that there are more | ||
1262 | fields in the struct address_space. This was leading to hangs and | ||
1263 | oopses on umount since 2.5.12 because of changes to other parts of | ||
1264 | the kernel. We probably want a kernel generic init_address_space() | ||
1265 | function... | ||
1266 | - Drop BKL from ntfs_readdir() after consultation with Al Viro. The | ||
1267 | only caller of ->readdir() is vfs_readdir() which holds i_mutex | ||
1268 | during the call, and i_mutex is sufficient protection against changes | ||
1269 | in the directory inode (including ->i_size). | ||
1270 | - Use generic_file_llseek() for directories (as opposed to | ||
1271 | default_llseek()) as this downs i_mutex instead of the BKL which is | ||
1272 | what we now need for exclusion against ->f_pos changes considering we | ||
1273 | no longer take the BKL in ntfs_readdir(). | ||
1274 | |||
1275 | 2.0.5 - Major bugfix. Buffer overflow in extent inode handling. | ||
1276 | |||
1277 | - No need to set old blocksize in super.c::ntfs_fill_super() as the | ||
1278 | VFS does so via invocation of deactivate_super() calling | ||
1279 | fs->fill_super() calling block_kill_super() which does it. | ||
1280 | - BKL moved from VFS into dir.c::ntfs_readdir(). (Linus Torvalds) | ||
1281 | -> Do we really need it? I don't think so as we have exclusion on | ||
1282 | the directory ntfs_inode rw_semaphore mrec_lock. We mmight have to | ||
1283 | move the ->f_pos accesses under the mrec_lock though. Check this... | ||
1284 | - Fix really, really, really stupid buffer overflow in extent inode | ||
1285 | handling in mft.c::map_extent_mft_record(). | ||
1286 | |||
1287 | 2.0.4 - Cleanups and updates for kernel 2.5.11. | ||
1288 | |||
1289 | - Add documentation on how to use the MD driver to be able to use NTFS | ||
1290 | stripe and volume sets in Linux and generally cleanup documentation | ||
1291 | a bit. | ||
1292 | Remove all uses of kdev_t in favour of struct block_device *: | ||
1293 | - Change compress.c::ntfs_file_read_compressed_block() to use | ||
1294 | sb_getblk() instead of getblk(). | ||
1295 | - Change super.c::ntfs_fill_super() to use bdev_hardsect_size() instead | ||
1296 | of get_hardsect_size(). | ||
1297 | - No need to get old blocksize in super.c::ntfs_fill_super() as | ||
1298 | fs/super.c::get_sb_bdev() already does this. | ||
1299 | - Set bh->b_bdev instead of bh->b_dev throughout aops.c. | ||
1300 | |||
1301 | 2.0.3 - Small bug fixes, cleanups, and performance improvements. | ||
1302 | |||
1303 | - Remove some dead code from mft.c. | ||
1304 | - Optimize readpage and read_block functions throughout aops.c so that | ||
1305 | only initialized blocks are read. Non-initialized ones have their | ||
1306 | buffer head mapped, zeroed, and set up to date, without scheduling | ||
1307 | any i/o. Thanks to Al Viro for advice on how to avoid the device i/o. | ||
1308 | Thanks go to Andrew Morton for spotting the below: | ||
1309 | - Fix buglet in allocate_compression_buffers() error code path. | ||
1310 | - Call flush_dcache_page() after modifying page cache page contents in | ||
1311 | ntfs_file_readpage(). | ||
1312 | - Check for existence of page buffers throughout aops.c before calling | ||
1313 | create_empty_buffers(). This happens when an I/O error occurs and the | ||
1314 | read is retried. (It also happens once writing is implemented so that | ||
1315 | needed doing anyway but I had left it for later...) | ||
1316 | - Don't BUG_ON() uptodate and/or mapped buffers throughout aops.c in | ||
1317 | readpage and read_block functions. Reasoning same as above (i.e. I/O | ||
1318 | error retries and future write code paths.) | ||
1319 | |||
1320 | 2.0.2 - Minor updates and cleanups. | ||
1321 | |||
1322 | - Cleanup: rename mst.c::__post_read_mst_fixup to post_write_mst_fixup | ||
1323 | and cleanup the code a bit, removing the unused size parameter. | ||
1324 | - Change default fmask to 0177 and update documentation. | ||
1325 | - Change attrib.c::get_attr_search_ctx() to return the search context | ||
1326 | directly instead of taking the address of a pointer. A return value | ||
1327 | of NULL means the allocation failed. Updated all callers | ||
1328 | appropriately. | ||
1329 | - Update to 2.5.9 kernel (preserving backwards compatibility) by | ||
1330 | replacing all occurences of page->buffers with page_buffers(page). | ||
1331 | - Fix minor bugs in runlist merging, also minor cleanup. | ||
1332 | - Updates to bootsector layout and mft mirror contents descriptions. | ||
1333 | - Small bug fix in error detection in unistr.c and some cleanups. | ||
1334 | - Grow name buffer allocations in unistr.c in aligned mutlipled of 64 | ||
1335 | bytes. | ||
1336 | |||
1337 | 2.0.1 - Minor updates. | ||
1338 | |||
1339 | - Make default umask correspond to documentation. | ||
1340 | - Improve documentation. | ||
1341 | - Set default mode to include execute bit. The {u,f,d}mask can be used | ||
1342 | to take it away if desired. This allows binaries to be executed from | ||
1343 | a mounted ntfs partition. | ||
1344 | |||
1345 | 2.0.0 - New version number. Remove TNG from the name. Now in the kernel. | ||
1346 | |||
1347 | - Add kill_super, just keeping up with the vfs changes in the kernel. | ||
1348 | - Repeat some changes from tng-0.0.8 that somehow got lost on the way | ||
1349 | from the CVS import into BitKeeper. | ||
1350 | - Begin to implement proper handling of allocated_size vs | ||
1351 | initialized_size vs data_size (i.e. i_size). Done are | ||
1352 | mft.c::ntfs_mft_readpage(), aops.c::end_buffer_read_index_async(), | ||
1353 | and attrib.c::load_attribute_list(). | ||
1354 | - Lock the runlist in attrib.c::load_attribute_list() while using it. | ||
1355 | - Fix memory leak in ntfs_file_read_compressed_block() and generally | ||
1356 | clean up compress.c a little, removing some uncommented/unused debug | ||
1357 | code. | ||
1358 | - Tidy up dir.c a little bit. | ||
1359 | - Don't bother getting the runlist in inode.c::ntfs_read_inode(). | ||
1360 | - Merge mft.c::ntfs_mft_readpage() and aops.c::ntfs_index_readpage() | ||
1361 | creating aops.c::ntfs_mst_readpage(), improving the handling of | ||
1362 | holes and overflow in the process and implementing the correct | ||
1363 | equivalent of ntfs_file_get_block() in ntfs_mst_readpage() itself. | ||
1364 | I am aiming for correctness at the moment. Modularisation can come | ||
1365 | later. | ||
1366 | - Rename aops.c::end_buffer_read_index_async() to | ||
1367 | end_buffer_read_mst_async() and optimize the overflow checking and | ||
1368 | handling. | ||
1369 | - Use the host of the mftbmp address space mapping to hold the ntfs | ||
1370 | volume. This is needed so the async i/o completion handler can | ||
1371 | retrieve a pointer to the volume. Hopefully this will not cause | ||
1372 | problems elsewhere in the kernel... Otherwise will need to use a | ||
1373 | fake inode. | ||
1374 | - Complete implementation of proper handling of allocated_size vs | ||
1375 | initialized_size vs data_size (i.e. i_size) in whole driver. | ||
1376 | Basically aops.c is now completely rewritten. | ||
1377 | - Change NTFS driver name to just NTFS and set version number to 2.0.0 | ||
1378 | to make a clear distinction from the old driver which is still on | ||
1379 | version 1.1.22. | ||
1380 | |||
1381 | tng-0.0.8 - 08/03/2002 - Now using BitKeeper, http://linux-ntfs.bkbits.net/ | ||
1382 | |||
1383 | - Replace bdevname(sb->s_dev) with sb->s_id. | ||
1384 | - Remove now superfluous new-line characters in all callers of | ||
1385 | ntfs_debug(). | ||
1386 | - Apply kludge in ntfs_read_inode(), setting i_nlink to 1 for | ||
1387 | directories. Without this the "find" utility gets very upset which is | ||
1388 | fair enough as Linux/Unix do not support directory hard links. | ||
1389 | - Further runlist merging work. (Richard Russon) | ||
1390 | - Backwards compatibility for gcc-2.95. (Richard Russon) | ||
1391 | - Update to kernel 2.5.5-pre1 and rediff the now tiny patch. | ||
1392 | - Convert to new filesystem declaration using ->ntfs_get_sb() and | ||
1393 | replacing ntfs_read_super() with ntfs_fill_super(). | ||
1394 | - Set s_maxbytes to MAX_LFS_FILESIZE to avoid page cache page index | ||
1395 | overflow on 32-bit architectures. | ||
1396 | - Cleanup upcase loading code to use ntfs_(un)map_page(). | ||
1397 | - Disable/reenable preemtion in critical sections of compession engine. | ||
1398 | - Replace device size determination in ntfs_fill_super() with | ||
1399 | sb->s_bdev->bd_inode->i_size (in bytes) and remove now superfluous | ||
1400 | function super.c::get_nr_blocks(). | ||
1401 | - Implement a mount time option (show_inodes) allowing choice of which | ||
1402 | types of inode names readdir() returns and modify ntfs_filldir() | ||
1403 | accordingly. There are several parameters to show_inodes: | ||
1404 | system: system files | ||
1405 | win32: long file names (including POSIX file names) [DEFAULT] | ||
1406 | long: same as win32 | ||
1407 | dos: short file names only (excluding POSIX file names) | ||
1408 | short: same as dos | ||
1409 | posix: same as both win32 and dos | ||
1410 | all: all file names | ||
1411 | Note that the options are additive, i.e. specifying: | ||
1412 | -o show_inodes=system,show_inodes=win32,show_inodes=dos | ||
1413 | is the same as specifying: | ||
1414 | -o show_inodes=all | ||
1415 | Note that the "posix" and "all" options will show all directory | ||
1416 | names, BUT the link count on each directory inode entry is set to 1, | ||
1417 | due to Linux not supporting directory hard links. This may well | ||
1418 | confuse some userspace applications, since the directory names will | ||
1419 | have the same inode numbers. Thus it is NOT advisable to use the | ||
1420 | "posix" or "all" options. We provide them only for completeness sake. | ||
1421 | - Add copies of allocated_size, initialized_size, and compressed_size to | ||
1422 | the ntfs inode structure and set them up in | ||
1423 | inode.c::ntfs_read_inode(). These reflect the unnamed data attribute | ||
1424 | for files and the index allocation attribute for directories. | ||
1425 | - Add copies of allocated_size and initialized_size to ntfs inode for | ||
1426 | $BITMAP attribute of large directories and set them up in | ||
1427 | inode.c::ntfs_read_inode(). | ||
1428 | - Add copies of allocated_size and initialized_size to ntfs volume for | ||
1429 | $BITMAP attribute of $MFT and set them up in | ||
1430 | super.c::load_system_files(). | ||
1431 | - Parse deprecated ntfs driver options (iocharset, show_sys_files, | ||
1432 | posix, and utf8) and tell user what the new options to use are. Note | ||
1433 | we still do support them but they will be removed with kernel 2.7.x. | ||
1434 | - Change all occurences of integer long long printf formatting to hex | ||
1435 | as printk() will not support long long integer format if/when the | ||
1436 | div64 patch goes into the kernel. | ||
1437 | - Make slab caches have stable names and change the names to what they | ||
1438 | were intended to be. These changes are required/made possible by the | ||
1439 | new slab cache name handling which removes the length limitation by | ||
1440 | requiring the caller of kmem_cache_create() to supply a stable name | ||
1441 | which is then referenced but not copied. | ||
1442 | - Rename run_list structure to run_list_element and create a new | ||
1443 | run_list structure containing a pointer to a run_list_element | ||
1444 | structure and a read/write semaphore. Adapt all users of runlists | ||
1445 | to new scheme and take and release the lock as needed. This fixes a | ||
1446 | nasty race as the run_list changes even when inodes are locked for | ||
1447 | reading and even when the inode isn't locked at all, so we really | ||
1448 | needed the serialization. We use a semaphore rather than a spinlock | ||
1449 | as memory allocations can sleep and doing everything GFP_ATOMIC | ||
1450 | would be silly. | ||
1451 | - Cleanup read_inode() removing all code checking for lowest_vcn != 0. | ||
1452 | This can never happen due to the nature of lookup_attr() and how we | ||
1453 | support attribute lists. If it did happen it would imply the inode | ||
1454 | being corrupt. | ||
1455 | - Check for lowest_vcn != 0 in ntfs_read_inode() and mark the inode as | ||
1456 | bad if found. | ||
1457 | - Update to 2.5.6-pre2 changes in struct address_space. | ||
1458 | - Use parent_ino() when accessing d_parent inode number in dir.c. | ||
1459 | - Import Sourceforge CVS repository into BitKeeper repository: | ||
1460 | http://linux-ntfs.bkbits.net/ntfs-tng-2.5 | ||
1461 | - Update fs/Makefile, fs/Config.help, fs/Config.in, and | ||
1462 | Documentation/filesystems/ntfs.txt for NTFS TNG. | ||
1463 | - Create kernel configuration option controlling whether debugging | ||
1464 | is enabled or not. | ||
1465 | - Add the required export of end_buffer_io_sync() from the patches | ||
1466 | directory to the kernel code. | ||
1467 | - Update inode.c::ntfs_show_options() with show_inodes mount option. | ||
1468 | - Update errors mount option. | ||
1469 | |||
1470 | tng-0.0.7 - 13/02/2002 - The driver is now feature complete for read-only! | ||
1471 | |||
1472 | - Cleanup mft.c and it's debug/error output in particular. Fix a minor | ||
1473 | bug in mapping of extent inodes. Update all the comments to fit all | ||
1474 | the recent code changes. | ||
1475 | - Modify vcn_to_lcn() to cope with entirely unmapped runlists. | ||
1476 | - Cleanups in compress.c, mostly comments and folding help. | ||
1477 | - Implement attrib.c::map_run_list() as a generic helper. | ||
1478 | - Make compress.c::ntfs_file_read_compressed_block() use map_run_list() | ||
1479 | thus making code shorter and enabling attribute list support. | ||
1480 | - Cleanup incorrect use of [su]64 with %L printf format specifier in | ||
1481 | all source files. Type casts to [unsigned] long long added to correct | ||
1482 | the mismatches (important for architectures which have long long not | ||
1483 | being 64 bits). | ||
1484 | - Merge async io completion handlers for directory indexes and $MFT | ||
1485 | data into one by setting the index_block_size{_bits} of the ntfs | ||
1486 | inode for $MFT to the mft_record_size{_bits} of the ntfs_volume. | ||
1487 | - Cleanup aops.c, update comments. | ||
1488 | - Make ntfs_file_get_block() use map_run_list() so all files now | ||
1489 | support attribute lists. | ||
1490 | - Make ntfs_dir_readpage() almost verbatim copy of | ||
1491 | block_read_full_page() by using ntfs_file_get_block() with only real | ||
1492 | difference being the use of our own async io completion handler | ||
1493 | rather than the default one, thus reducing the amount of code and | ||
1494 | automatically enabling attribute list support for directory indices. | ||
1495 | - Fix bug in load_attribute_list() - forgot to call brelse in error | ||
1496 | code path. | ||
1497 | - Change parameters to find_attr() and lookup_attr(). We no longer | ||
1498 | pass in the upcase table and its length. These can be gotten from | ||
1499 | ctx->ntfs_ino->vol->upcase{_len}. Update all callers. | ||
1500 | - Cleanups in attrib.c. | ||
1501 | - Implement merging of runlists, attrib.c::merge_run_lists() and its | ||
1502 | helpers. (Richard Russon) | ||
1503 | - Attribute lists part 2, attribute extents and multi part runlists: | ||
1504 | enable proper support for LCN_RL_NOT_MAPPED and automatic mapping of | ||
1505 | further runlist parts via attrib.c::map_run_list(). | ||
1506 | - Tiny endianness bug fix in decompress_mapping_pairs(). | ||
1507 | |||
1508 | tng-0.0.6 - Encrypted directories, bug fixes, cleanups, debugging enhancements. | ||
1509 | |||
1510 | - Enable encrypted directories. (Their index root is marked encrypted | ||
1511 | to indicate that new files in that directory should be created | ||
1512 | encrypted.) | ||
1513 | - Fix bug in NInoBmpNonResident() macro. (Cut and paste error.) | ||
1514 | - Enable $Extend system directory. Most (if not all) extended system | ||
1515 | files do not have unnamed data attributes so ntfs_read_inode() had to | ||
1516 | special case them but that is ok, as the special casing recovery | ||
1517 | happens inside an error code path so there is zero slow down in the | ||
1518 | normal fast path. The special casing is done by introducing a new | ||
1519 | function inode.c::ntfs_is_extended_system_file() which checks if any | ||
1520 | of the hard links in the inode point to $Extend as being their parent | ||
1521 | directory and if they do we assume this is an extended system file. | ||
1522 | - Create a sysctl/proc interface to allow {dis,en}abling of debug output | ||
1523 | when compiled with -DDEBUG. Default is debug messages to be disabled. | ||
1524 | To enable them, one writes a non-zero value to /proc/sys/fs/ntfs-debug | ||
1525 | (if /proc is enabled) or uses sysctl(2) to effect the same (if sysctl | ||
1526 | interface is enabled). Inspired by old ntfs driver. | ||
1527 | - Add debug_msgs insmod/kernel boot parameter to set whether debug | ||
1528 | messages are {dis,en}abled. This is useful to enable debug messages | ||
1529 | during ntfs initialization and is the only way to activate debugging | ||
1530 | when the sysctl interface is not enabled. | ||
1531 | - Cleanup debug output in various places. | ||
1532 | - Remove all dollar signs ($) from the source (except comments) to | ||
1533 | enable compilation on architectures whose gcc compiler does not | ||
1534 | support dollar signs in the names of variables/constants. Attribute | ||
1535 | types now start with AT_ instead of $ and $I30 is now just I30. | ||
1536 | - Cleanup ntfs_lookup() and add consistency check of sequence numbers. | ||
1537 | - Load complete runlist for $MFT/$BITMAP during mount and cleanup | ||
1538 | access functions. This means we now cope with $MFT/$BITMAP being | ||
1539 | spread accross several mft records. | ||
1540 | - Disable modification of mft_zone_multiplier on remount. We can always | ||
1541 | reenable this later on if we really want to, but we will need to make | ||
1542 | sure we readjust the mft_zone size / layout accordingly. | ||
1543 | |||
1544 | tng-0.0.5 - Modernize for 2.5.x and further in line-ing with Al Viro's comments. | ||
1545 | |||
1546 | - Use sb_set_blocksize() instead of set_blocksize() and verify the | ||
1547 | return value. | ||
1548 | - Use sb_bread() instead of bread() throughout. | ||
1549 | - Add index_vcn_size{_bits} to ntfs_inode structure to store the size | ||
1550 | of a directory index block vcn. Apply resulting simplifications in | ||
1551 | dir.c everywhere. | ||
1552 | - Fix a small bug somewhere (but forgot what it was). | ||
1553 | - Change ntfs_{debug,error,warning} to enable gcc to do type checking | ||
1554 | on the printf-format parameter list and fix bugs reported by gcc | ||
1555 | as a result. (Richard Russon) | ||
1556 | - Move inode allocation strategy to Al's new stuff but maintain the | ||
1557 | divorce of ntfs_inode from struct inode. To achieve this we have two | ||
1558 | separate slab caches, one for big ntfs inodes containing a struct | ||
1559 | inode and pure ntfs inodes and at the same time fix some faulty | ||
1560 | error code paths in ntfs_read_inode(). | ||
1561 | - Show mount options in proc (inode.c::ntfs_show_options()). | ||
1562 | |||
1563 | tng-0.0.4 - Big changes, getting in line with Al Viro's comments. | ||
1564 | |||
1565 | - Modified (un)map_mft_record functions to be common for read and write | ||
1566 | case. To specify which is which, added extra parameter at front of | ||
1567 | parameter list. Pass either READ or WRITE to this, each has the | ||
1568 | obvious meaning. | ||
1569 | - General cleanups to allow for easier folding in vi. | ||
1570 | - attrib.c::decompress_mapping_pairs() now accepts the old runlist | ||
1571 | argument, and invokes attrib.c::merge_run_lists() to merge the old | ||
1572 | and the new runlists. | ||
1573 | - Removed attrib.c::find_first_attr(). | ||
1574 | - Implemented loading of attribute list and complete runlist for $MFT. | ||
1575 | This means we now cope with $MFT being spread across several mft | ||
1576 | records. | ||
1577 | - Adapt to 2.5.2-pre9 and the changed create_empty_buffers() syntax. | ||
1578 | - Adapt major/minor/kdev_t/[bk]devname stuff to new 2.5.x kernels. | ||
1579 | - Make ntfs_volume be allocated via kmalloc() instead of using a slab | ||
1580 | cache. There are too little ntfs_volume structures at any one time | ||
1581 | to justify a private slab cache. | ||
1582 | - Fix bogus kmap() use in async io completion. Now use kmap_atomic(). | ||
1583 | Use KM_BIO_IRQ on advice from IRC/kernel... | ||
1584 | - Use ntfs_map_page() in map_mft_record() and create ->readpage method | ||
1585 | for reading $MFT (ntfs_mft_readpage). In the process create dedicated | ||
1586 | address space operations (ntfs_mft_aops) for $MFT inode mapping. Also | ||
1587 | removed the now superfluous exports from the kernel core patch. | ||
1588 | - Fix a bug where kfree() was used instead of ntfs_free(). | ||
1589 | - Change map_mft_record() to take ntfs_inode as argument instead of | ||
1590 | vfs inode. Dito for unmap_mft_record(). Adapt all callers. | ||
1591 | - Add pointer to ntfs_volume to ntfs_inode. | ||
1592 | - Add mft record number and sequence number to ntfs_inode. Stop using | ||
1593 | i_ino and i_generation for in-driver purposes. | ||
1594 | - Implement attrib.c::merge_run_lists(). (Richard Russon) | ||
1595 | - Remove use of proper inodes by extent inodes. Move i_ino and | ||
1596 | i_generation to ntfs_inode to do this. Apply simplifications that | ||
1597 | result and remove iget_no_wait(), etc. | ||
1598 | - Pass ntfs_inode everywhere in the driver (used to be struct inode). | ||
1599 | - Add reference counting in ntfs_inode for the ntfs inode itself and | ||
1600 | for the mapped mft record. | ||
1601 | - Extend mft record mapping so we can (un)map extent mft records (new | ||
1602 | functions (un)map_extent_mft_record), and so mappings are reference | ||
1603 | counted and don't have to happen twice if already mapped - just ref | ||
1604 | count increases. | ||
1605 | - Add -o iocharset as alias to -o nls for backwards compatibility. | ||
1606 | - The latest core patch is now tiny. In fact just a single additional | ||
1607 | export is necessary over the base kernel. | ||
1608 | |||
1609 | tng-0.0.3 - Cleanups, enhancements, bug fixes. | ||
1610 | |||
1611 | - Work on attrib.c::decompress_mapping_pairs() to detect base extents | ||
1612 | and setup the runlist appropriately using knowledge provided by the | ||
1613 | sizes in the base attribute record. | ||
1614 | - Balance the get_/put_attr_search_ctx() calls so we don't leak memory | ||
1615 | any more. | ||
1616 | - Introduce ntfs_malloc_nofs() and ntfs_free() to allocate/free a single | ||
1617 | page or use vmalloc depending on the amount of memory requested. | ||
1618 | - Cleanup error output. The __FUNCTION__ "(): " is now added | ||
1619 | automatically. Introduced a new header file debug.h to support this | ||
1620 | and also moved ntfs_debug() function into it. | ||
1621 | - Make reading of compressed files more intelligent and especially get | ||
1622 | rid of the vmalloc_nofs() from readpage(). This now uses per CPU | ||
1623 | buffers (allocated at first mount with cluster size <= 4kiB and | ||
1624 | deallocated on last umount with cluster size <= 4kiB), and | ||
1625 | asynchronous io for the compressed data using a list of buffer heads. | ||
1626 | Er, we use synchronous io as async io only works on whole pages | ||
1627 | covered by buffers and not on individual buffer heads... | ||
1628 | - Bug fix for reading compressed files with sparse compression blocks. | ||
1629 | |||
1630 | tng-0.0.2 - Now handles larger/fragmented/compressed volumes/files/dirs. | ||
1631 | |||
1632 | - Fixed handling of directories when cluster size exceeds index block | ||
1633 | size. | ||
1634 | - Hide DOS only name space directory entries from readdir() but allow | ||
1635 | them in lookup(). This should fix the problem that Linux doesn't | ||
1636 | support directory hard links, while still allowing access to entries | ||
1637 | via their short file name. This also has the benefit of mimicking | ||
1638 | what Windows users are used to, so it is the ideal solution. | ||
1639 | - Implemented sync_page everywhere so no more hangs in D state when | ||
1640 | waiting for a page. | ||
1641 | - Stop using bforget() in favour of brelse(). | ||
1642 | - Stop locking buffers unnecessarily. | ||
1643 | - Implemented compressed files (inode->mapping contains uncompressed | ||
1644 | data, raw compressed data is currently bread() into a vmalloc()ed | ||
1645 | memory buffer). | ||
1646 | - Enable compressed directories. (Their index root is marked compressed | ||
1647 | to indicate that new files in that directory should be created | ||
1648 | compressed.) | ||
1649 | - Use vsnprintf rather than vsprintf in the ntfs_error and ntfs_warning | ||
1650 | functions. (Thanks to Will Dyson for pointing this out.) | ||
1651 | - Moved the ntfs_inode and ntfs_volume (the former ntfs_inode_info and | ||
1652 | ntfs_sb_info) out of the common inode and super_block structures and | ||
1653 | started using the generic_ip and generic_sbp pointers instead. This | ||
1654 | makes ntfs entirely private with respect to the kernel tree. | ||
1655 | - Detect compiler version and abort with error message if gcc less than | ||
1656 | 2.96 is used. | ||
1657 | - Fix bug in name comparison function in unistr.c. | ||
1658 | - Implement attribute lists part 1, the infrastructure: search contexts | ||
1659 | and operations, find_external_attr(), lookup_attr()) and make the | ||
1660 | code use the infrastructure. | ||
1661 | - Fix stupid buffer overflow bug that became apparent on larger run | ||
1662 | list containing attributes. | ||
1663 | - Fix bugs in readdir() that became apparent on larger directories. | ||
1664 | |||
1665 | The driver is now really useful and survives the test | ||
1666 | find . -type f -exec md5sum "{}" \; | ||
1667 | without any error messages on a over 1GiB sized partition with >16k | ||
1668 | files on it, including compressed files and directories and many files | ||
1669 | and directories with attribute lists. | ||
1670 | |||
1671 | tng-0.0.1 - The first useful version. | ||
1672 | |||
1673 | - Added ntfs_lookup(). | ||
1674 | - Added default upcase generation and handling. | ||
1675 | - Added compile options to be shown on module init. | ||
1676 | - Many bug fixes that were "hidden" before. | ||
1677 | - Update to latest kernel. | ||
1678 | - Added ntfs_readdir(). | ||
1679 | - Added file operations for mmap(), read(), open() and llseek(). We just | ||
1680 | use the generic ones. The whole point of going through implementing | ||
1681 | readpage() methods and where possible get_block() call backs is that | ||
1682 | this allows us to make use of the generic high level methods provided | ||
1683 | by the kernel. | ||
1684 | |||
1685 | The driver is now actually useful! Yey. (-: It undoubtedly has got bugs | ||
1686 | though and it doesn't implement accesssing compressed files yet. Also, | ||
1687 | accessing files with attribute list attributes is not implemented yet | ||
1688 | either. But for small or simple filesystems it should work and allow | ||
1689 | you to list directories, use stat on directory entries and the file | ||
1690 | system, open, read, mmap and llseek around in files. A big mile stone | ||
1691 | has been reached! | ||
1692 | |||
1693 | tng-0.0.0 - Initial version tag. | ||
1694 | |||
1695 | Initial driver implementation. The driver can mount and umount simple | ||
1696 | NTFS filesystems (i.e. ones without attribute lists in the system | ||
1697 | files). If the mount fails there might be problems in the error handling | ||
1698 | code paths, so be warned. Otherwise it seems to be loading the system | ||
1699 | files nicely and the mft record read mapping/unmapping seems to be | ||
1700 | working nicely, too. Proof of inode metadata in the page cache and non- | ||
1701 | resident file unnamed stream data in the page cache concepts is thus | ||
1702 | complete. | ||
diff --git a/fs/ocfs2/cluster/masklog.c b/fs/ocfs2/cluster/masklog.c index b39da877b12f..3bb928a2bf7d 100644 --- a/fs/ocfs2/cluster/masklog.c +++ b/fs/ocfs2/cluster/masklog.c | |||
@@ -136,7 +136,7 @@ static ssize_t mlog_store(struct kobject *obj, struct attribute *attr, | |||
136 | return mlog_mask_store(mlog_attr->mask, buf, count); | 136 | return mlog_mask_store(mlog_attr->mask, buf, count); |
137 | } | 137 | } |
138 | 138 | ||
139 | static struct sysfs_ops mlog_attr_ops = { | 139 | static const struct sysfs_ops mlog_attr_ops = { |
140 | .show = mlog_show, | 140 | .show = mlog_show, |
141 | .store = mlog_store, | 141 | .store = mlog_store, |
142 | }; | 142 | }; |
diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c index d8d0c65ac03c..73e743eea2c8 100644 --- a/fs/ocfs2/cluster/tcp.c +++ b/fs/ocfs2/cluster/tcp.c | |||
@@ -72,9 +72,9 @@ | |||
72 | 72 | ||
73 | #include "tcp_internal.h" | 73 | #include "tcp_internal.h" |
74 | 74 | ||
75 | #define SC_NODEF_FMT "node %s (num %u) at %u.%u.%u.%u:%u" | 75 | #define SC_NODEF_FMT "node %s (num %u) at %pI4:%u" |
76 | #define SC_NODEF_ARGS(sc) sc->sc_node->nd_name, sc->sc_node->nd_num, \ | 76 | #define SC_NODEF_ARGS(sc) sc->sc_node->nd_name, sc->sc_node->nd_num, \ |
77 | NIPQUAD(sc->sc_node->nd_ipv4_address), \ | 77 | &sc->sc_node->nd_ipv4_address, \ |
78 | ntohs(sc->sc_node->nd_ipv4_port) | 78 | ntohs(sc->sc_node->nd_ipv4_port) |
79 | 79 | ||
80 | /* | 80 | /* |
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c index 8298608d4165..50c4ee805da4 100644 --- a/fs/ocfs2/dlmglue.c +++ b/fs/ocfs2/dlmglue.c | |||
@@ -1881,7 +1881,7 @@ out: | |||
1881 | * ocfs2_file_lock() and ocfs2_file_unlock() map to a single pair of | 1881 | * ocfs2_file_lock() and ocfs2_file_unlock() map to a single pair of |
1882 | * flock() calls. The locking approach this requires is sufficiently | 1882 | * flock() calls. The locking approach this requires is sufficiently |
1883 | * different from all other cluster lock types that we implement a | 1883 | * different from all other cluster lock types that we implement a |
1884 | * seperate path to the "low-level" dlm calls. In particular: | 1884 | * separate path to the "low-level" dlm calls. In particular: |
1885 | * | 1885 | * |
1886 | * - No optimization of lock levels is done - we take at exactly | 1886 | * - No optimization of lock levels is done - we take at exactly |
1887 | * what's been requested. | 1887 | * what's been requested. |
diff --git a/fs/ocfs2/extent_map.c b/fs/ocfs2/extent_map.c index 5328529e7fd2..c562a7581cf9 100644 --- a/fs/ocfs2/extent_map.c +++ b/fs/ocfs2/extent_map.c | |||
@@ -453,7 +453,7 @@ static int ocfs2_get_clusters_nocache(struct inode *inode, | |||
453 | if (i == -1) { | 453 | if (i == -1) { |
454 | /* | 454 | /* |
455 | * Holes can be larger than the maximum size of an | 455 | * Holes can be larger than the maximum size of an |
456 | * extent, so we return their lengths in a seperate | 456 | * extent, so we return their lengths in a separate |
457 | * field. | 457 | * field. |
458 | */ | 458 | */ |
459 | if (hole_len) { | 459 | if (hole_len) { |
diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c index ebf3440d28ca..277575ddc05c 100644 --- a/fs/qnx4/inode.c +++ b/fs/qnx4/inode.c | |||
@@ -201,7 +201,8 @@ static const char *qnx4_checkroot(struct super_block *sb) | |||
201 | rootdir = (struct qnx4_inode_entry *) (bh->b_data + i * QNX4_DIR_ENTRY_SIZE); | 201 | rootdir = (struct qnx4_inode_entry *) (bh->b_data + i * QNX4_DIR_ENTRY_SIZE); |
202 | if (rootdir->di_fname != NULL) { | 202 | if (rootdir->di_fname != NULL) { |
203 | QNX4DEBUG((KERN_INFO "rootdir entry found : [%s]\n", rootdir->di_fname)); | 203 | QNX4DEBUG((KERN_INFO "rootdir entry found : [%s]\n", rootdir->di_fname)); |
204 | if (!strncmp(rootdir->di_fname, QNX4_BMNAME, sizeof QNX4_BMNAME)) { | 204 | if (!strcmp(rootdir->di_fname, |
205 | QNX4_BMNAME)) { | ||
205 | found = 1; | 206 | found = 1; |
206 | qnx4_sb(sb)->BitMap = kmalloc( sizeof( struct qnx4_inode_entry ), GFP_KERNEL ); | 207 | qnx4_sb(sb)->BitMap = kmalloc( sizeof( struct qnx4_inode_entry ), GFP_KERNEL ); |
207 | if (!qnx4_sb(sb)->BitMap) { | 208 | if (!qnx4_sb(sb)->BitMap) { |
diff --git a/fs/reiserfs/bitmap.c b/fs/reiserfs/bitmap.c index dc014f7def05..483442e66ed6 100644 --- a/fs/reiserfs/bitmap.c +++ b/fs/reiserfs/bitmap.c | |||
@@ -169,7 +169,7 @@ static int scan_bitmap_block(struct reiserfs_transaction_handle *th, | |||
169 | return 0; // No free blocks in this bitmap | 169 | return 0; // No free blocks in this bitmap |
170 | } | 170 | } |
171 | 171 | ||
172 | /* search for a first zero bit -- beggining of a window */ | 172 | /* search for a first zero bit -- beginning of a window */ |
173 | *beg = reiserfs_find_next_zero_le_bit | 173 | *beg = reiserfs_find_next_zero_le_bit |
174 | ((unsigned long *)(bh->b_data), boundary, *beg); | 174 | ((unsigned long *)(bh->b_data), boundary, *beg); |
175 | 175 | ||
diff --git a/fs/select.c b/fs/select.c index 73715e90030f..500a669f7790 100644 --- a/fs/select.c +++ b/fs/select.c | |||
@@ -691,6 +691,23 @@ SYSCALL_DEFINE6(pselect6, int, n, fd_set __user *, inp, fd_set __user *, outp, | |||
691 | } | 691 | } |
692 | #endif /* HAVE_SET_RESTORE_SIGMASK */ | 692 | #endif /* HAVE_SET_RESTORE_SIGMASK */ |
693 | 693 | ||
694 | #ifdef __ARCH_WANT_SYS_OLD_SELECT | ||
695 | struct sel_arg_struct { | ||
696 | unsigned long n; | ||
697 | fd_set __user *inp, *outp, *exp; | ||
698 | struct timeval __user *tvp; | ||
699 | }; | ||
700 | |||
701 | SYSCALL_DEFINE1(old_select, struct sel_arg_struct __user *, arg) | ||
702 | { | ||
703 | struct sel_arg_struct a; | ||
704 | |||
705 | if (copy_from_user(&a, arg, sizeof(a))) | ||
706 | return -EFAULT; | ||
707 | return sys_select(a.n, a.inp, a.outp, a.exp, a.tvp); | ||
708 | } | ||
709 | #endif | ||
710 | |||
694 | struct poll_list { | 711 | struct poll_list { |
695 | struct poll_list *next; | 712 | struct poll_list *next; |
696 | int len; | 713 | int len; |
diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c index a0a500af24a1..e9d293593e52 100644 --- a/fs/sysfs/bin.c +++ b/fs/sysfs/bin.c | |||
@@ -54,14 +54,14 @@ fill_read(struct dentry *dentry, char *buffer, loff_t off, size_t count) | |||
54 | int rc; | 54 | int rc; |
55 | 55 | ||
56 | /* need attr_sd for attr, its parent for kobj */ | 56 | /* need attr_sd for attr, its parent for kobj */ |
57 | if (!sysfs_get_active_two(attr_sd)) | 57 | if (!sysfs_get_active(attr_sd)) |
58 | return -ENODEV; | 58 | return -ENODEV; |
59 | 59 | ||
60 | rc = -EIO; | 60 | rc = -EIO; |
61 | if (attr->read) | 61 | if (attr->read) |
62 | rc = attr->read(kobj, attr, buffer, off, count); | 62 | rc = attr->read(kobj, attr, buffer, off, count); |
63 | 63 | ||
64 | sysfs_put_active_two(attr_sd); | 64 | sysfs_put_active(attr_sd); |
65 | 65 | ||
66 | return rc; | 66 | return rc; |
67 | } | 67 | } |
@@ -125,14 +125,14 @@ flush_write(struct dentry *dentry, char *buffer, loff_t offset, size_t count) | |||
125 | int rc; | 125 | int rc; |
126 | 126 | ||
127 | /* need attr_sd for attr, its parent for kobj */ | 127 | /* need attr_sd for attr, its parent for kobj */ |
128 | if (!sysfs_get_active_two(attr_sd)) | 128 | if (!sysfs_get_active(attr_sd)) |
129 | return -ENODEV; | 129 | return -ENODEV; |
130 | 130 | ||
131 | rc = -EIO; | 131 | rc = -EIO; |
132 | if (attr->write) | 132 | if (attr->write) |
133 | rc = attr->write(kobj, attr, buffer, offset, count); | 133 | rc = attr->write(kobj, attr, buffer, offset, count); |
134 | 134 | ||
135 | sysfs_put_active_two(attr_sd); | 135 | sysfs_put_active(attr_sd); |
136 | 136 | ||
137 | return rc; | 137 | return rc; |
138 | } | 138 | } |
@@ -184,12 +184,12 @@ static void bin_vma_open(struct vm_area_struct *vma) | |||
184 | if (!bb->vm_ops || !bb->vm_ops->open) | 184 | if (!bb->vm_ops || !bb->vm_ops->open) |
185 | return; | 185 | return; |
186 | 186 | ||
187 | if (!sysfs_get_active_two(attr_sd)) | 187 | if (!sysfs_get_active(attr_sd)) |
188 | return; | 188 | return; |
189 | 189 | ||
190 | bb->vm_ops->open(vma); | 190 | bb->vm_ops->open(vma); |
191 | 191 | ||
192 | sysfs_put_active_two(attr_sd); | 192 | sysfs_put_active(attr_sd); |
193 | } | 193 | } |
194 | 194 | ||
195 | static void bin_vma_close(struct vm_area_struct *vma) | 195 | static void bin_vma_close(struct vm_area_struct *vma) |
@@ -201,12 +201,12 @@ static void bin_vma_close(struct vm_area_struct *vma) | |||
201 | if (!bb->vm_ops || !bb->vm_ops->close) | 201 | if (!bb->vm_ops || !bb->vm_ops->close) |
202 | return; | 202 | return; |
203 | 203 | ||
204 | if (!sysfs_get_active_two(attr_sd)) | 204 | if (!sysfs_get_active(attr_sd)) |
205 | return; | 205 | return; |
206 | 206 | ||
207 | bb->vm_ops->close(vma); | 207 | bb->vm_ops->close(vma); |
208 | 208 | ||
209 | sysfs_put_active_two(attr_sd); | 209 | sysfs_put_active(attr_sd); |
210 | } | 210 | } |
211 | 211 | ||
212 | static int bin_fault(struct vm_area_struct *vma, struct vm_fault *vmf) | 212 | static int bin_fault(struct vm_area_struct *vma, struct vm_fault *vmf) |
@@ -219,12 +219,12 @@ static int bin_fault(struct vm_area_struct *vma, struct vm_fault *vmf) | |||
219 | if (!bb->vm_ops || !bb->vm_ops->fault) | 219 | if (!bb->vm_ops || !bb->vm_ops->fault) |
220 | return VM_FAULT_SIGBUS; | 220 | return VM_FAULT_SIGBUS; |
221 | 221 | ||
222 | if (!sysfs_get_active_two(attr_sd)) | 222 | if (!sysfs_get_active(attr_sd)) |
223 | return VM_FAULT_SIGBUS; | 223 | return VM_FAULT_SIGBUS; |
224 | 224 | ||
225 | ret = bb->vm_ops->fault(vma, vmf); | 225 | ret = bb->vm_ops->fault(vma, vmf); |
226 | 226 | ||
227 | sysfs_put_active_two(attr_sd); | 227 | sysfs_put_active(attr_sd); |
228 | return ret; | 228 | return ret; |
229 | } | 229 | } |
230 | 230 | ||
@@ -241,12 +241,12 @@ static int bin_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) | |||
241 | if (!bb->vm_ops->page_mkwrite) | 241 | if (!bb->vm_ops->page_mkwrite) |
242 | return 0; | 242 | return 0; |
243 | 243 | ||
244 | if (!sysfs_get_active_two(attr_sd)) | 244 | if (!sysfs_get_active(attr_sd)) |
245 | return VM_FAULT_SIGBUS; | 245 | return VM_FAULT_SIGBUS; |
246 | 246 | ||
247 | ret = bb->vm_ops->page_mkwrite(vma, vmf); | 247 | ret = bb->vm_ops->page_mkwrite(vma, vmf); |
248 | 248 | ||
249 | sysfs_put_active_two(attr_sd); | 249 | sysfs_put_active(attr_sd); |
250 | return ret; | 250 | return ret; |
251 | } | 251 | } |
252 | 252 | ||
@@ -261,12 +261,12 @@ static int bin_access(struct vm_area_struct *vma, unsigned long addr, | |||
261 | if (!bb->vm_ops || !bb->vm_ops->access) | 261 | if (!bb->vm_ops || !bb->vm_ops->access) |
262 | return -EINVAL; | 262 | return -EINVAL; |
263 | 263 | ||
264 | if (!sysfs_get_active_two(attr_sd)) | 264 | if (!sysfs_get_active(attr_sd)) |
265 | return -EINVAL; | 265 | return -EINVAL; |
266 | 266 | ||
267 | ret = bb->vm_ops->access(vma, addr, buf, len, write); | 267 | ret = bb->vm_ops->access(vma, addr, buf, len, write); |
268 | 268 | ||
269 | sysfs_put_active_two(attr_sd); | 269 | sysfs_put_active(attr_sd); |
270 | return ret; | 270 | return ret; |
271 | } | 271 | } |
272 | 272 | ||
@@ -281,12 +281,12 @@ static int bin_set_policy(struct vm_area_struct *vma, struct mempolicy *new) | |||
281 | if (!bb->vm_ops || !bb->vm_ops->set_policy) | 281 | if (!bb->vm_ops || !bb->vm_ops->set_policy) |
282 | return 0; | 282 | return 0; |
283 | 283 | ||
284 | if (!sysfs_get_active_two(attr_sd)) | 284 | if (!sysfs_get_active(attr_sd)) |
285 | return -EINVAL; | 285 | return -EINVAL; |
286 | 286 | ||
287 | ret = bb->vm_ops->set_policy(vma, new); | 287 | ret = bb->vm_ops->set_policy(vma, new); |
288 | 288 | ||
289 | sysfs_put_active_two(attr_sd); | 289 | sysfs_put_active(attr_sd); |
290 | return ret; | 290 | return ret; |
291 | } | 291 | } |
292 | 292 | ||
@@ -301,12 +301,12 @@ static struct mempolicy *bin_get_policy(struct vm_area_struct *vma, | |||
301 | if (!bb->vm_ops || !bb->vm_ops->get_policy) | 301 | if (!bb->vm_ops || !bb->vm_ops->get_policy) |
302 | return vma->vm_policy; | 302 | return vma->vm_policy; |
303 | 303 | ||
304 | if (!sysfs_get_active_two(attr_sd)) | 304 | if (!sysfs_get_active(attr_sd)) |
305 | return vma->vm_policy; | 305 | return vma->vm_policy; |
306 | 306 | ||
307 | pol = bb->vm_ops->get_policy(vma, addr); | 307 | pol = bb->vm_ops->get_policy(vma, addr); |
308 | 308 | ||
309 | sysfs_put_active_two(attr_sd); | 309 | sysfs_put_active(attr_sd); |
310 | return pol; | 310 | return pol; |
311 | } | 311 | } |
312 | 312 | ||
@@ -321,12 +321,12 @@ static int bin_migrate(struct vm_area_struct *vma, const nodemask_t *from, | |||
321 | if (!bb->vm_ops || !bb->vm_ops->migrate) | 321 | if (!bb->vm_ops || !bb->vm_ops->migrate) |
322 | return 0; | 322 | return 0; |
323 | 323 | ||
324 | if (!sysfs_get_active_two(attr_sd)) | 324 | if (!sysfs_get_active(attr_sd)) |
325 | return 0; | 325 | return 0; |
326 | 326 | ||
327 | ret = bb->vm_ops->migrate(vma, from, to, flags); | 327 | ret = bb->vm_ops->migrate(vma, from, to, flags); |
328 | 328 | ||
329 | sysfs_put_active_two(attr_sd); | 329 | sysfs_put_active(attr_sd); |
330 | return ret; | 330 | return ret; |
331 | } | 331 | } |
332 | #endif | 332 | #endif |
@@ -356,7 +356,7 @@ static int mmap(struct file *file, struct vm_area_struct *vma) | |||
356 | 356 | ||
357 | /* need attr_sd for attr, its parent for kobj */ | 357 | /* need attr_sd for attr, its parent for kobj */ |
358 | rc = -ENODEV; | 358 | rc = -ENODEV; |
359 | if (!sysfs_get_active_two(attr_sd)) | 359 | if (!sysfs_get_active(attr_sd)) |
360 | goto out_unlock; | 360 | goto out_unlock; |
361 | 361 | ||
362 | rc = -EINVAL; | 362 | rc = -EINVAL; |
@@ -384,7 +384,7 @@ static int mmap(struct file *file, struct vm_area_struct *vma) | |||
384 | bb->vm_ops = vma->vm_ops; | 384 | bb->vm_ops = vma->vm_ops; |
385 | vma->vm_ops = &bin_vm_ops; | 385 | vma->vm_ops = &bin_vm_ops; |
386 | out_put: | 386 | out_put: |
387 | sysfs_put_active_two(attr_sd); | 387 | sysfs_put_active(attr_sd); |
388 | out_unlock: | 388 | out_unlock: |
389 | mutex_unlock(&bb->mutex); | 389 | mutex_unlock(&bb->mutex); |
390 | 390 | ||
@@ -399,7 +399,7 @@ static int open(struct inode * inode, struct file * file) | |||
399 | int error; | 399 | int error; |
400 | 400 | ||
401 | /* binary file operations requires both @sd and its parent */ | 401 | /* binary file operations requires both @sd and its parent */ |
402 | if (!sysfs_get_active_two(attr_sd)) | 402 | if (!sysfs_get_active(attr_sd)) |
403 | return -ENODEV; | 403 | return -ENODEV; |
404 | 404 | ||
405 | error = -EACCES; | 405 | error = -EACCES; |
@@ -426,11 +426,11 @@ static int open(struct inode * inode, struct file * file) | |||
426 | mutex_unlock(&sysfs_bin_lock); | 426 | mutex_unlock(&sysfs_bin_lock); |
427 | 427 | ||
428 | /* open succeeded, put active references */ | 428 | /* open succeeded, put active references */ |
429 | sysfs_put_active_two(attr_sd); | 429 | sysfs_put_active(attr_sd); |
430 | return 0; | 430 | return 0; |
431 | 431 | ||
432 | err_out: | 432 | err_out: |
433 | sysfs_put_active_two(attr_sd); | 433 | sysfs_put_active(attr_sd); |
434 | kfree(bb); | 434 | kfree(bb); |
435 | return error; | 435 | return error; |
436 | } | 436 | } |
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c index 699f371b9f12..590717861c7a 100644 --- a/fs/sysfs/dir.c +++ b/fs/sysfs/dir.c | |||
@@ -93,7 +93,7 @@ static void sysfs_unlink_sibling(struct sysfs_dirent *sd) | |||
93 | * RETURNS: | 93 | * RETURNS: |
94 | * Pointer to @sd on success, NULL on failure. | 94 | * Pointer to @sd on success, NULL on failure. |
95 | */ | 95 | */ |
96 | static struct sysfs_dirent *sysfs_get_active(struct sysfs_dirent *sd) | 96 | struct sysfs_dirent *sysfs_get_active(struct sysfs_dirent *sd) |
97 | { | 97 | { |
98 | if (unlikely(!sd)) | 98 | if (unlikely(!sd)) |
99 | return NULL; | 99 | return NULL; |
@@ -124,7 +124,7 @@ static struct sysfs_dirent *sysfs_get_active(struct sysfs_dirent *sd) | |||
124 | * Put an active reference to @sd. This function is noop if @sd | 124 | * Put an active reference to @sd. This function is noop if @sd |
125 | * is NULL. | 125 | * is NULL. |
126 | */ | 126 | */ |
127 | static void sysfs_put_active(struct sysfs_dirent *sd) | 127 | void sysfs_put_active(struct sysfs_dirent *sd) |
128 | { | 128 | { |
129 | struct completion *cmpl; | 129 | struct completion *cmpl; |
130 | int v; | 130 | int v; |
@@ -145,45 +145,6 @@ static void sysfs_put_active(struct sysfs_dirent *sd) | |||
145 | } | 145 | } |
146 | 146 | ||
147 | /** | 147 | /** |
148 | * sysfs_get_active_two - get active references to sysfs_dirent and parent | ||
149 | * @sd: sysfs_dirent of interest | ||
150 | * | ||
151 | * Get active reference to @sd and its parent. Parent's active | ||
152 | * reference is grabbed first. This function is noop if @sd is | ||
153 | * NULL. | ||
154 | * | ||
155 | * RETURNS: | ||
156 | * Pointer to @sd on success, NULL on failure. | ||
157 | */ | ||
158 | struct sysfs_dirent *sysfs_get_active_two(struct sysfs_dirent *sd) | ||
159 | { | ||
160 | if (sd) { | ||
161 | if (sd->s_parent && unlikely(!sysfs_get_active(sd->s_parent))) | ||
162 | return NULL; | ||
163 | if (unlikely(!sysfs_get_active(sd))) { | ||
164 | sysfs_put_active(sd->s_parent); | ||
165 | return NULL; | ||
166 | } | ||
167 | } | ||
168 | return sd; | ||
169 | } | ||
170 | |||
171 | /** | ||
172 | * sysfs_put_active_two - put active references to sysfs_dirent and parent | ||
173 | * @sd: sysfs_dirent of interest | ||
174 | * | ||
175 | * Put active references to @sd and its parent. This function is | ||
176 | * noop if @sd is NULL. | ||
177 | */ | ||
178 | void sysfs_put_active_two(struct sysfs_dirent *sd) | ||
179 | { | ||
180 | if (sd) { | ||
181 | sysfs_put_active(sd); | ||
182 | sysfs_put_active(sd->s_parent); | ||
183 | } | ||
184 | } | ||
185 | |||
186 | /** | ||
187 | * sysfs_deactivate - deactivate sysfs_dirent | 148 | * sysfs_deactivate - deactivate sysfs_dirent |
188 | * @sd: sysfs_dirent to deactivate | 149 | * @sd: sysfs_dirent to deactivate |
189 | * | 150 | * |
@@ -195,6 +156,10 @@ static void sysfs_deactivate(struct sysfs_dirent *sd) | |||
195 | int v; | 156 | int v; |
196 | 157 | ||
197 | BUG_ON(sd->s_sibling || !(sd->s_flags & SYSFS_FLAG_REMOVED)); | 158 | BUG_ON(sd->s_sibling || !(sd->s_flags & SYSFS_FLAG_REMOVED)); |
159 | |||
160 | if (!(sysfs_type(sd) & SYSFS_ACTIVE_REF)) | ||
161 | return; | ||
162 | |||
198 | sd->s_sibling = (void *)&wait; | 163 | sd->s_sibling = (void *)&wait; |
199 | 164 | ||
200 | rwsem_acquire(&sd->dep_map, 0, 0, _RET_IP_); | 165 | rwsem_acquire(&sd->dep_map, 0, 0, _RET_IP_); |
@@ -354,7 +319,6 @@ struct sysfs_dirent *sysfs_new_dirent(const char *name, umode_t mode, int type) | |||
354 | 319 | ||
355 | atomic_set(&sd->s_count, 1); | 320 | atomic_set(&sd->s_count, 1); |
356 | atomic_set(&sd->s_active, 0); | 321 | atomic_set(&sd->s_active, 0); |
357 | sysfs_dirent_init_lockdep(sd); | ||
358 | 322 | ||
359 | sd->s_name = name; | 323 | sd->s_name = name; |
360 | sd->s_mode = mode; | 324 | sd->s_mode = mode; |
@@ -681,7 +645,7 @@ static struct dentry * sysfs_lookup(struct inode *dir, struct dentry *dentry, | |||
681 | } | 645 | } |
682 | 646 | ||
683 | /* attach dentry and inode */ | 647 | /* attach dentry and inode */ |
684 | inode = sysfs_get_inode(sd); | 648 | inode = sysfs_get_inode(dir->i_sb, sd); |
685 | if (!inode) { | 649 | if (!inode) { |
686 | ret = ERR_PTR(-ENOMEM); | 650 | ret = ERR_PTR(-ENOMEM); |
687 | goto out_unlock; | 651 | goto out_unlock; |
@@ -837,11 +801,46 @@ static inline unsigned char dt_type(struct sysfs_dirent *sd) | |||
837 | return (sd->s_mode >> 12) & 15; | 801 | return (sd->s_mode >> 12) & 15; |
838 | } | 802 | } |
839 | 803 | ||
804 | static int sysfs_dir_release(struct inode *inode, struct file *filp) | ||
805 | { | ||
806 | sysfs_put(filp->private_data); | ||
807 | return 0; | ||
808 | } | ||
809 | |||
810 | static struct sysfs_dirent *sysfs_dir_pos(struct sysfs_dirent *parent_sd, | ||
811 | ino_t ino, struct sysfs_dirent *pos) | ||
812 | { | ||
813 | if (pos) { | ||
814 | int valid = !(pos->s_flags & SYSFS_FLAG_REMOVED) && | ||
815 | pos->s_parent == parent_sd && | ||
816 | ino == pos->s_ino; | ||
817 | sysfs_put(pos); | ||
818 | if (valid) | ||
819 | return pos; | ||
820 | } | ||
821 | pos = NULL; | ||
822 | if ((ino > 1) && (ino < INT_MAX)) { | ||
823 | pos = parent_sd->s_dir.children; | ||
824 | while (pos && (ino > pos->s_ino)) | ||
825 | pos = pos->s_sibling; | ||
826 | } | ||
827 | return pos; | ||
828 | } | ||
829 | |||
830 | static struct sysfs_dirent *sysfs_dir_next_pos(struct sysfs_dirent *parent_sd, | ||
831 | ino_t ino, struct sysfs_dirent *pos) | ||
832 | { | ||
833 | pos = sysfs_dir_pos(parent_sd, ino, pos); | ||
834 | if (pos) | ||
835 | pos = pos->s_sibling; | ||
836 | return pos; | ||
837 | } | ||
838 | |||
840 | static int sysfs_readdir(struct file * filp, void * dirent, filldir_t filldir) | 839 | static int sysfs_readdir(struct file * filp, void * dirent, filldir_t filldir) |
841 | { | 840 | { |
842 | struct dentry *dentry = filp->f_path.dentry; | 841 | struct dentry *dentry = filp->f_path.dentry; |
843 | struct sysfs_dirent * parent_sd = dentry->d_fsdata; | 842 | struct sysfs_dirent * parent_sd = dentry->d_fsdata; |
844 | struct sysfs_dirent *pos; | 843 | struct sysfs_dirent *pos = filp->private_data; |
845 | ino_t ino; | 844 | ino_t ino; |
846 | 845 | ||
847 | if (filp->f_pos == 0) { | 846 | if (filp->f_pos == 0) { |
@@ -857,29 +856,31 @@ static int sysfs_readdir(struct file * filp, void * dirent, filldir_t filldir) | |||
857 | if (filldir(dirent, "..", 2, filp->f_pos, ino, DT_DIR) == 0) | 856 | if (filldir(dirent, "..", 2, filp->f_pos, ino, DT_DIR) == 0) |
858 | filp->f_pos++; | 857 | filp->f_pos++; |
859 | } | 858 | } |
860 | if ((filp->f_pos > 1) && (filp->f_pos < INT_MAX)) { | 859 | mutex_lock(&sysfs_mutex); |
861 | mutex_lock(&sysfs_mutex); | 860 | for (pos = sysfs_dir_pos(parent_sd, filp->f_pos, pos); |
862 | 861 | pos; | |
863 | /* Skip the dentries we have already reported */ | 862 | pos = sysfs_dir_next_pos(parent_sd, filp->f_pos, pos)) { |
864 | pos = parent_sd->s_dir.children; | 863 | const char * name; |
865 | while (pos && (filp->f_pos > pos->s_ino)) | 864 | unsigned int type; |
866 | pos = pos->s_sibling; | 865 | int len, ret; |
867 | 866 | ||
868 | for ( ; pos; pos = pos->s_sibling) { | 867 | name = pos->s_name; |
869 | const char * name; | 868 | len = strlen(name); |
870 | int len; | 869 | ino = pos->s_ino; |
871 | 870 | type = dt_type(pos); | |
872 | name = pos->s_name; | 871 | filp->f_pos = ino; |
873 | len = strlen(name); | 872 | filp->private_data = sysfs_get(pos); |
874 | filp->f_pos = ino = pos->s_ino; | ||
875 | 873 | ||
876 | if (filldir(dirent, name, len, filp->f_pos, ino, | ||
877 | dt_type(pos)) < 0) | ||
878 | break; | ||
879 | } | ||
880 | if (!pos) | ||
881 | filp->f_pos = INT_MAX; | ||
882 | mutex_unlock(&sysfs_mutex); | 874 | mutex_unlock(&sysfs_mutex); |
875 | ret = filldir(dirent, name, len, filp->f_pos, ino, type); | ||
876 | mutex_lock(&sysfs_mutex); | ||
877 | if (ret < 0) | ||
878 | break; | ||
879 | } | ||
880 | mutex_unlock(&sysfs_mutex); | ||
881 | if ((filp->f_pos > 1) && !pos) { /* EOF */ | ||
882 | filp->f_pos = INT_MAX; | ||
883 | filp->private_data = NULL; | ||
883 | } | 884 | } |
884 | return 0; | 885 | return 0; |
885 | } | 886 | } |
@@ -888,5 +889,6 @@ static int sysfs_readdir(struct file * filp, void * dirent, filldir_t filldir) | |||
888 | const struct file_operations sysfs_dir_operations = { | 889 | const struct file_operations sysfs_dir_operations = { |
889 | .read = generic_read_dir, | 890 | .read = generic_read_dir, |
890 | .readdir = sysfs_readdir, | 891 | .readdir = sysfs_readdir, |
892 | .release = sysfs_dir_release, | ||
891 | .llseek = generic_file_llseek, | 893 | .llseek = generic_file_llseek, |
892 | }; | 894 | }; |
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c index dc30d9e31683..e222b2582746 100644 --- a/fs/sysfs/file.c +++ b/fs/sysfs/file.c | |||
@@ -53,7 +53,7 @@ struct sysfs_buffer { | |||
53 | size_t count; | 53 | size_t count; |
54 | loff_t pos; | 54 | loff_t pos; |
55 | char * page; | 55 | char * page; |
56 | struct sysfs_ops * ops; | 56 | const struct sysfs_ops * ops; |
57 | struct mutex mutex; | 57 | struct mutex mutex; |
58 | int needs_read_fill; | 58 | int needs_read_fill; |
59 | int event; | 59 | int event; |
@@ -75,7 +75,7 @@ static int fill_read_buffer(struct dentry * dentry, struct sysfs_buffer * buffer | |||
75 | { | 75 | { |
76 | struct sysfs_dirent *attr_sd = dentry->d_fsdata; | 76 | struct sysfs_dirent *attr_sd = dentry->d_fsdata; |
77 | struct kobject *kobj = attr_sd->s_parent->s_dir.kobj; | 77 | struct kobject *kobj = attr_sd->s_parent->s_dir.kobj; |
78 | struct sysfs_ops * ops = buffer->ops; | 78 | const struct sysfs_ops * ops = buffer->ops; |
79 | int ret = 0; | 79 | int ret = 0; |
80 | ssize_t count; | 80 | ssize_t count; |
81 | 81 | ||
@@ -85,13 +85,13 @@ static int fill_read_buffer(struct dentry * dentry, struct sysfs_buffer * buffer | |||
85 | return -ENOMEM; | 85 | return -ENOMEM; |
86 | 86 | ||
87 | /* need attr_sd for attr and ops, its parent for kobj */ | 87 | /* need attr_sd for attr and ops, its parent for kobj */ |
88 | if (!sysfs_get_active_two(attr_sd)) | 88 | if (!sysfs_get_active(attr_sd)) |
89 | return -ENODEV; | 89 | return -ENODEV; |
90 | 90 | ||
91 | buffer->event = atomic_read(&attr_sd->s_attr.open->event); | 91 | buffer->event = atomic_read(&attr_sd->s_attr.open->event); |
92 | count = ops->show(kobj, attr_sd->s_attr.attr, buffer->page); | 92 | count = ops->show(kobj, attr_sd->s_attr.attr, buffer->page); |
93 | 93 | ||
94 | sysfs_put_active_two(attr_sd); | 94 | sysfs_put_active(attr_sd); |
95 | 95 | ||
96 | /* | 96 | /* |
97 | * The code works fine with PAGE_SIZE return but it's likely to | 97 | * The code works fine with PAGE_SIZE return but it's likely to |
@@ -199,16 +199,16 @@ flush_write_buffer(struct dentry * dentry, struct sysfs_buffer * buffer, size_t | |||
199 | { | 199 | { |
200 | struct sysfs_dirent *attr_sd = dentry->d_fsdata; | 200 | struct sysfs_dirent *attr_sd = dentry->d_fsdata; |
201 | struct kobject *kobj = attr_sd->s_parent->s_dir.kobj; | 201 | struct kobject *kobj = attr_sd->s_parent->s_dir.kobj; |
202 | struct sysfs_ops * ops = buffer->ops; | 202 | const struct sysfs_ops * ops = buffer->ops; |
203 | int rc; | 203 | int rc; |
204 | 204 | ||
205 | /* need attr_sd for attr and ops, its parent for kobj */ | 205 | /* need attr_sd for attr and ops, its parent for kobj */ |
206 | if (!sysfs_get_active_two(attr_sd)) | 206 | if (!sysfs_get_active(attr_sd)) |
207 | return -ENODEV; | 207 | return -ENODEV; |
208 | 208 | ||
209 | rc = ops->store(kobj, attr_sd->s_attr.attr, buffer->page, count); | 209 | rc = ops->store(kobj, attr_sd->s_attr.attr, buffer->page, count); |
210 | 210 | ||
211 | sysfs_put_active_two(attr_sd); | 211 | sysfs_put_active(attr_sd); |
212 | 212 | ||
213 | return rc; | 213 | return rc; |
214 | } | 214 | } |
@@ -335,7 +335,7 @@ static int sysfs_open_file(struct inode *inode, struct file *file) | |||
335 | struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata; | 335 | struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata; |
336 | struct kobject *kobj = attr_sd->s_parent->s_dir.kobj; | 336 | struct kobject *kobj = attr_sd->s_parent->s_dir.kobj; |
337 | struct sysfs_buffer *buffer; | 337 | struct sysfs_buffer *buffer; |
338 | struct sysfs_ops *ops; | 338 | const struct sysfs_ops *ops; |
339 | int error = -EACCES; | 339 | int error = -EACCES; |
340 | char *p; | 340 | char *p; |
341 | 341 | ||
@@ -344,7 +344,7 @@ static int sysfs_open_file(struct inode *inode, struct file *file) | |||
344 | memmove(last_sysfs_file, p, strlen(p) + 1); | 344 | memmove(last_sysfs_file, p, strlen(p) + 1); |
345 | 345 | ||
346 | /* need attr_sd for attr and ops, its parent for kobj */ | 346 | /* need attr_sd for attr and ops, its parent for kobj */ |
347 | if (!sysfs_get_active_two(attr_sd)) | 347 | if (!sysfs_get_active(attr_sd)) |
348 | return -ENODEV; | 348 | return -ENODEV; |
349 | 349 | ||
350 | /* every kobject with an attribute needs a ktype assigned */ | 350 | /* every kobject with an attribute needs a ktype assigned */ |
@@ -393,13 +393,13 @@ static int sysfs_open_file(struct inode *inode, struct file *file) | |||
393 | goto err_free; | 393 | goto err_free; |
394 | 394 | ||
395 | /* open succeeded, put active references */ | 395 | /* open succeeded, put active references */ |
396 | sysfs_put_active_two(attr_sd); | 396 | sysfs_put_active(attr_sd); |
397 | return 0; | 397 | return 0; |
398 | 398 | ||
399 | err_free: | 399 | err_free: |
400 | kfree(buffer); | 400 | kfree(buffer); |
401 | err_out: | 401 | err_out: |
402 | sysfs_put_active_two(attr_sd); | 402 | sysfs_put_active(attr_sd); |
403 | return error; | 403 | return error; |
404 | } | 404 | } |
405 | 405 | ||
@@ -437,12 +437,12 @@ static unsigned int sysfs_poll(struct file *filp, poll_table *wait) | |||
437 | struct sysfs_open_dirent *od = attr_sd->s_attr.open; | 437 | struct sysfs_open_dirent *od = attr_sd->s_attr.open; |
438 | 438 | ||
439 | /* need parent for the kobj, grab both */ | 439 | /* need parent for the kobj, grab both */ |
440 | if (!sysfs_get_active_two(attr_sd)) | 440 | if (!sysfs_get_active(attr_sd)) |
441 | goto trigger; | 441 | goto trigger; |
442 | 442 | ||
443 | poll_wait(filp, &od->poll, wait); | 443 | poll_wait(filp, &od->poll, wait); |
444 | 444 | ||
445 | sysfs_put_active_two(attr_sd); | 445 | sysfs_put_active(attr_sd); |
446 | 446 | ||
447 | if (buffer->event != atomic_read(&od->event)) | 447 | if (buffer->event != atomic_read(&od->event)) |
448 | goto trigger; | 448 | goto trigger; |
@@ -509,6 +509,7 @@ int sysfs_add_file_mode(struct sysfs_dirent *dir_sd, | |||
509 | if (!sd) | 509 | if (!sd) |
510 | return -ENOMEM; | 510 | return -ENOMEM; |
511 | sd->s_attr.attr = (void *)attr; | 511 | sd->s_attr.attr = (void *)attr; |
512 | sysfs_dirent_init_lockdep(sd); | ||
512 | 513 | ||
513 | sysfs_addrm_start(&acxt, dir_sd); | 514 | sysfs_addrm_start(&acxt, dir_sd); |
514 | rc = sysfs_add_one(&acxt, sd); | 515 | rc = sysfs_add_one(&acxt, sd); |
@@ -542,6 +543,18 @@ int sysfs_create_file(struct kobject * kobj, const struct attribute * attr) | |||
542 | 543 | ||
543 | } | 544 | } |
544 | 545 | ||
546 | int sysfs_create_files(struct kobject *kobj, const struct attribute **ptr) | ||
547 | { | ||
548 | int err = 0; | ||
549 | int i; | ||
550 | |||
551 | for (i = 0; ptr[i] && !err; i++) | ||
552 | err = sysfs_create_file(kobj, ptr[i]); | ||
553 | if (err) | ||
554 | while (--i >= 0) | ||
555 | sysfs_remove_file(kobj, ptr[i]); | ||
556 | return err; | ||
557 | } | ||
545 | 558 | ||
546 | /** | 559 | /** |
547 | * sysfs_add_file_to_group - add an attribute file to a pre-existing group. | 560 | * sysfs_add_file_to_group - add an attribute file to a pre-existing group. |
@@ -614,6 +627,12 @@ void sysfs_remove_file(struct kobject * kobj, const struct attribute * attr) | |||
614 | sysfs_hash_and_remove(kobj->sd, attr->name); | 627 | sysfs_hash_and_remove(kobj->sd, attr->name); |
615 | } | 628 | } |
616 | 629 | ||
630 | void sysfs_remove_files(struct kobject * kobj, const struct attribute **ptr) | ||
631 | { | ||
632 | int i; | ||
633 | for (i = 0; ptr[i]; i++) | ||
634 | sysfs_remove_file(kobj, ptr[i]); | ||
635 | } | ||
617 | 636 | ||
618 | /** | 637 | /** |
619 | * sysfs_remove_file_from_group - remove an attribute file from a group. | 638 | * sysfs_remove_file_from_group - remove an attribute file from a group. |
@@ -732,3 +751,5 @@ EXPORT_SYMBOL_GPL(sysfs_schedule_callback); | |||
732 | 751 | ||
733 | EXPORT_SYMBOL_GPL(sysfs_create_file); | 752 | EXPORT_SYMBOL_GPL(sysfs_create_file); |
734 | EXPORT_SYMBOL_GPL(sysfs_remove_file); | 753 | EXPORT_SYMBOL_GPL(sysfs_remove_file); |
754 | EXPORT_SYMBOL_GPL(sysfs_remove_files); | ||
755 | EXPORT_SYMBOL_GPL(sysfs_create_files); | ||
diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c index 6a06a1d1ea7b..082daaecac1b 100644 --- a/fs/sysfs/inode.c +++ b/fs/sysfs/inode.c | |||
@@ -111,20 +111,20 @@ int sysfs_setattr(struct dentry *dentry, struct iattr *iattr) | |||
111 | if (!sd) | 111 | if (!sd) |
112 | return -EINVAL; | 112 | return -EINVAL; |
113 | 113 | ||
114 | mutex_lock(&sysfs_mutex); | ||
114 | error = inode_change_ok(inode, iattr); | 115 | error = inode_change_ok(inode, iattr); |
115 | if (error) | 116 | if (error) |
116 | return error; | 117 | goto out; |
117 | 118 | ||
118 | iattr->ia_valid &= ~ATTR_SIZE; /* ignore size changes */ | 119 | iattr->ia_valid &= ~ATTR_SIZE; /* ignore size changes */ |
119 | 120 | ||
120 | error = inode_setattr(inode, iattr); | 121 | error = inode_setattr(inode, iattr); |
121 | if (error) | 122 | if (error) |
122 | return error; | 123 | goto out; |
123 | 124 | ||
124 | mutex_lock(&sysfs_mutex); | ||
125 | error = sysfs_sd_setattr(sd, iattr); | 125 | error = sysfs_sd_setattr(sd, iattr); |
126 | out: | ||
126 | mutex_unlock(&sysfs_mutex); | 127 | mutex_unlock(&sysfs_mutex); |
127 | |||
128 | return error; | 128 | return error; |
129 | } | 129 | } |
130 | 130 | ||
@@ -283,6 +283,7 @@ static void sysfs_init_inode(struct sysfs_dirent *sd, struct inode *inode) | |||
283 | 283 | ||
284 | /** | 284 | /** |
285 | * sysfs_get_inode - get inode for sysfs_dirent | 285 | * sysfs_get_inode - get inode for sysfs_dirent |
286 | * @sb: super block | ||
286 | * @sd: sysfs_dirent to allocate inode for | 287 | * @sd: sysfs_dirent to allocate inode for |
287 | * | 288 | * |
288 | * Get inode for @sd. If such inode doesn't exist, a new inode | 289 | * Get inode for @sd. If such inode doesn't exist, a new inode |
@@ -295,11 +296,11 @@ static void sysfs_init_inode(struct sysfs_dirent *sd, struct inode *inode) | |||
295 | * RETURNS: | 296 | * RETURNS: |
296 | * Pointer to allocated inode on success, NULL on failure. | 297 | * Pointer to allocated inode on success, NULL on failure. |
297 | */ | 298 | */ |
298 | struct inode * sysfs_get_inode(struct sysfs_dirent *sd) | 299 | struct inode * sysfs_get_inode(struct super_block *sb, struct sysfs_dirent *sd) |
299 | { | 300 | { |
300 | struct inode *inode; | 301 | struct inode *inode; |
301 | 302 | ||
302 | inode = iget_locked(sysfs_sb, sd->s_ino); | 303 | inode = iget_locked(sb, sd->s_ino); |
303 | if (inode && (inode->i_state & I_NEW)) | 304 | if (inode && (inode->i_state & I_NEW)) |
304 | sysfs_init_inode(sd, inode); | 305 | sysfs_init_inode(sd, inode); |
305 | 306 | ||
diff --git a/fs/sysfs/mount.c b/fs/sysfs/mount.c index 49749955ccaf..0cb10884a2fc 100644 --- a/fs/sysfs/mount.c +++ b/fs/sysfs/mount.c | |||
@@ -23,7 +23,6 @@ | |||
23 | 23 | ||
24 | 24 | ||
25 | static struct vfsmount *sysfs_mount; | 25 | static struct vfsmount *sysfs_mount; |
26 | struct super_block * sysfs_sb = NULL; | ||
27 | struct kmem_cache *sysfs_dir_cachep; | 26 | struct kmem_cache *sysfs_dir_cachep; |
28 | 27 | ||
29 | static const struct super_operations sysfs_ops = { | 28 | static const struct super_operations sysfs_ops = { |
@@ -50,11 +49,10 @@ static int sysfs_fill_super(struct super_block *sb, void *data, int silent) | |||
50 | sb->s_magic = SYSFS_MAGIC; | 49 | sb->s_magic = SYSFS_MAGIC; |
51 | sb->s_op = &sysfs_ops; | 50 | sb->s_op = &sysfs_ops; |
52 | sb->s_time_gran = 1; | 51 | sb->s_time_gran = 1; |
53 | sysfs_sb = sb; | ||
54 | 52 | ||
55 | /* get root inode, initialize and unlock it */ | 53 | /* get root inode, initialize and unlock it */ |
56 | mutex_lock(&sysfs_mutex); | 54 | mutex_lock(&sysfs_mutex); |
57 | inode = sysfs_get_inode(&sysfs_root); | 55 | inode = sysfs_get_inode(sb, &sysfs_root); |
58 | mutex_unlock(&sysfs_mutex); | 56 | mutex_unlock(&sysfs_mutex); |
59 | if (!inode) { | 57 | if (!inode) { |
60 | pr_debug("sysfs: could not get root inode\n"); | 58 | pr_debug("sysfs: could not get root inode\n"); |
diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c index c5eff49fa41b..1b9a3a1e8a17 100644 --- a/fs/sysfs/symlink.c +++ b/fs/sysfs/symlink.c | |||
@@ -123,6 +123,44 @@ void sysfs_remove_link(struct kobject * kobj, const char * name) | |||
123 | sysfs_hash_and_remove(parent_sd, name); | 123 | sysfs_hash_and_remove(parent_sd, name); |
124 | } | 124 | } |
125 | 125 | ||
126 | /** | ||
127 | * sysfs_rename_link - rename symlink in object's directory. | ||
128 | * @kobj: object we're acting for. | ||
129 | * @targ: object we're pointing to. | ||
130 | * @old: previous name of the symlink. | ||
131 | * @new: new name of the symlink. | ||
132 | * | ||
133 | * A helper function for the common rename symlink idiom. | ||
134 | */ | ||
135 | int sysfs_rename_link(struct kobject *kobj, struct kobject *targ, | ||
136 | const char *old, const char *new) | ||
137 | { | ||
138 | struct sysfs_dirent *parent_sd, *sd = NULL; | ||
139 | int result; | ||
140 | |||
141 | if (!kobj) | ||
142 | parent_sd = &sysfs_root; | ||
143 | else | ||
144 | parent_sd = kobj->sd; | ||
145 | |||
146 | result = -ENOENT; | ||
147 | sd = sysfs_get_dirent(parent_sd, old); | ||
148 | if (!sd) | ||
149 | goto out; | ||
150 | |||
151 | result = -EINVAL; | ||
152 | if (sysfs_type(sd) != SYSFS_KOBJ_LINK) | ||
153 | goto out; | ||
154 | if (sd->s_symlink.target_sd->s_dir.kobj != targ) | ||
155 | goto out; | ||
156 | |||
157 | result = sysfs_rename(sd, parent_sd, new); | ||
158 | |||
159 | out: | ||
160 | sysfs_put(sd); | ||
161 | return result; | ||
162 | } | ||
163 | |||
126 | static int sysfs_get_target_path(struct sysfs_dirent *parent_sd, | 164 | static int sysfs_get_target_path(struct sysfs_dirent *parent_sd, |
127 | struct sysfs_dirent *target_sd, char *path) | 165 | struct sysfs_dirent *target_sd, char *path) |
128 | { | 166 | { |
diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h index cdd9377a6e06..30f5a44fb5d3 100644 --- a/fs/sysfs/sysfs.h +++ b/fs/sysfs/sysfs.h | |||
@@ -66,8 +66,8 @@ struct sysfs_dirent { | |||
66 | }; | 66 | }; |
67 | 67 | ||
68 | unsigned int s_flags; | 68 | unsigned int s_flags; |
69 | unsigned short s_mode; | ||
69 | ino_t s_ino; | 70 | ino_t s_ino; |
70 | umode_t s_mode; | ||
71 | struct sysfs_inode_attrs *s_iattr; | 71 | struct sysfs_inode_attrs *s_iattr; |
72 | }; | 72 | }; |
73 | 73 | ||
@@ -79,6 +79,7 @@ struct sysfs_dirent { | |||
79 | #define SYSFS_KOBJ_BIN_ATTR 0x0004 | 79 | #define SYSFS_KOBJ_BIN_ATTR 0x0004 |
80 | #define SYSFS_KOBJ_LINK 0x0008 | 80 | #define SYSFS_KOBJ_LINK 0x0008 |
81 | #define SYSFS_COPY_NAME (SYSFS_DIR | SYSFS_KOBJ_LINK) | 81 | #define SYSFS_COPY_NAME (SYSFS_DIR | SYSFS_KOBJ_LINK) |
82 | #define SYSFS_ACTIVE_REF (SYSFS_KOBJ_ATTR | SYSFS_KOBJ_BIN_ATTR) | ||
82 | 83 | ||
83 | #define SYSFS_FLAG_MASK ~SYSFS_TYPE_MASK | 84 | #define SYSFS_FLAG_MASK ~SYSFS_TYPE_MASK |
84 | #define SYSFS_FLAG_REMOVED 0x0200 | 85 | #define SYSFS_FLAG_REMOVED 0x0200 |
@@ -91,9 +92,12 @@ static inline unsigned int sysfs_type(struct sysfs_dirent *sd) | |||
91 | #ifdef CONFIG_DEBUG_LOCK_ALLOC | 92 | #ifdef CONFIG_DEBUG_LOCK_ALLOC |
92 | #define sysfs_dirent_init_lockdep(sd) \ | 93 | #define sysfs_dirent_init_lockdep(sd) \ |
93 | do { \ | 94 | do { \ |
94 | static struct lock_class_key __key; \ | 95 | struct attribute *attr = sd->s_attr.attr; \ |
96 | struct lock_class_key *key = attr->key; \ | ||
97 | if (!key) \ | ||
98 | key = &attr->skey; \ | ||
95 | \ | 99 | \ |
96 | lockdep_init_map(&sd->dep_map, "s_active", &__key, 0); \ | 100 | lockdep_init_map(&sd->dep_map, "s_active", key, 0); \ |
97 | } while(0) | 101 | } while(0) |
98 | #else | 102 | #else |
99 | #define sysfs_dirent_init_lockdep(sd) do {} while(0) | 103 | #define sysfs_dirent_init_lockdep(sd) do {} while(0) |
@@ -111,7 +115,6 @@ struct sysfs_addrm_cxt { | |||
111 | * mount.c | 115 | * mount.c |
112 | */ | 116 | */ |
113 | extern struct sysfs_dirent sysfs_root; | 117 | extern struct sysfs_dirent sysfs_root; |
114 | extern struct super_block *sysfs_sb; | ||
115 | extern struct kmem_cache *sysfs_dir_cachep; | 118 | extern struct kmem_cache *sysfs_dir_cachep; |
116 | 119 | ||
117 | /* | 120 | /* |
@@ -124,8 +127,8 @@ extern const struct file_operations sysfs_dir_operations; | |||
124 | extern const struct inode_operations sysfs_dir_inode_operations; | 127 | extern const struct inode_operations sysfs_dir_inode_operations; |
125 | 128 | ||
126 | struct dentry *sysfs_get_dentry(struct sysfs_dirent *sd); | 129 | struct dentry *sysfs_get_dentry(struct sysfs_dirent *sd); |
127 | struct sysfs_dirent *sysfs_get_active_two(struct sysfs_dirent *sd); | 130 | struct sysfs_dirent *sysfs_get_active(struct sysfs_dirent *sd); |
128 | void sysfs_put_active_two(struct sysfs_dirent *sd); | 131 | void sysfs_put_active(struct sysfs_dirent *sd); |
129 | void sysfs_addrm_start(struct sysfs_addrm_cxt *acxt, | 132 | void sysfs_addrm_start(struct sysfs_addrm_cxt *acxt, |
130 | struct sysfs_dirent *parent_sd); | 133 | struct sysfs_dirent *parent_sd); |
131 | int __sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd); | 134 | int __sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd); |
@@ -168,7 +171,7 @@ static inline void __sysfs_put(struct sysfs_dirent *sd) | |||
168 | /* | 171 | /* |
169 | * inode.c | 172 | * inode.c |
170 | */ | 173 | */ |
171 | struct inode *sysfs_get_inode(struct sysfs_dirent *sd); | 174 | struct inode *sysfs_get_inode(struct super_block *sb, struct sysfs_dirent *sd); |
172 | void sysfs_delete_inode(struct inode *inode); | 175 | void sysfs_delete_inode(struct inode *inode); |
173 | int sysfs_sd_setattr(struct sysfs_dirent *sd, struct iattr *iattr); | 176 | int sysfs_sd_setattr(struct sysfs_dirent *sd, struct iattr *iattr); |
174 | int sysfs_permission(struct inode *inode, int mask); | 177 | int sysfs_permission(struct inode *inode, int mask); |
diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c index ccc3ad7242d4..19626e2491c4 100644 --- a/fs/udf/balloc.c +++ b/fs/udf/balloc.c | |||
@@ -31,55 +31,8 @@ | |||
31 | #define udf_clear_bit(nr, addr) ext2_clear_bit(nr, addr) | 31 | #define udf_clear_bit(nr, addr) ext2_clear_bit(nr, addr) |
32 | #define udf_set_bit(nr, addr) ext2_set_bit(nr, addr) | 32 | #define udf_set_bit(nr, addr) ext2_set_bit(nr, addr) |
33 | #define udf_test_bit(nr, addr) ext2_test_bit(nr, addr) | 33 | #define udf_test_bit(nr, addr) ext2_test_bit(nr, addr) |
34 | #define udf_find_first_one_bit(addr, size) find_first_one_bit(addr, size) | ||
35 | #define udf_find_next_one_bit(addr, size, offset) \ | 34 | #define udf_find_next_one_bit(addr, size, offset) \ |
36 | find_next_one_bit(addr, size, offset) | 35 | ext2_find_next_bit(addr, size, offset) |
37 | |||
38 | #define leBPL_to_cpup(x) leNUM_to_cpup(BITS_PER_LONG, x) | ||
39 | #define leNUM_to_cpup(x, y) xleNUM_to_cpup(x, y) | ||
40 | #define xleNUM_to_cpup(x, y) (le ## x ## _to_cpup(y)) | ||
41 | #define uintBPL_t uint(BITS_PER_LONG) | ||
42 | #define uint(x) xuint(x) | ||
43 | #define xuint(x) __le ## x | ||
44 | |||
45 | static inline int find_next_one_bit(void *addr, int size, int offset) | ||
46 | { | ||
47 | uintBPL_t *p = ((uintBPL_t *) addr) + (offset / BITS_PER_LONG); | ||
48 | int result = offset & ~(BITS_PER_LONG - 1); | ||
49 | unsigned long tmp; | ||
50 | |||
51 | if (offset >= size) | ||
52 | return size; | ||
53 | size -= result; | ||
54 | offset &= (BITS_PER_LONG - 1); | ||
55 | if (offset) { | ||
56 | tmp = leBPL_to_cpup(p++); | ||
57 | tmp &= ~0UL << offset; | ||
58 | if (size < BITS_PER_LONG) | ||
59 | goto found_first; | ||
60 | if (tmp) | ||
61 | goto found_middle; | ||
62 | size -= BITS_PER_LONG; | ||
63 | result += BITS_PER_LONG; | ||
64 | } | ||
65 | while (size & ~(BITS_PER_LONG - 1)) { | ||
66 | tmp = leBPL_to_cpup(p++); | ||
67 | if (tmp) | ||
68 | goto found_middle; | ||
69 | result += BITS_PER_LONG; | ||
70 | size -= BITS_PER_LONG; | ||
71 | } | ||
72 | if (!size) | ||
73 | return result; | ||
74 | tmp = leBPL_to_cpup(p); | ||
75 | found_first: | ||
76 | tmp &= ~0UL >> (BITS_PER_LONG - size); | ||
77 | found_middle: | ||
78 | return result + ffz(~tmp); | ||
79 | } | ||
80 | |||
81 | #define find_first_one_bit(addr, size)\ | ||
82 | find_next_one_bit((addr), (size), 0) | ||
83 | 36 | ||
84 | static int read_block_bitmap(struct super_block *sb, | 37 | static int read_block_bitmap(struct super_block *sb, |
85 | struct udf_bitmap *bitmap, unsigned int block, | 38 | struct udf_bitmap *bitmap, unsigned int block, |
diff --git a/fs/udf/inode.c b/fs/udf/inode.c index b57ab0402d89..bb863fe579ac 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c | |||
@@ -106,7 +106,7 @@ void udf_clear_inode(struct inode *inode) | |||
106 | if (iinfo->i_alloc_type != ICBTAG_FLAG_AD_IN_ICB && | 106 | if (iinfo->i_alloc_type != ICBTAG_FLAG_AD_IN_ICB && |
107 | inode->i_size != iinfo->i_lenExtents) { | 107 | inode->i_size != iinfo->i_lenExtents) { |
108 | printk(KERN_WARNING "UDF-fs (%s): Inode %lu (mode %o) has " | 108 | printk(KERN_WARNING "UDF-fs (%s): Inode %lu (mode %o) has " |
109 | "inode size %llu different from extent lenght %llu. " | 109 | "inode size %llu different from extent length %llu. " |
110 | "Filesystem need not be standards compliant.\n", | 110 | "Filesystem need not be standards compliant.\n", |
111 | inode->i_sb->s_id, inode->i_ino, inode->i_mode, | 111 | inode->i_sb->s_id, inode->i_ino, inode->i_mode, |
112 | (unsigned long long)inode->i_size, | 112 | (unsigned long long)inode->i_size, |
@@ -1408,20 +1408,19 @@ static int udf_update_inode(struct inode *inode, int do_sync) | |||
1408 | unsigned char blocksize_bits = inode->i_sb->s_blocksize_bits; | 1408 | unsigned char blocksize_bits = inode->i_sb->s_blocksize_bits; |
1409 | struct udf_inode_info *iinfo = UDF_I(inode); | 1409 | struct udf_inode_info *iinfo = UDF_I(inode); |
1410 | 1410 | ||
1411 | bh = udf_tread(inode->i_sb, | 1411 | bh = udf_tgetblk(inode->i_sb, |
1412 | udf_get_lb_pblock(inode->i_sb, | 1412 | udf_get_lb_pblock(inode->i_sb, &iinfo->i_location, 0)); |
1413 | &iinfo->i_location, 0)); | ||
1414 | if (!bh) { | 1413 | if (!bh) { |
1415 | udf_debug("bread failure\n"); | 1414 | udf_debug("getblk failure\n"); |
1416 | return -EIO; | 1415 | return -ENOMEM; |
1417 | } | 1416 | } |
1418 | 1417 | ||
1419 | memset(bh->b_data, 0x00, inode->i_sb->s_blocksize); | 1418 | lock_buffer(bh); |
1420 | 1419 | memset(bh->b_data, 0, inode->i_sb->s_blocksize); | |
1421 | fe = (struct fileEntry *)bh->b_data; | 1420 | fe = (struct fileEntry *)bh->b_data; |
1422 | efe = (struct extendedFileEntry *)bh->b_data; | 1421 | efe = (struct extendedFileEntry *)bh->b_data; |
1423 | 1422 | ||
1424 | if (fe->descTag.tagIdent == cpu_to_le16(TAG_IDENT_USE)) { | 1423 | if (iinfo->i_use) { |
1425 | struct unallocSpaceEntry *use = | 1424 | struct unallocSpaceEntry *use = |
1426 | (struct unallocSpaceEntry *)bh->b_data; | 1425 | (struct unallocSpaceEntry *)bh->b_data; |
1427 | 1426 | ||
@@ -1429,20 +1428,18 @@ static int udf_update_inode(struct inode *inode, int do_sync) | |||
1429 | memcpy(bh->b_data + sizeof(struct unallocSpaceEntry), | 1428 | memcpy(bh->b_data + sizeof(struct unallocSpaceEntry), |
1430 | iinfo->i_ext.i_data, inode->i_sb->s_blocksize - | 1429 | iinfo->i_ext.i_data, inode->i_sb->s_blocksize - |
1431 | sizeof(struct unallocSpaceEntry)); | 1430 | sizeof(struct unallocSpaceEntry)); |
1431 | use->descTag.tagIdent = cpu_to_le16(TAG_IDENT_USE); | ||
1432 | use->descTag.tagLocation = | ||
1433 | cpu_to_le32(iinfo->i_location.logicalBlockNum); | ||
1432 | crclen = sizeof(struct unallocSpaceEntry) + | 1434 | crclen = sizeof(struct unallocSpaceEntry) + |
1433 | iinfo->i_lenAlloc - sizeof(struct tag); | 1435 | iinfo->i_lenAlloc - sizeof(struct tag); |
1434 | use->descTag.tagLocation = cpu_to_le32( | ||
1435 | iinfo->i_location. | ||
1436 | logicalBlockNum); | ||
1437 | use->descTag.descCRCLength = cpu_to_le16(crclen); | 1436 | use->descTag.descCRCLength = cpu_to_le16(crclen); |
1438 | use->descTag.descCRC = cpu_to_le16(crc_itu_t(0, (char *)use + | 1437 | use->descTag.descCRC = cpu_to_le16(crc_itu_t(0, (char *)use + |
1439 | sizeof(struct tag), | 1438 | sizeof(struct tag), |
1440 | crclen)); | 1439 | crclen)); |
1441 | use->descTag.tagChecksum = udf_tag_checksum(&use->descTag); | 1440 | use->descTag.tagChecksum = udf_tag_checksum(&use->descTag); |
1442 | 1441 | ||
1443 | mark_buffer_dirty(bh); | 1442 | goto out; |
1444 | brelse(bh); | ||
1445 | return err; | ||
1446 | } | 1443 | } |
1447 | 1444 | ||
1448 | if (UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_UID_FORGET)) | 1445 | if (UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_UID_FORGET)) |
@@ -1597,18 +1594,21 @@ static int udf_update_inode(struct inode *inode, int do_sync) | |||
1597 | fe->descTag.tagSerialNum = cpu_to_le16(sbi->s_serial_number); | 1594 | fe->descTag.tagSerialNum = cpu_to_le16(sbi->s_serial_number); |
1598 | fe->descTag.tagLocation = cpu_to_le32( | 1595 | fe->descTag.tagLocation = cpu_to_le32( |
1599 | iinfo->i_location.logicalBlockNum); | 1596 | iinfo->i_location.logicalBlockNum); |
1600 | crclen += iinfo->i_lenEAttr + iinfo->i_lenAlloc - | 1597 | crclen += iinfo->i_lenEAttr + iinfo->i_lenAlloc - sizeof(struct tag); |
1601 | sizeof(struct tag); | ||
1602 | fe->descTag.descCRCLength = cpu_to_le16(crclen); | 1598 | fe->descTag.descCRCLength = cpu_to_le16(crclen); |
1603 | fe->descTag.descCRC = cpu_to_le16(crc_itu_t(0, (char *)fe + sizeof(struct tag), | 1599 | fe->descTag.descCRC = cpu_to_le16(crc_itu_t(0, (char *)fe + sizeof(struct tag), |
1604 | crclen)); | 1600 | crclen)); |
1605 | fe->descTag.tagChecksum = udf_tag_checksum(&fe->descTag); | 1601 | fe->descTag.tagChecksum = udf_tag_checksum(&fe->descTag); |
1606 | 1602 | ||
1603 | out: | ||
1604 | set_buffer_uptodate(bh); | ||
1605 | unlock_buffer(bh); | ||
1606 | |||
1607 | /* write the data blocks */ | 1607 | /* write the data blocks */ |
1608 | mark_buffer_dirty(bh); | 1608 | mark_buffer_dirty(bh); |
1609 | if (do_sync) { | 1609 | if (do_sync) { |
1610 | sync_dirty_buffer(bh); | 1610 | sync_dirty_buffer(bh); |
1611 | if (buffer_req(bh) && !buffer_uptodate(bh)) { | 1611 | if (buffer_write_io_error(bh)) { |
1612 | printk(KERN_WARNING "IO error syncing udf inode " | 1612 | printk(KERN_WARNING "IO error syncing udf inode " |
1613 | "[%s:%08lx]\n", inode->i_sb->s_id, | 1613 | "[%s:%08lx]\n", inode->i_sb->s_id, |
1614 | inode->i_ino); | 1614 | inode->i_ino); |
diff --git a/fs/ufs/super.c b/fs/ufs/super.c index 66b63a751615..14743d935a93 100644 --- a/fs/ufs/super.c +++ b/fs/ufs/super.c | |||
@@ -1016,6 +1016,9 @@ magic_found: | |||
1016 | case UFS_FSSTABLE: | 1016 | case UFS_FSSTABLE: |
1017 | UFSD("fs is stable\n"); | 1017 | UFSD("fs is stable\n"); |
1018 | break; | 1018 | break; |
1019 | case UFS_FSLOG: | ||
1020 | UFSD("fs is logging fs\n"); | ||
1021 | break; | ||
1019 | case UFS_FSOSF1: | 1022 | case UFS_FSOSF1: |
1020 | UFSD("fs is DEC OSF/1\n"); | 1023 | UFSD("fs is DEC OSF/1\n"); |
1021 | break; | 1024 | break; |
diff --git a/fs/ufs/ufs_fs.h b/fs/ufs/ufs_fs.h index 54bde1895a80..6943ec677c0b 100644 --- a/fs/ufs/ufs_fs.h +++ b/fs/ufs/ufs_fs.h | |||
@@ -138,6 +138,7 @@ typedef __u16 __bitwise __fs16; | |||
138 | 138 | ||
139 | #define UFS_USEEFT ((__u16)65535) | 139 | #define UFS_USEEFT ((__u16)65535) |
140 | 140 | ||
141 | /* fs_clean values */ | ||
141 | #define UFS_FSOK 0x7c269d38 | 142 | #define UFS_FSOK 0x7c269d38 |
142 | #define UFS_FSACTIVE ((__s8)0x00) | 143 | #define UFS_FSACTIVE ((__s8)0x00) |
143 | #define UFS_FSCLEAN ((__s8)0x01) | 144 | #define UFS_FSCLEAN ((__s8)0x01) |
@@ -145,6 +146,11 @@ typedef __u16 __bitwise __fs16; | |||
145 | #define UFS_FSOSF1 ((__s8)0x03) /* is this correct for DEC OSF/1? */ | 146 | #define UFS_FSOSF1 ((__s8)0x03) /* is this correct for DEC OSF/1? */ |
146 | #define UFS_FSBAD ((__s8)0xff) | 147 | #define UFS_FSBAD ((__s8)0xff) |
147 | 148 | ||
149 | /* Solaris-specific fs_clean values */ | ||
150 | #define UFS_FSSUSPEND ((__s8)0xfe) /* temporarily suspended */ | ||
151 | #define UFS_FSLOG ((__s8)0xfd) /* logging fs */ | ||
152 | #define UFS_FSFIX ((__s8)0xfc) /* being repaired while mounted */ | ||
153 | |||
148 | /* From here to next blank line, s_flags for ufs_sb_info */ | 154 | /* From here to next blank line, s_flags for ufs_sb_info */ |
149 | /* directory entry encoding */ | 155 | /* directory entry encoding */ |
150 | #define UFS_DE_MASK 0x00000010 /* mask for the following */ | 156 | #define UFS_DE_MASK 0x00000010 /* mask for the following */ |
@@ -227,11 +233,16 @@ typedef __u16 __bitwise __fs16; | |||
227 | */ | 233 | */ |
228 | #define ufs_cbtocylno(bno) \ | 234 | #define ufs_cbtocylno(bno) \ |
229 | ((bno) * uspi->s_nspf / uspi->s_spc) | 235 | ((bno) * uspi->s_nspf / uspi->s_spc) |
230 | #define ufs_cbtorpos(bno) \ | 236 | #define ufs_cbtorpos(bno) \ |
237 | ((UFS_SB(sb)->s_flags & UFS_CG_SUN) ? \ | ||
238 | (((((bno) * uspi->s_nspf % uspi->s_spc) % \ | ||
239 | uspi->s_nsect) * \ | ||
240 | uspi->s_nrpos) / uspi->s_nsect) \ | ||
241 | : \ | ||
231 | ((((bno) * uspi->s_nspf % uspi->s_spc / uspi->s_nsect \ | 242 | ((((bno) * uspi->s_nspf % uspi->s_spc / uspi->s_nsect \ |
232 | * uspi->s_trackskew + (bno) * uspi->s_nspf % uspi->s_spc \ | 243 | * uspi->s_trackskew + (bno) * uspi->s_nspf % uspi->s_spc \ |
233 | % uspi->s_nsect * uspi->s_interleave) % uspi->s_nsect \ | 244 | % uspi->s_nsect * uspi->s_interleave) % uspi->s_nsect \ |
234 | * uspi->s_nrpos) / uspi->s_npsect) | 245 | * uspi->s_nrpos) / uspi->s_npsect)) |
235 | 246 | ||
236 | /* | 247 | /* |
237 | * The following macros optimize certain frequently calculated | 248 | * The following macros optimize certain frequently calculated |