Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
32c419d9
L
linux
项目概览
xiphi1978
/
linux
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
32c419d9
编写于
1月 12, 2011
作者:
A
Al Viro
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
move internal-only parts of ncpfs headers to fs/ncpfs
Signed-off-by:
N
Al Viro
<
viro@zeniv.linux.org.uk
>
上级
0378c405
变更
16
隐藏空白更改
内联
并排
Showing
16 changed file
with
126 addition
and
150 deletion
+126
-150
fs/ncpfs/dir.c
fs/ncpfs/dir.c
+1
-3
fs/ncpfs/file.c
fs/ncpfs/file.c
+1
-2
fs/ncpfs/inode.c
fs/ncpfs/inode.c
+1
-3
fs/ncpfs/ioctl.c
fs/ncpfs/ioctl.c
+1
-3
fs/ncpfs/mmap.c
fs/ncpfs/mmap.c
+2
-2
fs/ncpfs/ncp_fs.h
fs/ncpfs/ncp_fs.h
+98
-0
fs/ncpfs/ncp_fs_i.h
fs/ncpfs/ncp_fs_i.h
+0
-0
fs/ncpfs/ncp_fs_sb.h
fs/ncpfs/ncp_fs_sb.h
+18
-6
fs/ncpfs/ncplib_kernel.c
fs/ncpfs/ncplib_kernel.c
+1
-1
fs/ncpfs/ncplib_kernel.h
fs/ncpfs/ncplib_kernel.h
+0
-2
fs/ncpfs/ncpsign_kernel.c
fs/ncpfs/ncpsign_kernel.c
+1
-0
fs/ncpfs/ncpsign_kernel.h
fs/ncpfs/ncpsign_kernel.h
+0
-2
fs/ncpfs/sock.c
fs/ncpfs/sock.c
+1
-1
fs/ncpfs/symlink.c
fs/ncpfs/symlink.c
+1
-3
include/linux/ncp_fs.h
include/linux/ncp_fs.h
+0
-100
include/linux/ncp_mount.h
include/linux/ncp_mount.h
+0
-22
未找到文件。
fs/ncpfs/dir.c
浏览文件 @
32c419d9
...
...
@@ -21,9 +21,7 @@
#include <asm/uaccess.h>
#include <asm/byteorder.h>
#include <linux/ncp_fs.h>
#include "ncplib_kernel.h"
#include "ncp_fs.h"
static
void
ncp_read_volume_list
(
struct
file
*
,
void
*
,
filldir_t
,
struct
ncp_cache_control
*
);
...
...
fs/ncpfs/file.c
浏览文件 @
32c419d9
...
...
@@ -18,8 +18,7 @@
#include <linux/vmalloc.h>
#include <linux/sched.h>
#include <linux/ncp_fs.h>
#include "ncplib_kernel.h"
#include "ncp_fs.h"
static
int
ncp_fsync
(
struct
file
*
file
,
int
datasync
)
{
...
...
fs/ncpfs/inode.c
浏览文件 @
32c419d9
...
...
@@ -31,11 +31,9 @@
#include <linux/seq_file.h>
#include <linux/namei.h>
#include <linux/ncp_fs.h>
#include <net/sock.h>
#include "ncp
lib_kernel
.h"
#include "ncp
_fs
.h"
#include "getopt.h"
#define NCP_DEFAULT_FILE_MODE 0600
...
...
fs/ncpfs/ioctl.c
浏览文件 @
32c419d9
...
...
@@ -20,11 +20,9 @@
#include <linux/vmalloc.h>
#include <linux/sched.h>
#include <linux/ncp_fs.h>
#include <asm/uaccess.h>
#include "ncp
lib_kernel
.h"
#include "ncp
_fs
.h"
/* maximum limit for ncp_objectname_ioctl */
#define NCP_OBJECT_NAME_MAX_LEN 4096
...
...
fs/ncpfs/mmap.c
浏览文件 @
32c419d9
...
...
@@ -16,12 +16,12 @@
#include <linux/mman.h>
#include <linux/string.h>
#include <linux/fcntl.h>
#include <linux/ncp_fs.h>
#include "ncplib_kernel.h"
#include <asm/uaccess.h>
#include <asm/system.h>
#include "ncp_fs.h"
/*
* Fill in the supplied page for mmap
* XXX: how are we excluding truncate/invalidate here? Maybe need to lock
...
...
fs/ncpfs/ncp_fs.h
0 → 100644
浏览文件 @
32c419d9
#include <linux/ncp_fs.h>
#include "ncp_fs_i.h"
#include "ncp_fs_sb.h"
/* define because it is easy to change PRINTK to {*}PRINTK */
#define PRINTK(format, args...) printk(KERN_DEBUG format , ## args)
#undef NCPFS_PARANOIA
#ifdef NCPFS_PARANOIA
#define PPRINTK(format, args...) PRINTK(format , ## args)
#else
#define PPRINTK(format, args...)
#endif
#ifndef DEBUG_NCP
#define DEBUG_NCP 0
#endif
#if DEBUG_NCP > 0
#define DPRINTK(format, args...) PRINTK(format , ## args)
#else
#define DPRINTK(format, args...)
#endif
#if DEBUG_NCP > 1
#define DDPRINTK(format, args...) PRINTK(format , ## args)
#else
#define DDPRINTK(format, args...)
#endif
#define NCP_MAX_RPC_TIMEOUT (6*HZ)
struct
ncp_entry_info
{
struct
nw_info_struct
i
;
ino_t
ino
;
int
opened
;
int
access
;
unsigned
int
volume
;
__u8
file_handle
[
6
];
};
static
inline
struct
ncp_server
*
NCP_SBP
(
const
struct
super_block
*
sb
)
{
return
sb
->
s_fs_info
;
}
#define NCP_SERVER(inode) NCP_SBP((inode)->i_sb)
static
inline
struct
ncp_inode_info
*
NCP_FINFO
(
const
struct
inode
*
inode
)
{
return
container_of
(
inode
,
struct
ncp_inode_info
,
vfs_inode
);
}
/* linux/fs/ncpfs/inode.c */
int
ncp_notify_change
(
struct
dentry
*
,
struct
iattr
*
);
struct
inode
*
ncp_iget
(
struct
super_block
*
,
struct
ncp_entry_info
*
);
void
ncp_update_inode
(
struct
inode
*
,
struct
ncp_entry_info
*
);
void
ncp_update_inode2
(
struct
inode
*
,
struct
ncp_entry_info
*
);
/* linux/fs/ncpfs/dir.c */
extern
const
struct
inode_operations
ncp_dir_inode_operations
;
extern
const
struct
file_operations
ncp_dir_operations
;
extern
const
struct
dentry_operations
ncp_dentry_operations
;
int
ncp_conn_logged_in
(
struct
super_block
*
);
int
ncp_date_dos2unix
(
__le16
time
,
__le16
date
);
void
ncp_date_unix2dos
(
int
unix_date
,
__le16
*
time
,
__le16
*
date
);
/* linux/fs/ncpfs/ioctl.c */
long
ncp_ioctl
(
struct
file
*
,
unsigned
int
,
unsigned
long
);
long
ncp_compat_ioctl
(
struct
file
*
,
unsigned
int
,
unsigned
long
);
/* linux/fs/ncpfs/sock.c */
int
ncp_request2
(
struct
ncp_server
*
server
,
int
function
,
void
*
reply
,
int
max_reply_size
);
static
inline
int
ncp_request
(
struct
ncp_server
*
server
,
int
function
)
{
return
ncp_request2
(
server
,
function
,
server
->
packet
,
server
->
packet_size
);
}
int
ncp_connect
(
struct
ncp_server
*
server
);
int
ncp_disconnect
(
struct
ncp_server
*
server
);
void
ncp_lock_server
(
struct
ncp_server
*
server
);
void
ncp_unlock_server
(
struct
ncp_server
*
server
);
/* linux/fs/ncpfs/symlink.c */
#if defined(CONFIG_NCPFS_EXTRAS) || defined(CONFIG_NCPFS_NFS_NS)
extern
const
struct
address_space_operations
ncp_symlink_aops
;
int
ncp_symlink
(
struct
inode
*
,
struct
dentry
*
,
const
char
*
);
#endif
/* linux/fs/ncpfs/file.c */
extern
const
struct
inode_operations
ncp_file_inode_operations
;
extern
const
struct
file_operations
ncp_file_operations
;
int
ncp_make_open
(
struct
inode
*
,
int
);
/* linux/fs/ncpfs/mmap.c */
int
ncp_mmap
(
struct
file
*
,
struct
vm_area_struct
*
);
/* linux/fs/ncpfs/ncplib_kernel.c */
int
ncp_make_closed
(
struct
inode
*
);
#include "ncplib_kernel.h"
include/linux
/ncp_fs_i.h
→
fs/ncpfs
/ncp_fs_i.h
浏览文件 @
32c419d9
文件已移动
include/linux
/ncp_fs_sb.h
→
fs/ncpfs
/ncp_fs_sb.h
浏览文件 @
32c419d9
...
...
@@ -13,15 +13,30 @@
#include <linux/net.h>
#include <linux/mutex.h>
#include <linux/backing-dev.h>
#ifdef __KERNEL__
#include <linux/workqueue.h>
#define NCP_DEFAULT_OPTIONS 0
/* 2 for packet signatures */
struct
sock
;
struct
ncp_mount_data_kernel
{
unsigned
long
flags
;
/* NCP_MOUNT_* flags */
unsigned
int
int_flags
;
/* internal flags */
#define NCP_IMOUNT_LOGGEDIN_POSSIBLE 0x0001
__kernel_uid32_t
mounted_uid
;
/* Who may umount() this filesystem? */
struct
pid
*
wdog_pid
;
/* Who cares for our watchdog packets? */
unsigned
int
ncp_fd
;
/* The socket to the ncp port */
unsigned
int
time_out
;
/* How long should I wait after
sending a NCP request? */
unsigned
int
retry_count
;
/* And how often should I retry? */
unsigned
char
mounted_vol
[
NCP_VOLNAME_LEN
+
1
];
__kernel_uid32_t
uid
;
__kernel_gid32_t
gid
;
__kernel_mode_t
file_mode
;
__kernel_mode_t
dir_mode
;
int
info_fd
;
};
struct
ncp_server
{
struct
ncp_mount_data_kernel
m
;
/* Nearly all of the mount data is of
...
...
@@ -158,7 +173,4 @@ static inline void ncp_invalidate_conn(struct ncp_server *server)
server
->
conn_status
|=
0x01
;
}
#endif
/* __KERNEL__ */
#endif
fs/ncpfs/ncplib_kernel.c
浏览文件 @
32c419d9
...
...
@@ -11,7 +11,7 @@
#include "ncp
lib_kernel
.h"
#include "ncp
_fs
.h"
static
inline
void
assert_server_locked
(
struct
ncp_server
*
server
)
{
...
...
fs/ncpfs/ncplib_kernel.h
浏览文件 @
32c419d9
...
...
@@ -32,8 +32,6 @@
#include <linux/ctype.h>
#endif
/* CONFIG_NCPFS_NLS */
#include <linux/ncp_fs.h>
#define NCP_MIN_SYMLINK_SIZE 8
#define NCP_MAX_SYMLINK_SIZE 512
...
...
fs/ncpfs/ncpsign_kernel.c
浏览文件 @
32c419d9
...
...
@@ -11,6 +11,7 @@
#include <linux/string.h>
#include <linux/ncp.h>
#include <linux/bitops.h>
#include "ncp_fs.h"
#include "ncpsign_kernel.h"
/* i386: 32-bit, little endian, handles mis-alignment */
...
...
fs/ncpfs/ncpsign_kernel.h
浏览文件 @
32c419d9
...
...
@@ -8,8 +8,6 @@
#ifndef _NCPSIGN_KERNEL_H
#define _NCPSIGN_KERNEL_H
#include <linux/ncp_fs.h>
#ifdef CONFIG_NCPFS_PACKET_SIGNING
void
__sign_packet
(
struct
ncp_server
*
server
,
const
char
*
data
,
size_t
size
,
__u32
totalsize
,
void
*
sign_buff
);
int
sign_verify_reply
(
struct
ncp_server
*
server
,
const
char
*
data
,
size_t
size
,
__u32
totalsize
,
const
void
*
sign_buff
);
...
...
fs/ncpfs/sock.c
浏览文件 @
32c419d9
...
...
@@ -28,7 +28,7 @@
#include <linux/poll.h>
#include <linux/file.h>
#include
<linux/ncp_fs.h>
#include
"ncp_fs.h"
#include "ncpsign_kernel.h"
...
...
fs/ncpfs/symlink.c
浏览文件 @
32c419d9
...
...
@@ -25,13 +25,11 @@
#include <linux/errno.h>
#include <linux/fs.h>
#include <linux/ncp_fs.h>
#include <linux/time.h>
#include <linux/slab.h>
#include <linux/mm.h>
#include <linux/stat.h>
#include "ncplib_kernel.h"
#include "ncp_fs.h"
/* these magic numbers must appear in the symlink file -- this makes it a bit
more resilient against the magic attributes being set on random files. */
...
...
include/linux/ncp_fs.h
浏览文件 @
32c419d9
...
...
@@ -143,104 +143,4 @@ struct ncp_nls_ioctl
#define NCP_MAXPATHLEN 255
#define NCP_MAXNAMELEN 14
#ifdef __KERNEL__
#include <linux/ncp_fs_i.h>
#include <linux/ncp_fs_sb.h>
/* define because it is easy to change PRINTK to {*}PRINTK */
#define PRINTK(format, args...) printk(KERN_DEBUG format , ## args)
#undef NCPFS_PARANOIA
#ifdef NCPFS_PARANOIA
#define PPRINTK(format, args...) PRINTK(format , ## args)
#else
#define PPRINTK(format, args...)
#endif
#ifndef DEBUG_NCP
#define DEBUG_NCP 0
#endif
#if DEBUG_NCP > 0
#define DPRINTK(format, args...) PRINTK(format , ## args)
#else
#define DPRINTK(format, args...)
#endif
#if DEBUG_NCP > 1
#define DDPRINTK(format, args...) PRINTK(format , ## args)
#else
#define DDPRINTK(format, args...)
#endif
#define NCP_MAX_RPC_TIMEOUT (6*HZ)
struct
ncp_entry_info
{
struct
nw_info_struct
i
;
ino_t
ino
;
int
opened
;
int
access
;
unsigned
int
volume
;
__u8
file_handle
[
6
];
};
static
inline
struct
ncp_server
*
NCP_SBP
(
const
struct
super_block
*
sb
)
{
return
sb
->
s_fs_info
;
}
#define NCP_SERVER(inode) NCP_SBP((inode)->i_sb)
static
inline
struct
ncp_inode_info
*
NCP_FINFO
(
const
struct
inode
*
inode
)
{
return
container_of
(
inode
,
struct
ncp_inode_info
,
vfs_inode
);
}
/* linux/fs/ncpfs/inode.c */
int
ncp_notify_change
(
struct
dentry
*
,
struct
iattr
*
);
struct
inode
*
ncp_iget
(
struct
super_block
*
,
struct
ncp_entry_info
*
);
void
ncp_update_inode
(
struct
inode
*
,
struct
ncp_entry_info
*
);
void
ncp_update_inode2
(
struct
inode
*
,
struct
ncp_entry_info
*
);
/* linux/fs/ncpfs/dir.c */
extern
const
struct
inode_operations
ncp_dir_inode_operations
;
extern
const
struct
file_operations
ncp_dir_operations
;
extern
const
struct
dentry_operations
ncp_dentry_operations
;
int
ncp_conn_logged_in
(
struct
super_block
*
);
int
ncp_date_dos2unix
(
__le16
time
,
__le16
date
);
void
ncp_date_unix2dos
(
int
unix_date
,
__le16
*
time
,
__le16
*
date
);
/* linux/fs/ncpfs/ioctl.c */
long
ncp_ioctl
(
struct
file
*
,
unsigned
int
,
unsigned
long
);
long
ncp_compat_ioctl
(
struct
file
*
,
unsigned
int
,
unsigned
long
);
/* linux/fs/ncpfs/sock.c */
int
ncp_request2
(
struct
ncp_server
*
server
,
int
function
,
void
*
reply
,
int
max_reply_size
);
static
inline
int
ncp_request
(
struct
ncp_server
*
server
,
int
function
)
{
return
ncp_request2
(
server
,
function
,
server
->
packet
,
server
->
packet_size
);
}
int
ncp_connect
(
struct
ncp_server
*
server
);
int
ncp_disconnect
(
struct
ncp_server
*
server
);
void
ncp_lock_server
(
struct
ncp_server
*
server
);
void
ncp_unlock_server
(
struct
ncp_server
*
server
);
/* linux/fs/ncpfs/symlink.c */
#if defined(CONFIG_NCPFS_EXTRAS) || defined(CONFIG_NCPFS_NFS_NS)
extern
const
struct
address_space_operations
ncp_symlink_aops
;
int
ncp_symlink
(
struct
inode
*
,
struct
dentry
*
,
const
char
*
);
#endif
/* linux/fs/ncpfs/file.c */
extern
const
struct
inode_operations
ncp_file_inode_operations
;
extern
const
struct
file_operations
ncp_file_operations
;
int
ncp_make_open
(
struct
inode
*
,
int
);
/* linux/fs/ncpfs/mmap.c */
int
ncp_mmap
(
struct
file
*
,
struct
vm_area_struct
*
);
/* linux/fs/ncpfs/ncplib_kernel.c */
int
ncp_make_closed
(
struct
inode
*
);
#endif
/* __KERNEL__ */
#endif
/* _LINUX_NCP_FS_H */
include/linux/ncp_mount.h
浏览文件 @
32c419d9
...
...
@@ -68,26 +68,4 @@ struct ncp_mount_data_v4 {
#define NCP_MOUNT_VERSION_V5 (5)
/* Text only */
#ifdef __KERNEL__
struct
ncp_mount_data_kernel
{
unsigned
long
flags
;
/* NCP_MOUNT_* flags */
unsigned
int
int_flags
;
/* internal flags */
#define NCP_IMOUNT_LOGGEDIN_POSSIBLE 0x0001
__kernel_uid32_t
mounted_uid
;
/* Who may umount() this filesystem? */
struct
pid
*
wdog_pid
;
/* Who cares for our watchdog packets? */
unsigned
int
ncp_fd
;
/* The socket to the ncp port */
unsigned
int
time_out
;
/* How long should I wait after
sending a NCP request? */
unsigned
int
retry_count
;
/* And how often should I retry? */
unsigned
char
mounted_vol
[
NCP_VOLNAME_LEN
+
1
];
__kernel_uid32_t
uid
;
__kernel_gid32_t
gid
;
__kernel_mode_t
file_mode
;
__kernel_mode_t
dir_mode
;
int
info_fd
;
};
#endif
/* __KERNEL__ */
#endif
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录