mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 16:49:22 +00:00
cifsd: make alignment match open parenthesis
checkpatch.pl complains as the following: Alignment should match open parenthesis. Signed-off-by: Hyunchul Lee <hyc.lee@gmail.com> Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com> Signed-off-by: Steve French <stfrench@microsoft.com>
This commit is contained in:
parent
40c594b647
commit
d7e5852b4d
7 changed files with 21 additions and 20 deletions
|
@ -227,7 +227,7 @@ void init_smb3_0_server(struct ksmbd_conn *conn)
|
||||||
conn->vals->capabilities |= SMB2_GLOBAL_CAP_LEASING;
|
conn->vals->capabilities |= SMB2_GLOBAL_CAP_LEASING;
|
||||||
|
|
||||||
if (server_conf.flags & KSMBD_GLOBAL_FLAG_SMB2_ENCRYPTION &&
|
if (server_conf.flags & KSMBD_GLOBAL_FLAG_SMB2_ENCRYPTION &&
|
||||||
conn->cli_cap & SMB2_GLOBAL_CAP_ENCRYPTION)
|
conn->cli_cap & SMB2_GLOBAL_CAP_ENCRYPTION)
|
||||||
conn->vals->capabilities |= SMB2_GLOBAL_CAP_ENCRYPTION;
|
conn->vals->capabilities |= SMB2_GLOBAL_CAP_ENCRYPTION;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -560,7 +560,7 @@ int smb2_allocate_rsp_buf(struct ksmbd_work *work)
|
||||||
sz = large_sz;
|
sz = large_sz;
|
||||||
|
|
||||||
if (server_conf.flags & KSMBD_GLOBAL_FLAG_CACHE_TBUF &&
|
if (server_conf.flags & KSMBD_GLOBAL_FLAG_CACHE_TBUF &&
|
||||||
work->set_trans_buf)
|
work->set_trans_buf)
|
||||||
work->response_buf = ksmbd_find_buffer(sz);
|
work->response_buf = ksmbd_find_buffer(sz);
|
||||||
else
|
else
|
||||||
work->response_buf = kvmalloc(sz, GFP_KERNEL | __GFP_ZERO);
|
work->response_buf = kvmalloc(sz, GFP_KERNEL | __GFP_ZERO);
|
||||||
|
|
|
@ -1623,10 +1623,10 @@ void smb2_set_sign_rsp(struct ksmbd_work *work);
|
||||||
int smb3_check_sign_req(struct ksmbd_work *work);
|
int smb3_check_sign_req(struct ksmbd_work *work);
|
||||||
void smb3_set_sign_rsp(struct ksmbd_work *work);
|
void smb3_set_sign_rsp(struct ksmbd_work *work);
|
||||||
int find_matching_smb2_dialect(int start_index, __le16 *cli_dialects,
|
int find_matching_smb2_dialect(int start_index, __le16 *cli_dialects,
|
||||||
__le16 dialects_count);
|
__le16 dialects_count);
|
||||||
struct file_lock *smb_flock_init(struct file *f);
|
struct file_lock *smb_flock_init(struct file *f);
|
||||||
int setup_async_work(struct ksmbd_work *work, void (*fn)(void **),
|
int setup_async_work(struct ksmbd_work *work, void (*fn)(void **),
|
||||||
void **arg);
|
void **arg);
|
||||||
void smb2_send_interim_resp(struct ksmbd_work *work, __le32 status);
|
void smb2_send_interim_resp(struct ksmbd_work *work, __le32 status);
|
||||||
struct channel *lookup_chann_list(struct ksmbd_session *sess);
|
struct channel *lookup_chann_list(struct ksmbd_session *sess);
|
||||||
void smb3_preauth_hash_rsp(struct ksmbd_work *work);
|
void smb3_preauth_hash_rsp(struct ksmbd_work *work);
|
||||||
|
|
|
@ -180,22 +180,23 @@ struct posix_acl_state {
|
||||||
};
|
};
|
||||||
|
|
||||||
int parse_sec_desc(struct smb_ntsd *pntsd, int acl_len,
|
int parse_sec_desc(struct smb_ntsd *pntsd, int acl_len,
|
||||||
struct smb_fattr *fattr);
|
struct smb_fattr *fattr);
|
||||||
int build_sec_desc(struct smb_ntsd *pntsd, struct smb_ntsd *ppntsd,
|
int build_sec_desc(struct smb_ntsd *pntsd, struct smb_ntsd *ppntsd,
|
||||||
int addition_info, __u32 *secdesclen, struct smb_fattr *fattr);
|
int addition_info, __u32 *secdesclen,
|
||||||
|
struct smb_fattr *fattr);
|
||||||
int init_acl_state(struct posix_acl_state *state, int cnt);
|
int init_acl_state(struct posix_acl_state *state, int cnt);
|
||||||
void free_acl_state(struct posix_acl_state *state);
|
void free_acl_state(struct posix_acl_state *state);
|
||||||
void posix_state_to_acl(struct posix_acl_state *state,
|
void posix_state_to_acl(struct posix_acl_state *state,
|
||||||
struct posix_acl_entry *pace);
|
struct posix_acl_entry *pace);
|
||||||
int compare_sids(const struct smb_sid *ctsid, const struct smb_sid *cwsid);
|
int compare_sids(const struct smb_sid *ctsid, const struct smb_sid *cwsid);
|
||||||
bool smb_inherit_flags(int flags, bool is_dir);
|
bool smb_inherit_flags(int flags, bool is_dir);
|
||||||
int smb_inherit_dacl(struct ksmbd_conn *conn, struct dentry *dentry,
|
int smb_inherit_dacl(struct ksmbd_conn *conn, struct dentry *dentry,
|
||||||
unsigned int uid, unsigned int gid);
|
unsigned int uid, unsigned int gid);
|
||||||
int smb_check_perm_dacl(struct ksmbd_conn *conn, struct dentry *dentry,
|
int smb_check_perm_dacl(struct ksmbd_conn *conn, struct dentry *dentry,
|
||||||
__le32 *pdaccess, int uid);
|
__le32 *pdaccess, int uid);
|
||||||
int set_info_sec(struct ksmbd_conn *conn, struct ksmbd_tree_connect *tcon,
|
int set_info_sec(struct ksmbd_conn *conn, struct ksmbd_tree_connect *tcon,
|
||||||
struct dentry *dentry, struct smb_ntsd *pntsd, int ntsd_len,
|
struct dentry *dentry, struct smb_ntsd *pntsd, int ntsd_len,
|
||||||
bool type_check);
|
bool type_check);
|
||||||
void id_to_sid(unsigned int cid, uint sidtype, struct smb_sid *ssid);
|
void id_to_sid(unsigned int cid, uint sidtype, struct smb_sid *ssid);
|
||||||
void ksmbd_init_domain(u32 *sub_auth);
|
void ksmbd_init_domain(u32 *sub_auth);
|
||||||
#endif /* _SMBACL_H */
|
#endif /* _SMBACL_H */
|
||||||
|
|
|
@ -20,9 +20,9 @@ struct sockaddr;
|
||||||
|
|
||||||
struct ksmbd_tree_connect_response *
|
struct ksmbd_tree_connect_response *
|
||||||
ksmbd_ipc_tree_connect_request(struct ksmbd_session *sess,
|
ksmbd_ipc_tree_connect_request(struct ksmbd_session *sess,
|
||||||
struct ksmbd_share_config *share,
|
struct ksmbd_share_config *share,
|
||||||
struct ksmbd_tree_connect *tree_conn,
|
struct ksmbd_tree_connect *tree_conn,
|
||||||
struct sockaddr *peer_addr);
|
struct sockaddr *peer_addr);
|
||||||
int ksmbd_ipc_tree_disconnect_request(unsigned long long session_id,
|
int ksmbd_ipc_tree_disconnect_request(unsigned long long session_id,
|
||||||
unsigned long long connect_id);
|
unsigned long long connect_id);
|
||||||
int ksmbd_ipc_logout_request(const char *account);
|
int ksmbd_ipc_logout_request(const char *account);
|
||||||
|
|
|
@ -423,10 +423,10 @@ static int create_socket(struct interface *iface)
|
||||||
ksmbd_tcp_reuseaddr(ksmbd_socket);
|
ksmbd_tcp_reuseaddr(ksmbd_socket);
|
||||||
|
|
||||||
ret = sock_setsockopt(ksmbd_socket,
|
ret = sock_setsockopt(ksmbd_socket,
|
||||||
SOL_SOCKET,
|
SOL_SOCKET,
|
||||||
SO_BINDTODEVICE,
|
SO_BINDTODEVICE,
|
||||||
KERNEL_SOCKPTR(iface->name),
|
KERNEL_SOCKPTR(iface->name),
|
||||||
strlen(iface->name));
|
strlen(iface->name));
|
||||||
if (ret != -ENODEV && ret < 0) {
|
if (ret != -ENODEV && ret < 0) {
|
||||||
ksmbd_err("Failed to set SO_BINDTODEVICE: %d\n", ret);
|
ksmbd_err("Failed to set SO_BINDTODEVICE: %d\n", ret);
|
||||||
goto out_error;
|
goto out_error;
|
||||||
|
|
|
@ -934,8 +934,8 @@ ssize_t ksmbd_vfs_getxattr(struct dentry *dentry, char *xattr_name,
|
||||||
if (!buf)
|
if (!buf)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
xattr_len = vfs_getxattr(&init_user_ns, dentry, xattr_name, (void *)buf,
|
xattr_len = vfs_getxattr(&init_user_ns, dentry, xattr_name,
|
||||||
xattr_len);
|
(void *)buf, xattr_len);
|
||||||
if (xattr_len > 0)
|
if (xattr_len > 0)
|
||||||
*xattr_buf = buf;
|
*xattr_buf = buf;
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue