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

Commit e19c29e8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  qnx4: don't leak ->BitMap on late failure exits
  qnx4: reduce the insane nesting in qnx4_checkroot()
  qnx4: di_fname is an array, for crying out loud...
  vfs: remove printk from set_nlink()
  wake up s_wait_unfrozen when ->freeze_fs fails
parents afd29094 8bc5191b

fs/inode.c

+0 −3
Original line number Diff line number Diff line
@@ -322,9 +322,6 @@ EXPORT_SYMBOL(clear_nlink); 
void set_nlink(struct inode *inode, unsigned int nlink)

{

	if (!nlink) {

		printk_ratelimited(KERN_INFO

			"set_nlink() clearing i_nlink on %s inode %li\n",

			inode->i_sb->s_type->name, inode->i_ino);

		clear_nlink(inode);

	} else {

		/* Yes, some filesystems do change nlink from zero to one */

fs/qnx4/inode.c

+25 −37
Original line number Diff line number Diff line
@@ -179,48 +179,34 @@ static const char *qnx4_checkroot(struct super_block *sb) 
	struct qnx4_inode_entry *rootdir;

	int rd, rl;

	int i, j;

	int found = 0;



	if (*(qnx4_sb(sb)->sb->RootDir.di_fname) != '/') {

	if (*(qnx4_sb(sb)->sb->RootDir.di_fname) != '/')

		return "no qnx4 filesystem (no root dir).";

	} else {

	QNX4DEBUG((KERN_NOTICE "QNX4 filesystem found on dev %s.\n", sb->s_id));

	rd = le32_to_cpu(qnx4_sb(sb)->sb->RootDir.di_first_xtnt.xtnt_blk) - 1;

	rl = le32_to_cpu(qnx4_sb(sb)->sb->RootDir.di_first_xtnt.xtnt_size);

	for (j = 0; j < rl; j++) {

		bh = sb_bread(sb, rd + j);	/* root dir, first block */

			if (bh == NULL) {

		if (bh == NULL)

			return "unable to read root entry.";

			}

			for (i = 0; i < QNX4_INODES_PER_BLOCK; i++) {

				rootdir = (struct qnx4_inode_entry *) (bh->b_data + i * QNX4_DIR_ENTRY_SIZE);

				if (rootdir->di_fname != NULL) {

		rootdir = (struct qnx4_inode_entry *) bh->b_data;

		for (i = 0; i < QNX4_INODES_PER_BLOCK; i++, rootdir++) {

			QNX4DEBUG((KERN_INFO "rootdir entry found : [%s]\n", rootdir->di_fname));

					if (!strcmp(rootdir->di_fname,

						    QNX4_BMNAME)) {

						found = 1;

			if (strcmp(rootdir->di_fname, QNX4_BMNAME) != 0)

				continue;

			qnx4_sb(sb)->BitMap = kmemdup(rootdir,

						      sizeof(struct qnx4_inode_entry),

						      GFP_KERNEL);

						if (!qnx4_sb(sb)->BitMap) {

			brelse(bh);

			if (!qnx4_sb(sb)->BitMap)

				return "not enough memory for bitmap inode";

						}/* keep bitmap inode known */

						break;

					}

				}

			/* keep bitmap inode known */

			return NULL;

		}

		brelse(bh);

			if (found != 0) {

				break;

	}

		}

		if (found == 0) {

	return "bitmap file not found.";

}

	}

	return NULL;

}



static int qnx4_fill_super(struct super_block *s, void *data, int silent)

{
@@ -270,7 +256,7 @@ static int qnx4_fill_super(struct super_block *s, void *data, int silent) 
	if (IS_ERR(root)) {

		printk(KERN_ERR "qnx4: get inode failed\n");

		ret = PTR_ERR(root);

 		goto out;

 		goto outb;

 	}



	ret = -ENOMEM;
@@ -283,6 +269,8 @@ static int qnx4_fill_super(struct super_block *s, void *data, int silent) 


      outi:

	iput(root);

      outb:

	kfree(qs->BitMap);

      out:

	brelse(bh);

      outnobh:

fs/super.c

+2 −0
Original line number Diff line number Diff line
@@ -1186,6 +1186,8 @@ int freeze_super(struct super_block *sb) 
			printk(KERN_ERR

				"VFS:Filesystem freeze failed\n");

			sb->s_frozen = SB_UNFROZEN;

			smp_wmb();

			wake_up(&sb->s_wait_unfrozen);

			deactivate_locked_super(sb);

			return ret;

		}