This series gets rid of the duplicate interfaces for rename. The only difference between the two that the new, i_op->rename2() has an added flags argument. This needs to be handled in each instance. For 21 local filesystems the RENAME_NOREPLACE flag can be supported "for free", just by moving to the new interface and allowing this flag. The remaining 12 distributed filesystems are converted too, which only allow zero flags. Git tree is here. git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#rename2 Thanks, Miklos --- Miklos Szeredi (7): ncpfs: fix unused variable warning fs: support RENAME_NOREPLACE for local filesystems libfs: support RENAME_NOREPLACE in simple_rename() fs: make remaining filesystems use .rename2 vfs: remove unused i_op->rename fs: rename "rename2" i_op to "rename" vfs: add note about i_op->rename changes to porting Documentation/filesystems/Locking | 8 ++------ Documentation/filesystems/directory-locking | 2 +- Documentation/filesystems/porting | 4 ++++ Documentation/filesystems/vfs.txt | 9 ++------- drivers/staging/lustre/lustre/llite/namei.c | 8 ++++++-- fs/9p/v9fs.h | 3 ++- fs/9p/vfs_inode.c | 6 +++++- fs/affs/affs.h | 3 ++- fs/affs/namei.c | 6 +++++- fs/afs/dir.c | 9 +++++++-- fs/bad_inode.c | 2 +- fs/bfs/dir.c | 6 +++++- fs/btrfs/inode.c | 2 +- fs/cachefiles/namei.c | 3 +-- fs/ceph/dir.c | 6 +++++- fs/cifs/cifsfs.c | 2 +- fs/coda/dir.c | 6 +++++- fs/debugfs/inode.c | 2 +- fs/ecryptfs/inode.c | 6 +++++- fs/exofs/namei.c | 8 ++++++-- fs/ext2/namei.c | 6 +++++- fs/ext4/namei.c | 2 +- fs/f2fs/namei.c | 2 +- fs/fat/namei_msdos.c | 6 +++++- fs/fat/namei_vfat.c | 6 +++++- fs/fuse/dir.c | 2 +- fs/gfs2/inode.c | 2 +- fs/hfs/dir.c | 6 +++++- fs/hfsplus/dir.c | 6 +++++- fs/hostfs/hostfs_kern.c | 2 +- fs/hpfs/namei.c | 6 +++++- fs/jffs2/dir.c | 9 +++++++-- fs/jfs/namei.c | 5 ++++- fs/kernfs/dir.c | 6 +++++- fs/libfs.c | 6 +++++- fs/logfs/dir.c | 6 +++++- fs/minix/namei.c | 6 +++++- fs/namei.c | 15 +++------------ fs/ncpfs/dir.c | 11 +++++++---- fs/nfs/dir.c | 6 +++++- fs/nfs/internal.h | 3 ++- fs/nilfs2/namei.c | 6 +++++- fs/ocfs2/namei.c | 6 +++++- fs/omfs/dir.c | 6 +++++- fs/orangefs/namei.c | 6 +++++- fs/overlayfs/dir.c | 2 +- fs/overlayfs/overlayfs.h | 4 ++-- fs/reiserfs/namei.c | 6 +++++- fs/sysv/namei.c | 6 +++++- fs/ubifs/dir.c | 8 ++++++-- fs/udf/namei.c | 6 +++++- fs/ufs/namei.c | 6 +++++- fs/xfs/xfs_iops.c | 4 ++-- include/linux/fs.h | 5 ++--- mm/shmem.c | 2 +- security/tomoyo/realpath.c | 4 ++-- 56 files changed, 206 insertions(+), 91 deletions(-) -- 2.5.5 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html