A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 19:21:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

fs: support RENAME_NOREPLACE for local filesystems

Browse source 
This is trivial to do:

 - add flags argument to foo_rename()
 - check if flags doesn't have any other than RENAME_NOREPLACE
 - assign foo_rename() to .rename2 instead of .rename

Filesystems converted:

affs, bfs, exofs, ext2, hfs, hfsplus, jffs2, jfs, logfs, minix, msdos,
nilfs2, omfs, reiserfs, sysvfs, ubifs, udf, ufs, vfat.

Signed-off-by: Miklos Szeredi <[email protected]>
Acked-by: Boaz Harrosh <[email protected]>
Acked-by: Richard Weinberger <[email protected]>
Acked-by: Bob Copeland <[email protected]>
Acked-by: Jan Kara <[email protected]>
Cc: Theodore Ts'o <[email protected]>
Cc: Jaegeuk Kim <[email protected]>
Cc: OGAWA Hirofumi <[email protected]>
Cc: Mikulas Patocka <[email protected]>
Cc: David Woodhouse <[email protected]>
Cc: Dave Kleikamp <[email protected]>
Cc: Ryusuke Konishi <[email protected]>
Cc: Christoph Hellwig <[email protected]>
This commit is contained in:
Miklos Szeredi 2016-09-27 11:03:57 +02:00
commit f03b8ad8d3
22 changed files with 123 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

8
fs/fat/namei_msdos.c
View file

@ -596,12 +596,16 @@ error_inode:
/***** Rename, a wrapper for rename_same_dir & rename_diff_dir */
static int msdos_rename(struct inode *old_dir, struct dentry *old_dentry,
struct inode *new_dir, struct dentry *new_dentry)
struct inode *new_dir, struct dentry *new_dentry,
unsigned int flags)
{
struct super_block *sb = old_dir->i_sb;
unsigned char old_msdos_name[MSDOS_NAME], new_msdos_name[MSDOS_NAME];
int err, is_hid;
if (flags & ~RENAME_NOREPLACE)
return -EINVAL;
mutex_lock(&MSDOS_SB(sb)->s_lock);
err = msdos_format_name(old_dentry->d_name.name,
@ -633,7 +637,7 @@ static const struct inode_operations msdos_dir_inode_operations = {
.unlink = msdos_unlink,
.mkdir = msdos_mkdir,
.rmdir = msdos_rmdir,
.rename = msdos_rename,
.rename2 = msdos_rename,
.setattr = fat_setattr,
.getattr = fat_getattr,
};

8
fs/fat/namei_vfat.c
View file

@ -903,7 +903,8 @@ out:
}
static int vfat_rename(struct inode *old_dir, struct dentry *old_dentry,
struct inode *new_dir, struct dentry *new_dentry)
struct inode *new_dir, struct dentry *new_dentry,
unsigned int flags)
{
struct buffer_head *dotdot_bh;
struct msdos_dir_entry *dotdot_de;
@ -914,6 +915,9 @@ static int vfat_rename(struct inode *old_dir, struct dentry *old_dentry,
int err, is_dir, update_dotdot, corrupt = 0;
struct super_block *sb = old_dir->i_sb;
if (flags & ~RENAME_NOREPLACE)
return -EINVAL;
old_sinfo.bh = sinfo.bh = dotdot_bh = NULL;
old_inode = d_inode(old_dentry);
new_inode = d_inode(new_dentry);
@ -1036,7 +1040,7 @@ static const struct inode_operations vfat_dir_inode_operations = {
.unlink = vfat_unlink,
.mkdir = vfat_mkdir,
.rmdir = vfat_rmdir,
.rename = vfat_rename,
.rename2 = vfat_rename,
.setattr = fat_setattr,
.getattr = fat_getattr,
};