diff options
| -rw-r--r-- | fs/smb/client/cifsglob.h | 5 | ||||
| -rw-r--r-- | fs/smb/client/reparse.c | 5 | 
2 files changed, 3 insertions, 7 deletions
| diff --git a/fs/smb/client/cifsglob.h b/fs/smb/client/cifsglob.h index 49ffc040f736..63f23a845e15 100644 --- a/fs/smb/client/cifsglob.h +++ b/fs/smb/client/cifsglob.h @@ -226,10 +226,7 @@ struct cifs_open_info_data {  			struct kvec iov;  		} io;  		__u32 tag; -		union { -			struct reparse_data_buffer *buf; -			struct reparse_posix_data *posix; -		}; +		struct reparse_data_buffer *buf;  	} reparse;  	struct {  		__u8		eas[SMB2_WSL_MAX_QUERY_EA_RESP_SIZE]; diff --git a/fs/smb/client/reparse.c b/fs/smb/client/reparse.c index 0e47b8e097a0..77f891f718c0 100644 --- a/fs/smb/client/reparse.c +++ b/fs/smb/client/reparse.c @@ -294,7 +294,7 @@ static int mknod_nfs(unsigned int xid, struct inode *inode,  	data = (struct cifs_open_info_data) {  		.reparse_point = true, -		.reparse = { .tag = IO_REPARSE_TAG_NFS, .posix = p, }, +		.reparse = { .tag = IO_REPARSE_TAG_NFS, .buf = (struct reparse_data_buffer *)p, },  	};  	new = smb2_get_reparse_inode(&data, inode->i_sb, xid, @@ -816,8 +816,7 @@ static bool posix_reparse_to_fattr(struct cifs_sb_info *cifs_sb,  				   struct cifs_fattr *fattr,  				   struct cifs_open_info_data *data)  { -	struct reparse_posix_data *buf = data->reparse.posix; - +	struct reparse_posix_data *buf = (struct reparse_posix_data *)data->reparse.buf;  	if (buf == NULL)  		return true; | 
