Commit 32e51f14 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-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (25 commits)
  cifs: remove unnecessary dentry_unhash on rmdir/rename_dir
  ocfs2: remove unnecessary dentry_unhash on rmdir/rename_dir
  exofs: remove unnecessary dentry_unhash on rmdir/rename_dir
  nfs: remove unnecessary dentry_unhash on rmdir/rename_dir
  ext2: remove unnecessary dentry_unhash on rmdir/rename_dir
  ext3: remove unnecessary dentry_unhash on rmdir/rename_dir
  ext4: remove unnecessary dentry_unhash on rmdir/rename_dir
  btrfs: remove unnecessary dentry_unhash in rmdir/rename_dir
  ceph: remove unnecessary dentry_unhash calls
  vfs: clean up vfs_rename_other
  vfs: clean up vfs_rename_dir
  vfs: clean up vfs_rmdir
  vfs: fix vfs_rename_dir for FS_RENAME_DOES_D_MOVE filesystems
  libfs: drop unneeded dentry_unhash
  vfs: update dentry_unhash() comment
  vfs: push dentry_unhash on rename_dir into file systems
  vfs: push dentry_unhash on rmdir into file systems
  vfs: remove dget() from dentry_unhash()
  vfs: dentry_unhash immediately prior to rmdir
  vfs: Block mmapped writes while the fs is frozen
  ...
parents ca16d140 b6ff24a3

fs/9p/vfs_inode.c

+4 −0
Original line number Diff line number Diff line
@@ -814,6 +814,7 @@ int v9fs_vfs_unlink(struct inode *i, struct dentry *d) 


int v9fs_vfs_rmdir(struct inode *i, struct dentry *d)

{

	dentry_unhash(d);

	return v9fs_remove(i, d, 1);

}
@@ -839,6 +840,9 @@ v9fs_vfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
	struct p9_fid *newdirfid;

	struct p9_wstat wstat;



	if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode))

		dentry_unhash(new_dentry);



	P9_DPRINTK(P9_DEBUG_VFS, "\n");

	retval = 0;

	old_inode = old_dentry->d_inode;

fs/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ config FS_POSIX_ACL 
	def_bool n



config EXPORTFS

	bool

	tristate



config FILE_LOCKING

	bool "Enable POSIX file locking API" if EXPERT

fs/affs/namei.c

+5 −0
Original line number Diff line number Diff line
@@ -320,6 +320,8 @@ affs_rmdir(struct inode *dir, struct dentry *dentry) 
		 dentry->d_inode->i_ino,

		 (int)dentry->d_name.len, dentry->d_name.name);



	dentry_unhash(dentry);



	return affs_remove_header(dentry);

}
@@ -417,6 +419,9 @@ affs_rename(struct inode *old_dir, struct dentry *old_dentry, 
	struct buffer_head *bh = NULL;

	int retval;



	if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode))

		dentry_unhash(new_dentry);



	pr_debug("AFFS: rename(old=%u,\"%*s\" to new=%u,\"%*s\")\n",

		 (u32)old_dir->i_ino, (int)old_dentry->d_name.len, old_dentry->d_name.name,

		 (u32)new_dir->i_ino, (int)new_dentry->d_name.len, new_dentry->d_name.name);

fs/afs/dir.c

+5 −0
Original line number Diff line number Diff line
@@ -845,6 +845,8 @@ static int afs_rmdir(struct inode *dir, struct dentry *dentry) 
	_enter("{%x:%u},{%s}",

	       dvnode->fid.vid, dvnode->fid.vnode, dentry->d_name.name);



	dentry_unhash(dentry);



	ret = -ENAMETOOLONG;

	if (dentry->d_name.len >= AFSNAMEMAX)

		goto error;
@@ -1146,6 +1148,9 @@ static int afs_rename(struct inode *old_dir, struct dentry *old_dentry, 
	struct key *key;

	int ret;



	if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode))

		dentry_unhash(new_dentry);



	vnode = AFS_FS_I(old_dentry->d_inode);

	orig_dvnode = AFS_FS_I(old_dir);

	new_dvnode = AFS_FS_I(new_dir);

fs/autofs4/root.c

+2 −0
Original line number Diff line number Diff line
@@ -583,6 +583,8 @@ static int autofs4_dir_unlink(struct inode *dir, struct dentry *dentry) 
	if (!autofs4_oz_mode(sbi) && !capable(CAP_SYS_ADMIN))

		return -EACCES;



	dentry_unhash(dentry);



	if (atomic_dec_and_test(&ino->count)) {

		p_ino = autofs4_dentry_ino(dentry->d_parent);

		if (p_ino && dentry->d_parent != dentry)

CRA Git | Maintained and supported by SUSTech CRA and CCSE