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

[cascardo/linux.git] / Documentation / filesystems / Locking

diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking
index f56b39e..14cdc10 100644 (file)
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
@@ -51,8 +51,6 @@ prototypes:
        int (*rmdir) (struct inode *,struct dentry *);
        int (*mknod) (struct inode *,struct dentry *,umode_t,dev_t);
        int (*rename) (struct inode *, struct dentry *,
        int (*rmdir) (struct inode *,struct dentry *);
        int (*mknod) (struct inode *,struct dentry *,umode_t,dev_t);
        int (*rename) (struct inode *, struct dentry *,

-                       struct inode *, struct dentry *);
-       int (*rename2) (struct inode *, struct dentry *,

                        struct inode *, struct dentry *, unsigned int);
        int (*readlink) (struct dentry *, char __user *,int);
        const char *(*get_link) (struct dentry *, struct inode *, void **);
                        struct inode *, struct dentry *, unsigned int);
        int (*readlink) (struct dentry *, char __user *,int);
        const char *(*get_link) (struct dentry *, struct inode *, void **);


@@ -80,8 +78,7 @@ symlink:      yes
 mkdir:         yes
 unlink:                yes (both)
 rmdir:         yes (both)      (see below)
 mkdir:         yes
 unlink:                yes (both)
 rmdir:         yes (both)      (see below)

-rename:                yes (all)       (see below)
-rename2:       yes (all)       (see below)
+rename:        yes (all)       (see below)

 readlink:      no
 get_link:      no
 setattr:       yes
 readlink:      no
 get_link:      no
 setattr:       yes


@@ -97,8 +94,7 @@ tmpfile:      no
 
        Additionally, ->rmdir(), ->unlink() and ->rename() have ->i_mutex on
 victim.
 
        Additionally, ->rmdir(), ->unlink() and ->rename() have ->i_mutex on
 victim.

-       cross-directory ->rename() and rename2() has (per-superblock)
-->s_vfs_rename_sem.
+       cross-directory ->rename() has (per-superblock) ->s_vfs_rename_sem.

 
 See Documentation/filesystems/directory-locking for more detailed discussion
 of the locking scheme for directory operations.
 
 See Documentation/filesystems/directory-locking for more detailed discussion
 of the locking scheme for directory operations.