Merge tag 'xfs-6.9-merge-8' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[sfrench/cifs-2.6.git] / mm / shmem.c

diff --git a/mm/shmem.c b/mm/shmem.c
index cf36899264188f5581265f31626f6df4bb9e5381..be890844fc92a61c7dc0d6bf3c3eba557d4eb322 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -3407,7 +3407,7 @@ static int shmem_unlink(struct inode *dir, struct dentry *dentry)
 
 static int shmem_rmdir(struct inode *dir, struct dentry *dentry)
 {
-       if (!simple_empty(dentry))
+       if (!simple_offset_empty(dentry))
                return -ENOTEMPTY;
 
        drop_nlink(d_inode(dentry));
@@ -3464,7 +3464,7 @@ static int shmem_rename2(struct mnt_idmap *idmap,
                return simple_offset_rename_exchange(old_dir, old_dentry,
                                                     new_dir, new_dentry);
 
-       if (!simple_empty(new_dentry))
+       if (!simple_offset_empty(new_dentry))
                return -ENOTEMPTY;
 
        if (flags & RENAME_WHITEOUT) {
@@ -4388,7 +4388,9 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc)
 #ifdef CONFIG_TMPFS_POSIX_ACL
        sb->s_flags |= SB_POSIXACL;
 #endif
-       uuid_gen(&sb->s_uuid);
+       uuid_t uuid;
+       uuid_gen(&uuid);
+       super_set_uuid(sb, uuid.b, sizeof(uuid));
 
 #ifdef CONFIG_TMPFS_QUOTA
        if (ctx->seen & SHMEM_SEEN_QUOTA) {