mirror of
https://github.com/torvalds/linux.git
synced 2024-10-25 06:31:06 +00:00
ksmbd: Change the return value of ksmbd_vfs_query_maximal_access to void
The return value of ksmbd_vfs_query_maximal_access is meaningless, it is better to modify it to void. Signed-off-by: Lu Hongfei <luhongfei@vivo.com> Acked-by: Namjae Jeon <linkinjeon@kernel.org> Signed-off-by: Steve French <stfrench@microsoft.com>
This commit is contained in:
parent
cf5e7f734f
commit
ccb5889af9
|
@ -2872,11 +2872,9 @@ int smb2_open(struct ksmbd_work *work)
|
|||
if (!file_present) {
|
||||
daccess = cpu_to_le32(GENERIC_ALL_FLAGS);
|
||||
} else {
|
||||
rc = ksmbd_vfs_query_maximal_access(idmap,
|
||||
ksmbd_vfs_query_maximal_access(idmap,
|
||||
path.dentry,
|
||||
&daccess);
|
||||
if (rc)
|
||||
goto err_out;
|
||||
already_permitted = true;
|
||||
}
|
||||
maximal_access = daccess;
|
||||
|
|
|
@ -121,11 +121,9 @@ err_out:
|
|||
return -ENOENT;
|
||||
}
|
||||
|
||||
int ksmbd_vfs_query_maximal_access(struct mnt_idmap *idmap,
|
||||
void ksmbd_vfs_query_maximal_access(struct mnt_idmap *idmap,
|
||||
struct dentry *dentry, __le32 *daccess)
|
||||
{
|
||||
int ret = 0;
|
||||
|
||||
*daccess = cpu_to_le32(FILE_READ_ATTRIBUTES | READ_CONTROL);
|
||||
|
||||
if (!inode_permission(idmap, d_inode(dentry), MAY_OPEN | MAY_WRITE))
|
||||
|
@ -142,8 +140,6 @@ int ksmbd_vfs_query_maximal_access(struct mnt_idmap *idmap,
|
|||
|
||||
if (!inode_permission(idmap, d_inode(dentry->d_parent), MAY_EXEC | MAY_WRITE))
|
||||
*daccess |= FILE_DELETE_LE;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -72,7 +72,7 @@ struct ksmbd_kstat {
|
|||
};
|
||||
|
||||
int ksmbd_vfs_lock_parent(struct dentry *parent, struct dentry *child);
|
||||
int ksmbd_vfs_query_maximal_access(struct mnt_idmap *idmap,
|
||||
void ksmbd_vfs_query_maximal_access(struct mnt_idmap *idmap,
|
||||
struct dentry *dentry, __le32 *daccess);
|
||||
int ksmbd_vfs_create(struct ksmbd_work *work, const char *name, umode_t mode);
|
||||
int ksmbd_vfs_mkdir(struct ksmbd_work *work, const char *name, umode_t mode);
|
||||
|
|
Loading…
Reference in New Issue
Block a user