Commit ccb5889a authored by Lu Hongfei's avatar Lu Hongfei Committed by Steve French

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: default avatarLu Hongfei <luhongfei@vivo.com>
Acked-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent cf5e7f73
...@@ -2872,11 +2872,9 @@ int smb2_open(struct ksmbd_work *work) ...@@ -2872,11 +2872,9 @@ int smb2_open(struct ksmbd_work *work)
if (!file_present) { if (!file_present) {
daccess = cpu_to_le32(GENERIC_ALL_FLAGS); daccess = cpu_to_le32(GENERIC_ALL_FLAGS);
} else { } else {
rc = ksmbd_vfs_query_maximal_access(idmap, ksmbd_vfs_query_maximal_access(idmap,
path.dentry, path.dentry,
&daccess); &daccess);
if (rc)
goto err_out;
already_permitted = true; already_permitted = true;
} }
maximal_access = daccess; maximal_access = daccess;
......
...@@ -121,11 +121,9 @@ static int ksmbd_vfs_path_lookup_locked(struct ksmbd_share_config *share_conf, ...@@ -121,11 +121,9 @@ static int ksmbd_vfs_path_lookup_locked(struct ksmbd_share_config *share_conf,
return -ENOENT; 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) struct dentry *dentry, __le32 *daccess)
{ {
int ret = 0;
*daccess = cpu_to_le32(FILE_READ_ATTRIBUTES | READ_CONTROL); *daccess = cpu_to_le32(FILE_READ_ATTRIBUTES | READ_CONTROL);
if (!inode_permission(idmap, d_inode(dentry), MAY_OPEN | MAY_WRITE)) 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, ...@@ -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)) if (!inode_permission(idmap, d_inode(dentry->d_parent), MAY_EXEC | MAY_WRITE))
*daccess |= FILE_DELETE_LE; *daccess |= FILE_DELETE_LE;
return ret;
} }
/** /**
......
...@@ -72,7 +72,7 @@ struct ksmbd_kstat { ...@@ -72,7 +72,7 @@ struct ksmbd_kstat {
}; };
int ksmbd_vfs_lock_parent(struct dentry *parent, struct dentry *child); 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); struct dentry *dentry, __le32 *daccess);
int ksmbd_vfs_create(struct ksmbd_work *work, const char *name, umode_t mode); 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); int ksmbd_vfs_mkdir(struct ksmbd_work *work, const char *name, umode_t mode);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment