Commit 0a2b36e6 authored by Petr Vandrovec's avatar Petr Vandrovec

Remove unneeded server_file_handle and open_create_action property from ncpfs info structures.

parent 450b21d1
...@@ -111,7 +111,6 @@ void ncp_update_inode(struct inode *inode, struct ncp_entry_info *nwinfo) ...@@ -111,7 +111,6 @@ void ncp_update_inode(struct inode *inode, struct ncp_entry_info *nwinfo)
NCP_FINFO(inode)->nwattr = nwinfo->i.attributes; NCP_FINFO(inode)->nwattr = nwinfo->i.attributes;
#endif #endif
NCP_FINFO(inode)->access = nwinfo->access; NCP_FINFO(inode)->access = nwinfo->access;
NCP_FINFO(inode)->server_file_handle = nwinfo->server_file_handle;
memcpy(NCP_FINFO(inode)->file_handle, nwinfo->file_handle, memcpy(NCP_FINFO(inode)->file_handle, nwinfo->file_handle,
sizeof(nwinfo->file_handle)); sizeof(nwinfo->file_handle));
DPRINTK("ncp_update_inode: updated %s, volnum=%d, dirent=%u\n", DPRINTK("ncp_update_inode: updated %s, volnum=%d, dirent=%u\n",
......
...@@ -606,12 +606,10 @@ int ncp_open_create_file_or_subdir(struct ncp_server *server, ...@@ -606,12 +606,10 @@ int ncp_open_create_file_or_subdir(struct ncp_server *server,
goto out; goto out;
if (!(create_attributes & aDIR)) if (!(create_attributes & aDIR))
target->opened = 1; target->opened = 1;
target->server_file_handle = ncp_reply_dword(server, 0);
target->open_create_action = ncp_reply_byte(server, 4);
/* in target there's a new finfo to fill */ /* in target there's a new finfo to fill */
ncp_extract_file_info(ncp_reply_data(server, 6), &(target->i)); ncp_extract_file_info(ncp_reply_data(server, 6), &(target->i));
ConvertToNWfromDWORD(target->server_file_handle, target->file_handle); ConvertToNWfromDWORD(ncp_reply_dword(server, 0), target->file_handle);
out: out:
ncp_unlock_server(server); ncp_unlock_server(server);
......
...@@ -182,9 +182,7 @@ struct ncp_entry_info { ...@@ -182,9 +182,7 @@ struct ncp_entry_info {
ino_t ino; ino_t ino;
int opened; int opened;
int access; int access;
__u32 server_file_handle __attribute__((packed)); __u8 file_handle[6];
__u8 open_create_action __attribute__((packed));
__u8 file_handle[6] __attribute__((packed));
}; };
/* Guess, what 0x564c is :-) */ /* Guess, what 0x564c is :-) */
......
...@@ -22,7 +22,6 @@ struct ncp_inode_info { ...@@ -22,7 +22,6 @@ struct ncp_inode_info {
struct semaphore open_sem; struct semaphore open_sem;
atomic_t opened; atomic_t opened;
int access; int access;
__u32 server_file_handle;
__u8 file_handle[6]; __u8 file_handle[6];
struct inode vfs_inode; struct inode vfs_inode;
}; };
......
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