diff options
| author | Patrick McHardy <kaber@trash.net> | 2010-03-08 12:55:23 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-03-08 12:55:23 +0100 |
| commit | f790c0ca6fad60b544bb73eda8cc841a6436725b (patch) | |
| tree | 171052d4734fda5e77668aacfff98de69e1f4237 /include/linux/fs_stack.h | |
| parent | 9ab48ddcb144fdee908708669448dd136cf4894a (diff) | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
| download | cachepc-linux-f790c0ca6fad60b544bb73eda8cc841a6436725b.tar.gz cachepc-linux-f790c0ca6fad60b544bb73eda8cc841a6436725b.zip | |
Merge branch 'master' of /repos/git/linux-2.6
Conflicts:
net/ipv4/netfilter/nf_nat_core.c
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_conntrack_netlink.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'include/linux/fs_stack.h')
| -rw-r--r-- | include/linux/fs_stack.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/fs_stack.h b/include/linux/fs_stack.h index bb516ceeefc9..da317c7163ab 100644 --- a/include/linux/fs_stack.h +++ b/include/linux/fs_stack.h @@ -8,10 +8,8 @@ #include <linux/fs.h> /* externs for fs/stack.c */ -extern void fsstack_copy_attr_all(struct inode *dest, const struct inode *src, - int (*get_nlinks)(struct inode *)); - -extern void fsstack_copy_inode_size(struct inode *dst, const struct inode *src); +extern void fsstack_copy_attr_all(struct inode *dest, const struct inode *src); +extern void fsstack_copy_inode_size(struct inode *dst, struct inode *src); /* inlines */ static inline void fsstack_copy_attr_atime(struct inode *dest, |