Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3975d167 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.infradead.org/~dwmw2/mtd-2.6.35 

* git://git.infradead.org/~dwmw2/mtd-2.6.35:
  jffs2: update ctime when changing the file's permission by setfacl
  jffs2: Fix NFS race by using insert_inode_locked()
  jffs2: Fix in-core inode leaks on error paths
  mtd: Fix NAND submenu
  mtd/r852: update card detect early.
  mtd/r852: Fixes in case of DMA timeout
  mtd/r852: register IRQ as last step
  drivers/mtd: Use memdup_user
  docbook: make mtd nand module init static
parents 4d3d769c 1c24d06f

drivers/mtd/mtdchar.c

+3 −8
Original line number Diff line number Diff line
@@ -404,14 +404,9 @@ static int mtd_do_writeoob(struct file *file, struct mtd_info *mtd, 
	if (ops.ooboffs && ops.ooblen > (mtd->oobsize - ops.ooboffs))

		return -EINVAL;



	ops.oobbuf = kmalloc(length, GFP_KERNEL);

	if (!ops.oobbuf)

		return -ENOMEM;



	if (copy_from_user(ops.oobbuf, ptr, length)) {

		kfree(ops.oobbuf);

		return -EFAULT;

	}

	ops.oobbuf = memdup_user(ptr, length);

	if (IS_ERR(ops.oobbuf))

		return PTR_ERR(ops.oobbuf);



	start &= ~((uint64_t)mtd->oobsize - 1);

	ret = mtd->write_oob(mtd, start, &ops);

drivers/mtd/nand/Kconfig

+11 −10
Original line number Diff line number Diff line 
menuconfig MTD_NAND

	tristate "NAND Device Support"

	depends on MTD

	select MTD_NAND_IDS

	select MTD_NAND_ECC

	help

	  This enables support for accessing all type of NAND flash

	  devices. For further information see

	  <http://www.linux-mtd.infradead.org/doc/nand.html>.



config MTD_NAND_ECC

	tristate
@@ -19,6 +9,17 @@ config MTD_NAND_ECC_SMC 
	  Software ECC according to the Smart Media Specification.

	  The original Linux implementation had byte 0 and 1 swapped.





menuconfig MTD_NAND

	tristate "NAND Device Support"

	depends on MTD

	select MTD_NAND_IDS

	select MTD_NAND_ECC

	help

	  This enables support for accessing all type of NAND flash

	  devices. For further information see

	  <http://www.linux-mtd.infradead.org/doc/nand.html>.



if MTD_NAND



config MTD_NAND_VERIFY_WRITE

drivers/mtd/nand/r852.c

+18 −9
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ static void r852_dma_done(struct r852_device *dev, int error) 
	if (dev->phys_dma_addr && dev->phys_dma_addr != dev->phys_bounce_buffer)

		pci_unmap_single(dev->pci_dev, dev->phys_dma_addr, R852_DMA_LEN,

			dev->dma_dir ? PCI_DMA_FROMDEVICE : PCI_DMA_TODEVICE);

	complete(&dev->dma_done);

}



/*
@@ -182,6 +181,7 @@ static void r852_do_dma(struct r852_device *dev, uint8_t *buf, int do_read) 
	/* Set dma direction */

	dev->dma_dir = do_read;

	dev->dma_stage = 1;

	INIT_COMPLETION(dev->dma_done);



	dbg_verbose("doing dma %s ", do_read ? "read" : "write");
@@ -494,6 +494,11 @@ int r852_ecc_correct(struct mtd_info *mtd, uint8_t *dat, 
	if (dev->card_unstable)

		return 0;



	if (dev->dma_error) {

		dev->dma_error = 0;

		return -1;

	}



	r852_write_reg(dev, R852_CTL, dev->ctlreg | R852_CTL_ECC_ACCESS);

	ecc_reg = r852_read_reg_dword(dev, R852_DATALINE);

	r852_write_reg(dev, R852_CTL, dev->ctlreg);
@@ -707,6 +712,7 @@ void r852_card_detect_work(struct work_struct *work) 
		container_of(work, struct r852_device, card_detect_work.work);



	r852_card_update_present(dev);

	r852_update_card_detect(dev);

	dev->card_unstable = 0;



	/* False alarm */
@@ -722,7 +728,6 @@ void r852_card_detect_work(struct work_struct *work) 
	else

		r852_unregister_nand_device(dev);

exit:

	/* Update detection logic */

	r852_update_card_detect(dev);

}
@@ -796,6 +801,7 @@ static irqreturn_t r852_irq(int irq, void *data) 
		if (dma_status & R852_DMA_IRQ_ERROR) {

			dbg("recieved dma error IRQ");

			r852_dma_done(dev, -EIO);

			complete(&dev->dma_done);

			goto out;

		}
@@ -825,8 +831,10 @@ static irqreturn_t r852_irq(int irq, void *data) 
			r852_dma_enable(dev);



		/* Operation done */

		if (dev->dma_stage == 3)

		if (dev->dma_stage == 3) {

			r852_dma_done(dev, 0);

			complete(&dev->dma_done);

		}

		goto out;

	}
@@ -940,18 +948,19 @@ int r852_probe(struct pci_dev *pci_dev, const struct pci_device_id *id) 


	r852_dma_test(dev);



	dev->irq = pci_dev->irq;

	spin_lock_init(&dev->irqlock);



	dev->card_detected = 0;

	r852_card_update_present(dev);



	/*register irq handler*/

	error = -ENODEV;

	if (request_irq(pci_dev->irq, &r852_irq, IRQF_SHARED,

			  DRV_NAME, dev))

		goto error10;



	dev->irq = pci_dev->irq;

	spin_lock_init(&dev->irqlock);



	/* kick initial present test */

	dev->card_detected = 0;

	r852_card_update_present(dev);

	queue_delayed_work(dev->card_workqueue,

		&dev->card_detect_work, 0);
@@ -1081,7 +1090,7 @@ int r852_resume(struct device *device) 
			dev->card_detected ? "added" : "removed");



		queue_delayed_work(dev->card_workqueue,

		&dev->card_detect_work, 1000);

		&dev->card_detect_work, msecs_to_jiffies(1000));

		return 0;

	}

fs/jffs2/acl.c

+2 −1
Original line number Diff line number Diff line
@@ -234,8 +234,9 @@ static int jffs2_set_acl(struct inode *inode, int type, struct posix_acl *acl) 
			if (inode->i_mode != mode) {

				struct iattr attr;



				attr.ia_valid = ATTR_MODE;

				attr.ia_valid = ATTR_MODE | ATTR_CTIME;

				attr.ia_mode = mode;

				attr.ia_ctime = CURRENT_TIME_SEC;

				rc = jffs2_do_setattr(inode, &attr);

				if (rc < 0)

					return rc;

fs/jffs2/dir.c

+66 −61
Original line number Diff line number Diff line
@@ -222,15 +222,18 @@ static int jffs2_create(struct inode *dir_i, struct dentry *dentry, int mode, 
	dir_i->i_mtime = dir_i->i_ctime = ITIME(je32_to_cpu(ri->ctime));



	jffs2_free_raw_inode(ri);

	d_instantiate(dentry, inode);



	D1(printk(KERN_DEBUG "jffs2_create: Created ino #%lu with mode %o, nlink %d(%d). nrpages %ld\n",

		  inode->i_ino, inode->i_mode, inode->i_nlink,

		  f->inocache->pino_nlink, inode->i_mapping->nrpages));



	d_instantiate(dentry, inode);

	unlock_new_inode(inode);

	return 0;



 fail:

	make_bad_inode(inode);

	unlock_new_inode(inode);

	iput(inode);

	jffs2_free_raw_inode(ri);

	return ret;
@@ -360,8 +363,8 @@ static int jffs2_symlink (struct inode *dir_i, struct dentry *dentry, const char 
		/* Eeek. Wave bye bye */

		mutex_unlock(&f->sem);

		jffs2_complete_reservation(c);

		jffs2_clear_inode(inode);

		return PTR_ERR(fn);

		ret = PTR_ERR(fn);

		goto fail;

	}



	/* We use f->target field to store the target path. */
@@ -370,8 +373,8 @@ static int jffs2_symlink (struct inode *dir_i, struct dentry *dentry, const char 
		printk(KERN_WARNING "Can't allocate %d bytes of memory\n", targetlen + 1);

		mutex_unlock(&f->sem);

		jffs2_complete_reservation(c);

		jffs2_clear_inode(inode);

		return -ENOMEM;

		ret = -ENOMEM;

		goto fail;

	}



	memcpy(f->target, target, targetlen + 1);
@@ -386,30 +389,24 @@ static int jffs2_symlink (struct inode *dir_i, struct dentry *dentry, const char 
	jffs2_complete_reservation(c);



	ret = jffs2_init_security(inode, dir_i);

	if (ret) {

		jffs2_clear_inode(inode);

		return ret;

	}

	if (ret)

		goto fail;



	ret = jffs2_init_acl_post(inode);

	if (ret) {

		jffs2_clear_inode(inode);

		return ret;

	}

	if (ret)

		goto fail;



	ret = jffs2_reserve_space(c, sizeof(*rd)+namelen, &alloclen,

				  ALLOC_NORMAL, JFFS2_SUMMARY_DIRENT_SIZE(namelen));

	if (ret) {

		/* Eep. */

		jffs2_clear_inode(inode);

		return ret;

	}

	if (ret)

		goto fail;



	rd = jffs2_alloc_raw_dirent();

	if (!rd) {

		/* Argh. Now we treat it like a normal delete */

		jffs2_complete_reservation(c);

		jffs2_clear_inode(inode);

		return -ENOMEM;

		ret = -ENOMEM;

		goto fail;

	}



	dir_f = JFFS2_INODE_INFO(dir_i);
@@ -437,8 +434,8 @@ static int jffs2_symlink (struct inode *dir_i, struct dentry *dentry, const char 
		jffs2_complete_reservation(c);

		jffs2_free_raw_dirent(rd);

		mutex_unlock(&dir_f->sem);

		jffs2_clear_inode(inode);

		return PTR_ERR(fd);

		ret = PTR_ERR(fd);

		goto fail;

	}



	dir_i->i_mtime = dir_i->i_ctime = ITIME(je32_to_cpu(rd->mctime));
@@ -453,7 +450,14 @@ static int jffs2_symlink (struct inode *dir_i, struct dentry *dentry, const char 
	jffs2_complete_reservation(c);



	d_instantiate(dentry, inode);

	unlock_new_inode(inode);

	return 0;



 fail:

	make_bad_inode(inode);

	unlock_new_inode(inode);

	iput(inode);

	return ret;

}
@@ -519,8 +523,8 @@ static int jffs2_mkdir (struct inode *dir_i, struct dentry *dentry, int mode) 
		/* Eeek. Wave bye bye */

		mutex_unlock(&f->sem);

		jffs2_complete_reservation(c);

		jffs2_clear_inode(inode);

		return PTR_ERR(fn);

		ret = PTR_ERR(fn);

		goto fail;

	}

	/* No data here. Only a metadata node, which will be

	   obsoleted by the first data write
@@ -531,30 +535,24 @@ static int jffs2_mkdir (struct inode *dir_i, struct dentry *dentry, int mode) 
	jffs2_complete_reservation(c);



	ret = jffs2_init_security(inode, dir_i);

	if (ret) {

		jffs2_clear_inode(inode);

		return ret;

	}

	if (ret)

		goto fail;



	ret = jffs2_init_acl_post(inode);

	if (ret) {

		jffs2_clear_inode(inode);

		return ret;

	}

	if (ret)

		goto fail;



	ret = jffs2_reserve_space(c, sizeof(*rd)+namelen, &alloclen,

				  ALLOC_NORMAL, JFFS2_SUMMARY_DIRENT_SIZE(namelen));

	if (ret) {

		/* Eep. */

		jffs2_clear_inode(inode);

		return ret;

	}

	if (ret)

		goto fail;



	rd = jffs2_alloc_raw_dirent();

	if (!rd) {

		/* Argh. Now we treat it like a normal delete */

		jffs2_complete_reservation(c);

		jffs2_clear_inode(inode);

		return -ENOMEM;

		ret = -ENOMEM;

		goto fail;

	}



	dir_f = JFFS2_INODE_INFO(dir_i);
@@ -582,8 +580,8 @@ static int jffs2_mkdir (struct inode *dir_i, struct dentry *dentry, int mode) 
		jffs2_complete_reservation(c);

		jffs2_free_raw_dirent(rd);

		mutex_unlock(&dir_f->sem);

		jffs2_clear_inode(inode);

		return PTR_ERR(fd);

		ret = PTR_ERR(fd);

		goto fail;

	}



	dir_i->i_mtime = dir_i->i_ctime = ITIME(je32_to_cpu(rd->mctime));
@@ -599,7 +597,14 @@ static int jffs2_mkdir (struct inode *dir_i, struct dentry *dentry, int mode) 
	jffs2_complete_reservation(c);



	d_instantiate(dentry, inode);

	unlock_new_inode(inode);

	return 0;



 fail:

	make_bad_inode(inode);

	unlock_new_inode(inode);

	iput(inode);

	return ret;

}



static int jffs2_rmdir (struct inode *dir_i, struct dentry *dentry)
@@ -693,8 +698,8 @@ static int jffs2_mknod (struct inode *dir_i, struct dentry *dentry, int mode, de 
		/* Eeek. Wave bye bye */

		mutex_unlock(&f->sem);

		jffs2_complete_reservation(c);

		jffs2_clear_inode(inode);

		return PTR_ERR(fn);

		ret = PTR_ERR(fn);

		goto fail;

	}

	/* No data here. Only a metadata node, which will be

	   obsoleted by the first data write
@@ -705,30 +710,24 @@ static int jffs2_mknod (struct inode *dir_i, struct dentry *dentry, int mode, de 
	jffs2_complete_reservation(c);



	ret = jffs2_init_security(inode, dir_i);

	if (ret) {

		jffs2_clear_inode(inode);

		return ret;

	}

	if (ret)

		goto fail;



	ret = jffs2_init_acl_post(inode);

	if (ret) {

		jffs2_clear_inode(inode);

		return ret;

	}

	if (ret)

		goto fail;



	ret = jffs2_reserve_space(c, sizeof(*rd)+namelen, &alloclen,

				  ALLOC_NORMAL, JFFS2_SUMMARY_DIRENT_SIZE(namelen));

	if (ret) {

		/* Eep. */

		jffs2_clear_inode(inode);

		return ret;

	}

	if (ret)

		goto fail;



	rd = jffs2_alloc_raw_dirent();

	if (!rd) {

		/* Argh. Now we treat it like a normal delete */

		jffs2_complete_reservation(c);

		jffs2_clear_inode(inode);

		return -ENOMEM;

		ret = -ENOMEM;

		goto fail;

	}



	dir_f = JFFS2_INODE_INFO(dir_i);
@@ -759,8 +758,8 @@ static int jffs2_mknod (struct inode *dir_i, struct dentry *dentry, int mode, de 
		jffs2_complete_reservation(c);

		jffs2_free_raw_dirent(rd);

		mutex_unlock(&dir_f->sem);

		jffs2_clear_inode(inode);

		return PTR_ERR(fd);

		ret = PTR_ERR(fd);

		goto fail;

	}



	dir_i->i_mtime = dir_i->i_ctime = ITIME(je32_to_cpu(rd->mctime));
@@ -775,8 +774,14 @@ static int jffs2_mknod (struct inode *dir_i, struct dentry *dentry, int mode, de 
	jffs2_complete_reservation(c);



	d_instantiate(dentry, inode);



	unlock_new_inode(inode);

	return 0;



 fail:

	make_bad_inode(inode);

	unlock_new_inode(inode);

	iput(inode);

	return ret;

}



static int jffs2_rename (struct inode *old_dir_i, struct dentry *old_dentry,