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

Commit 36947a76 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: (36 commits)
  Cache xattr security drop check for write v2
  fs: block_page_mkwrite should wait for writeback to finish
  mm: Wait for writeback when grabbing pages to begin a write
  configfs: remove unnecessary dentry_unhash on rmdir, dir rename
  fat: remove unnecessary dentry_unhash on rmdir, dir rename
  hpfs: remove unnecessary dentry_unhash on rmdir, dir rename
  minix: remove unnecessary dentry_unhash on rmdir, dir rename
  fuse: remove unnecessary dentry_unhash on rmdir, dir rename
  coda: remove unnecessary dentry_unhash on rmdir, dir rename
  afs: remove unnecessary dentry_unhash on rmdir, dir rename
  affs: remove unnecessary dentry_unhash on rmdir, dir rename
  9p: remove unnecessary dentry_unhash on rmdir, dir rename
  ncpfs: fix rename over directory with dangling references
  ncpfs: document dentry_unhash usage
  ecryptfs: remove unnecessary dentry_unhash on rmdir, dir rename
  hostfs: remove unnecessary dentry_unhash on rmdir, dir rename
  hfsplus: remove unnecessary dentry_unhash on rmdir, dir rename
  hfs: remove unnecessary dentry_unhash on rmdir, dir rename
  omfs: remove unnecessary dentry_unhash on rmdir, dir rneame
  udf: remove unnecessary dentry_unhash from rmdir, dir rename
  ...
parents a947e23a 69b45732

Documentation/filesystems/Locking

+2 −2
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ of the locking scheme for directory operations. 
prototypes:

	struct inode *(*alloc_inode)(struct super_block *sb);

	void (*destroy_inode)(struct inode *);

	void (*dirty_inode) (struct inode *);

	void (*dirty_inode) (struct inode *, int flags);

	int (*write_inode) (struct inode *, struct writeback_control *wbc);

	int (*drop_inode) (struct inode *);

	void (*evict_inode) (struct inode *);
@@ -126,7 +126,7 @@ locking rules: 
			s_umount

alloc_inode:

destroy_inode:

dirty_inode:				(must not sleep)

dirty_inode:

write_inode:

drop_inode:				!!!inode->i_lock!!!

evict_inode:

Documentation/filesystems/vfs.txt

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ struct super_operations { 
        struct inode *(*alloc_inode)(struct super_block *sb);

        void (*destroy_inode)(struct inode *);



        void (*dirty_inode) (struct inode *);

        void (*dirty_inode) (struct inode *, int flags);

        int (*write_inode) (struct inode *, int);

        void (*drop_inode) (struct inode *);

        void (*delete_inode) (struct inode *);

fs/9p/vfs_inode.c

+0 −4
Original line number Diff line number Diff line
@@ -814,7 +814,6 @@ 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);

}
@@ -840,9 +839,6 @@ 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/affs/namei.c

+0 −5
Original line number Diff line number Diff line
@@ -320,8 +320,6 @@ 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);

}
@@ -419,9 +417,6 @@ 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

+0 −5
Original line number Diff line number Diff line
@@ -845,8 +845,6 @@ 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;
@@ -1148,9 +1146,6 @@ 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);