1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-24 23:25:32 +02:00
openwrt-xburst/target/linux/generic/patches-2.6.38/102-overlayfs_fix_readdir_unlink_deadlock.patch
nbd 5ed970594e kernel: reorganize 2.6.38 patches, clean up block2mtd patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26690 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-04-16 18:30:57 +00:00

77 lines
1.9 KiB
Diff

--- a/fs/overlayfs/overlayfs.c
+++ b/fs/overlayfs/overlayfs.c
@@ -1700,37 +1700,56 @@ static int ovl_check_empty_dir(struct de
return err;
}
-static int ovl_unlink_whiteout(void *buf, const char *name, int namelen,
- loff_t offset, u64 ino, unsigned int d_type)
+static int ovl_fill_links(void *buf, const char *name, int namelen,
+ loff_t offset, u64 ino, unsigned int d_type)
{
struct ovl_readdir_data *rdd = buf;
+ struct ovl_cache_entry *p;
- rdd->count++;
- /* check d_type to filter out "." and ".." */
- if (d_type == DT_LNK) {
- struct dentry *dentry;
+ if (d_type != DT_LNK)
+ return 0;
- dentry = lookup_one_len(name, rdd->dir, namelen);
- if (IS_ERR(dentry)) {
- rdd->err = PTR_ERR(dentry);
- } else {
- rdd->err = vfs_unlink(rdd->dir->d_inode, dentry);
- dput(dentry);
- }
- }
+ p = ovl_cache_entry_new(name, namelen, ino, d_type);
+ if (!p)
+ return -ENOMEM;
- return rdd->err;
+ list_add(&p->l_node, rdd->list);
+ return 0;
}
static int ovl_remove_whiteouts(struct dentry *dentry)
{
struct path upperpath;
- struct ovl_readdir_data rdd = { .list = NULL };
+ LIST_HEAD(list);
+ struct ovl_readdir_data rdd = { .list = &list };
+ struct ovl_cache_entry *p, *t;
+ int ret;
ovl_path_upper(dentry, &upperpath);
rdd.dir = upperpath.dentry;
- return ovl_dir_read(&upperpath, &rdd, ovl_unlink_whiteout);
+ ret = ovl_dir_read(&upperpath, &rdd, ovl_fill_links);
+
+ mutex_lock(&rdd.dir->d_inode->i_mutex);
+ list_for_each_entry_safe(p, t, &list, l_node) {
+ struct dentry *dentry;
+
+ if (!ret) {
+ dentry = lookup_one_len(p->name, rdd.dir, p->len);
+ if (IS_ERR(dentry)) {
+ ret = PTR_ERR(dentry);
+ } else {
+ ret = vfs_unlink(rdd.dir->d_inode, dentry);
+ dput(dentry);
+ }
+ }
+
+ list_del(&p->l_node);
+ kfree(p);
+ }
+ mutex_unlock(&rdd.dir->d_inode->i_mutex);
+
+ return ret;
}
static int ovl_rmdir(struct inode *dir, struct dentry *dentry)