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

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

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

* 'i_nlink' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  hfs: fix rename() over non-empty directory
  udf: fix i_nlink limit
  fix reiserfs mkdir() breakage
  exofs: i_nlink races in rename()
  nilfs2: i_nlink races in rename()
  minix: i_nlink races in rename()
  ufs: i_nlink races in rename()
  sysv: i_nlink races in rename()
parents 4c7fd114 69102e9b

fs/exofs/namei.c

+2 −6
Original line number Diff line number Diff line
@@ -272,7 +272,6 @@ static int exofs_rename(struct inode *old_dir, struct dentry *old_dentry, 
		new_de = exofs_find_entry(new_dir, new_dentry, &new_page);

		if (!new_de)

			goto out_dir;

		inode_inc_link_count(old_inode);

		err = exofs_set_link(new_dir, new_de, new_page, old_inode);

		new_inode->i_ctime = CURRENT_TIME;

		if (dir_de)
@@ -286,12 +285,9 @@ static int exofs_rename(struct inode *old_dir, struct dentry *old_dentry, 
			if (new_dir->i_nlink >= EXOFS_LINK_MAX)

				goto out_dir;

		}

		inode_inc_link_count(old_inode);

		err = exofs_add_link(new_dentry, old_inode);

		if (err) {

			inode_dec_link_count(old_inode);

		if (err)

			goto out_dir;

		}

		if (dir_de)

			inode_inc_link_count(new_dir);

	}
@@ -299,7 +295,7 @@ static int exofs_rename(struct inode *old_dir, struct dentry *old_dentry, 
	old_inode->i_ctime = CURRENT_TIME;



	exofs_delete_entry(old_de, old_page);

	inode_dec_link_count(old_inode);

	mark_inode_dirty(old_inode);



	if (dir_de) {

		err = exofs_set_link(old_inode, dir_de, dir_page, new_dir);

fs/hfs/dir.c

+13 −37
Original line number Diff line number Diff line
@@ -238,46 +238,22 @@ static int hfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) 
}



/*

 * hfs_unlink()

 * hfs_remove()

 *

 * This is the unlink() entry in the inode_operations structure for

 * regular HFS directories.  The purpose is to delete an existing

 * file, given the inode for the parent directory and the name

 * (and its length) of the existing file.

 */

static int hfs_unlink(struct inode *dir, struct dentry *dentry)

{

	struct inode *inode;

	int res;



	inode = dentry->d_inode;

	res = hfs_cat_delete(inode->i_ino, dir, &dentry->d_name);

	if (res)

		return res;



	drop_nlink(inode);

	hfs_delete_inode(inode);

	inode->i_ctime = CURRENT_TIME_SEC;

	mark_inode_dirty(inode);



	return res;

}



/*

 * hfs_rmdir()

 * This serves as both unlink() and rmdir() in the inode_operations

 * structure for regular HFS directories.  The purpose is to delete

 * an existing child, given the inode for the parent directory and

 * the name (and its length) of the existing directory.

 *

 * This is the rmdir() entry in the inode_operations structure for

 * regular HFS directories.  The purpose is to delete an existing

 * directory, given the inode for the parent directory and the name

 * (and its length) of the existing directory.

 * HFS does not have hardlinks, so both rmdir and unlink set the

 * link count to 0.  The only difference is the emptiness check.

 */

static int hfs_rmdir(struct inode *dir, struct dentry *dentry)

static int hfs_remove(struct inode *dir, struct dentry *dentry)

{

	struct inode *inode;

	struct inode *inode = dentry->d_inode;

	int res;



	inode = dentry->d_inode;

	if (inode->i_size != 2)

	if (S_ISDIR(inode->i_mode) && inode->i_size != 2)

		return -ENOTEMPTY;

	res = hfs_cat_delete(inode->i_ino, dir, &dentry->d_name);

	if (res)
@@ -307,7 +283,7 @@ static int hfs_rename(struct inode *old_dir, struct dentry *old_dentry, 


	/* Unlink destination if it already exists */

	if (new_dentry->d_inode) {

		res = hfs_unlink(new_dir, new_dentry);

		res = hfs_remove(new_dir, new_dentry);

		if (res)

			return res;

	}
@@ -332,9 +308,9 @@ const struct file_operations hfs_dir_operations = { 
const struct inode_operations hfs_dir_inode_operations = {

	.create		= hfs_create,

	.lookup		= hfs_lookup,

	.unlink		= hfs_unlink,

	.unlink		= hfs_remove,

	.mkdir		= hfs_mkdir,

	.rmdir		= hfs_rmdir,

	.rmdir		= hfs_remove,

	.rename		= hfs_rename,

	.setattr	= hfs_inode_setattr,

};

fs/minix/namei.c

+2 −6
Original line number Diff line number Diff line
@@ -213,7 +213,6 @@ static int minix_rename(struct inode * old_dir, struct dentry *old_dentry, 
		new_de = minix_find_entry(new_dentry, &new_page);

		if (!new_de)

			goto out_dir;

		inode_inc_link_count(old_inode);

		minix_set_link(new_de, new_page, old_inode);

		new_inode->i_ctime = CURRENT_TIME_SEC;

		if (dir_de)
@@ -225,18 +224,15 @@ static int minix_rename(struct inode * old_dir, struct dentry *old_dentry, 
			if (new_dir->i_nlink >= info->s_link_max)

				goto out_dir;

		}

		inode_inc_link_count(old_inode);

		err = minix_add_link(new_dentry, old_inode);

		if (err) {

			inode_dec_link_count(old_inode);

		if (err)

			goto out_dir;

		}

		if (dir_de)

			inode_inc_link_count(new_dir);

	}



	minix_delete_entry(old_de, old_page);

	inode_dec_link_count(old_inode);

	mark_inode_dirty(old_inode);



	if (dir_de) {

		minix_set_link(dir_de, dir_page, new_dir);

fs/nilfs2/namei.c

+1 −7
Original line number Diff line number Diff line
@@ -397,7 +397,6 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
		new_de = nilfs_find_entry(new_dir, &new_dentry->d_name, &new_page);

		if (!new_de)

			goto out_dir;

		inc_nlink(old_inode);

		nilfs_set_link(new_dir, new_de, new_page, old_inode);

		nilfs_mark_inode_dirty(new_dir);

		new_inode->i_ctime = CURRENT_TIME;
@@ -411,13 +410,9 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
			if (new_dir->i_nlink >= NILFS_LINK_MAX)

				goto out_dir;

		}

		inc_nlink(old_inode);

		err = nilfs_add_link(new_dentry, old_inode);

		if (err) {

			drop_nlink(old_inode);

			nilfs_mark_inode_dirty(old_inode);

		if (err)

			goto out_dir;

		}

		if (dir_de) {

			inc_nlink(new_dir);

			nilfs_mark_inode_dirty(new_dir);
@@ -431,7 +426,6 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
	old_inode->i_ctime = CURRENT_TIME;



	nilfs_delete_entry(old_de, old_page);

	drop_nlink(old_inode);



	if (dir_de) {

		nilfs_set_link(old_inode, dir_de, dir_page, new_dir);

fs/reiserfs/namei.c

+1 −1
Original line number Diff line number Diff line
@@ -771,7 +771,7 @@ static int reiserfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) 
					EMPTY_DIR_SIZE_V1 : EMPTY_DIR_SIZE,

					dentry, inode, &security);

	if (retval) {

		dir->i_nlink--;

		DEC_DIR_INODE_NLINK(dir)

		goto out_failed;

	}