Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
e4077388
Commit
e4077388
authored
Nov 23, 2007
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Import 2.3.32pre2
parent
0115c1b6
Changes
34
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
34 changed files
with
1587 additions
and
732 deletions
+1587
-732
CREDITS
CREDITS
+1
-1
Documentation/Configure.help
Documentation/Configure.help
+10
-6
Documentation/ide.txt
Documentation/ide.txt
+2
-0
drivers/block/ide-probe.c
drivers/block/ide-probe.c
+2
-1
drivers/block/ide.c
drivers/block/ide.c
+14
-0
drivers/char/msp3400.c
drivers/char/msp3400.c
+167
-93
drivers/i2o/i2o_core.c
drivers/i2o/i2o_core.c
+2
-1
drivers/net/rclanmtl.c
drivers/net/rclanmtl.c
+4
-4
drivers/net/sb1000.c
drivers/net/sb1000.c
+113
-139
drivers/net/tlan.c
drivers/net/tlan.c
+48
-22
drivers/net/tlan.h
drivers/net/tlan.h
+1
-0
drivers/scsi/53c8xx_d.h
drivers/scsi/53c8xx_d.h
+1
-0
drivers/scsi/g_NCR5380.c
drivers/scsi/g_NCR5380.c
+12
-1
drivers/scsi/g_NCR5380.h
drivers/scsi/g_NCR5380.h
+1
-1
drivers/scsi/ide-scsi.c
drivers/scsi/ide-scsi.c
+4
-1
drivers/scsi/sim710_d.h
drivers/scsi/sim710_d.h
+1
-0
drivers/sound/mad16.c
drivers/sound/mad16.c
+70
-17
drivers/sound/sb_ess.c
drivers/sound/sb_ess.c
+26
-20
fs/Config.in
fs/Config.in
+4
-0
fs/nfsd/Makefile
fs/nfsd/Makefile
+3
-0
fs/nfsd/nfs3proc.c
fs/nfsd/nfs3proc.c
+383
-239
fs/nfsd/nfs3xdr.c
fs/nfsd/nfs3xdr.c
+192
-132
fs/nfsd/nfsproc.c
fs/nfsd/nfsproc.c
+7
-2
fs/nfsd/nfssvc.c
fs/nfsd/nfssvc.c
+17
-4
fs/nfsd/vfs.c
fs/nfsd/vfs.c
+293
-4
include/linux/ide.h
include/linux/ide.h
+2
-0
include/linux/nfsd/nfsd.h
include/linux/nfsd/nfsd.h
+19
-3
include/linux/nfsd/nfsfh.h
include/linux/nfsd/nfsfh.h
+81
-0
include/linux/nfsd/xdr3.h
include/linux/nfsd/xdr3.h
+81
-35
mm/swapfile.c
mm/swapfile.c
+1
-3
net/decnet/Makefile
net/decnet/Makefile
+0
-2
net/decnet/dn_dev.c
net/decnet/dn_dev.c
+9
-1
net/decnet/sysctl_net_decnet.c
net/decnet/sysctl_net_decnet.c
+11
-0
net/netsyms.c
net/netsyms.c
+5
-0
No files found.
CREDITS
View file @
e4077388
...
...
@@ -1605,7 +1605,7 @@ S: Perth, Western Australia
S: Australia
N: Greg Page
E: g
reg@caldera.com
E: g
page@sovereign.org
D: IPX development and support
N: David Parsons
...
...
Documentation/Configure.help
View file @
e4077388
...
...
@@ -1477,10 +1477,6 @@ CONFIG_NETFILTER
Chances are that you should say Y here if you compile a kernel which
will run as a router and N for regular hosts. If unsure, say N.
Network packet filtering debugging
CONFIG_NETFILTER_DEBUG
Say Y to make sure packets aren't leaking.
SYN flood protection
CONFIG_SYN_COOKIES
Normal TCP/IP networking is open to an attack known as "
SYN
...
...
@@ -1496,7 +1492,7 @@ CONFIG_SYN_COOKIES
is no need for the legitimate users to change their TCP/IP software;
SYN cookies work transparently to them. For technical information
about SYN cookies, check out
ftp://koobera.math.uic.edu/
pub/docs/syncookies-archive
.
ftp://koobera.math.uic.edu/
syncookies.html
.
If you are SYN flooded, the source address reported by the kernel is
likely to have been forged by the attacker; it is only reported as
...
...
@@ -8415,7 +8411,15 @@ Emulate SUN NFS server
CONFIG_NFSD_SUN
If
you
would
like
for
the
server
to
allow
clients
to
access
directories
that
are
mount
points
on
the
local
filesystem
(
this
is
how
nfsd
behaves
on
Sun
systems
),
say
Y
here
.
If
unsure
,
say
N
.
how
nfsd
behaves
on
Sun
systems
),
say
Y
here
.
If
you
use
Tru64
clients
,
say
Y
.
If
unsure
,
say
N
.
Provide
NFSv3
server
support
(
EXPERIMENTAL
)
CONFIG_NFSD_V3
If
you
would
like
to
include
the
NFSv3
server
was
well
as
the
NFSv2
server
,
say
Y
here
.
File
locking
,
via
the
NLMv4
protocol
,
is
not
supported
yet
.
If
unsure
,
say
N
.
OS
/
2
HPFS
filesystem
support
CONFIG_HPFS_FS
...
...
Documentation/ide.txt
View file @
e4077388
...
...
@@ -276,6 +276,8 @@ Summary of ide driver parameters for kernel "command line":
port. Should be used only as a last resort.
"hdx=swapdata" : when the drive is a disk, byte swap all data
"hdxlun=xx" : set the drive last logical unit
"idebus=xx" : inform IDE driver of VESA/PCI bus speed in MHz,
where "xx" is between 20 and 66 inclusive,
used when tuning chipset PIO modes.
...
...
drivers/block/ide-probe.c
View file @
e4077388
...
...
@@ -56,7 +56,8 @@ static inline void do_identify (ide_drive_t *drive, byte cmd)
ide_input_data
(
drive
,
id
,
SECTOR_WORDS
);
/* read 512 bytes of id info */
ide__sti
();
/* local CPU only */
ide_fix_driveid
(
id
);
if
(
!
drive
->
forced_lun
)
drive
->
last_lun
=
id
->
word126
&
0x7
;
#if defined (CONFIG_SCSI_EATA_DMA) || defined (CONFIG_SCSI_EATA_PIO) || defined (CONFIG_SCSI_EATA)
/*
* EATA SCSI controllers do a hardware ATA emulation:
...
...
drivers/block/ide.c
View file @
e4077388
...
...
@@ -2684,6 +2684,7 @@ static int __init match_parm (char *s, const char *keywords[], int vals[], int m
*
* "hdx=swapdata" : when the drive is a disk, byte swap all data
* "hdx=bswap" : same as above..........
* "hdxlun=xx" : set the drive last logical unit.
* "hdx=flash" : allows for more than one ata_flash disk to be
* registered. In most cases, only one device
* will be present.
...
...
@@ -2789,6 +2790,19 @@ void __init ide_setup (char *s)
strncpy
(
drive
->
driver_req
,
s
+
4
,
9
);
goto
done
;
}
/*
* Look for last lun option: "hdxlun="
*/
if
(
s
[
3
]
==
'l'
&&
s
[
4
]
==
'u'
&&
s
[
5
]
==
'n'
)
{
if
(
match_parm
(
&
s
[
6
],
NULL
,
vals
,
1
)
!=
1
)
goto
bad_option
;
if
(
vals
[
0
]
>=
0
&&
vals
[
0
]
<=
7
)
{
drive
->
last_lun
=
vals
[
0
];
drive
->
forced_lun
=
1
;
}
else
printk
(
" -- BAD LAST LUN! Expected value from 0 to 7"
);
goto
done
;
}
switch
(
match_parm
(
&
s
[
3
],
hd_words
,
vals
,
3
))
{
case
-
1
:
/* "none" */
drive
->
nobios
=
1
;
/* drop into "noprobe" */
...
...
drivers/char/msp3400.c
View file @
e4077388
This diff is collapsed.
Click to expand it.
drivers/i2o/i2o_core.c
View file @
e4077388
...
...
@@ -1515,7 +1515,7 @@ static void __init i2o_sys_init()
{
niop
=
iop
->
next
;
#ifdef DRIVERDEBUG
printk
(
KERN_INFO
"Enabl
e
ing iop%d
\n
"
,
iop
->
unit
);
printk
(
KERN_INFO
"Enabling iop%d
\n
"
,
iop
->
unit
);
#endif
if
(
i2o_enable_controller
(
iop
))
{
...
...
@@ -2680,6 +2680,7 @@ EXPORT_SYMBOL(i2o_report_controller_unit);
EXPORT_SYMBOL
(
i2o_activate_controller
);
EXPORT_SYMBOL
(
i2o_online_controller
);
EXPORT_SYMBOL
(
i2o_get_class_name
);
EXPORT_SYMBOL
(
i2o_status_get
);
EXPORT_SYMBOL
(
i2o_query_scalar
);
EXPORT_SYMBOL
(
i2o_set_scalar
);
...
...
drivers/net/rclanmtl.c
View file @
e4077388
...
...
@@ -741,7 +741,7 @@ RCProcI2OMsgQ(U16 AdapterID)
}
break
;
default:
printk
(
"Unknown private I2O msg received: 0x%x
\n
"
,
printk
(
"Unknown private I2O msg received: 0x%
l
x
\n
"
,
p32
[
5
]);
break
;
}
...
...
@@ -1216,7 +1216,7 @@ RCGetPromiscuousMode(U16 AdapterID, PU32 pMode, PFNWAITCALLBACK WaitCallback)
if
(
!
timeout
--
)
{
kprintf
(
"Timeout waiting for promiscuous mode from adapter
\n
"
);
kprintf
(
"0x%
08.8u
lx
\n
"
,
p32
[
0
]);
kprintf
(
"0x%
8.8
lx
\n
"
,
p32
[
0
]);
return
RC_RTN_NO_LINK_SPEED
;
}
}
...
...
@@ -1337,7 +1337,7 @@ RCGetBroadcastMode(U16 AdapterID, PU32 pMode, PFNWAITCALLBACK WaitCallback)
if
(
!
timeout
--
)
{
kprintf
(
"Timeout waiting for promiscuous mode from adapter
\n
"
);
kprintf
(
"0x%
08.8u
lx
\n
"
,
p32
[
0
]);
kprintf
(
"0x%
8.8
lx
\n
"
,
p32
[
0
]);
return
RC_RTN_NO_LINK_SPEED
;
}
}
...
...
@@ -1421,7 +1421,7 @@ RCGetLinkSpeed(U16 AdapterID, PU32 pLinkSpeedCode, PFNWAITCALLBACK WaitCallback)
if
(
!
timeout
--
)
{
kprintf
(
"Timeout waiting for link speed from IOP
\n
"
);
kprintf
(
"0x%
08.8u
lx
\n
"
,
p32
[
0
]);
kprintf
(
"0x%
8.8
lx
\n
"
,
p32
[
0
]);
return
RC_RTN_NO_LINK_SPEED
;
}
}
...
...
drivers/net/sb1000.c
View file @
e4077388
...
...
@@ -56,8 +56,10 @@ static char version[] = "sb1000.c:v1.1.2 6/01/98 (fventuri@mediaone.net)\n";
#include <asm/io.h>
#include <asm/uaccess.h>
#include <linux/etherdevice.h>
#include <linux/isapnp.h>
/* for SIOGCM/SIOSCM stuff */
#include <linux/if_cablemodem.h>
#ifdef SB1000_DEBUG
...
...
@@ -93,8 +95,6 @@ static void sb1000_interrupt(int irq, void *dev_id, struct pt_regs *regs);
static
struct
enet_statistics
*
sb1000_stats
(
struct
net_device
*
dev
);
static
int
sb1000_close
(
struct
net_device
*
dev
);
/* Plug-n-Play routine */
static
inline
unsigned
char
read_resource_data
(
void
);
/* SB1000 hardware routines to be used during open/configuration phases */
static
inline
void
nicedelay
(
unsigned
long
usecs
);
...
...
@@ -138,102 +138,66 @@ static inline int sb1000_set_PIDs(const int ioaddr[], const char* name,
static
inline
int
sb1000_rx
(
struct
net_device
*
dev
);
static
inline
void
sb1000_error_dpc
(
struct
net_device
*
dev
);
/* Plug-n-Play constants */
static
const
int
READ_DATA_PORT
=
0x203
;
/* This port number may change!!! */
static
const
int
ADDRESS_PORT
=
0x279
;
static
const
int
WRITE_DATA_PORT
=
0xa79
;
/* Plug-n-Play read resource mechanism */
static
inline
unsigned
char
read_resource_data
(
void
)
{
/* poll */
outb
(
0x05
,
ADDRESS_PORT
);
/* Select PnP status register. */
while
(
!
(
inb
(
READ_DATA_PORT
)
&
0x1
))
;
/* read resource data */
outb
(
0x04
,
ADDRESS_PORT
);
/* Select PnP resource data register. */
return
inb
(
READ_DATA_PORT
);
}
/* probe for SB1000 using Plug-n-Play mechanism */
int
sb1000_probe
(
struct
net_device
*
dev
)
{
unsigned
short
ioaddr
[
2
],
irq
;
s
hort
i
,
csn
;
s
truct
pci_dev
*
idev
=
NULL
;
unsigned
int
serial_number
;
const
unsigned
char
initiation_key
[]
=
{
0x00
,
0x00
,
0x6a
,
0xb5
,
0xda
,
0xed
,
0xf6
,
0xfb
,
0x7d
,
0xbe
,
0xdf
,
0x6f
,
0x37
,
0x1b
,
0x0d
,
0x86
,
0xc3
,
0x61
,
0xb0
,
0x58
,
0x2c
,
0x16
,
0x8b
,
0x45
,
0xa2
,
0xd1
,
0xe8
,
0x74
,
0x3a
,
0x9d
,
0xce
,
0xe7
,
0x73
,
0x39
};
const
unsigned
char
sb1000_vendor_ID
[]
=
{
0x1d
,
0x23
,
0x10
,
0x00
};
/* "GIC1000" */
/* Reset the ISA PnP mechanism */
outb
(
0x02
,
ADDRESS_PORT
);
/* Select PnP config control register. */
outb
(
0x02
,
WRITE_DATA_PORT
);
/* Return to WaitForKey state. */
while
(
1
)
{
/*
* Find the card
*/
/* send initiation key */
for
(
i
=
0
;
i
<
sizeof
(
initiation_key
)
/
sizeof
(
initiation_key
[
0
]);
i
++
)
{
outb
(
initiation_key
[
i
],
ADDRESS_PORT
);
}
idev
=
isapnp_find_dev
(
NULL
,
ISAPNP_VENDOR
(
'G'
,
'I'
,
'C'
),
ISAPNP_FUNCTION
(
0x1000
),
idev
);
/* set card CSN into configuration mode */
for
(
csn
=
1
;
csn
<=
255
;
csn
++
)
{
outb
(
0x03
,
ADDRESS_PORT
);
/* Select PnP wake[CSN] register. */
outb
(
csn
,
WRITE_DATA_PORT
);
/* Wake[CSN] */
/* check card ID */
for
(
i
=
0
;
i
<
4
;
i
++
)
{
if
(
read_resource_data
()
!=
sb1000_vendor_ID
[
i
])
break
;
}
if
(
i
==
4
)
break
;
}
/*
* No card
*/
/* SB1000 not found */
if
(
csn
>
255
)
{
/* return to WaitForKey state */
outb
(
0x02
,
ADDRESS_PORT
);
/* Select PnP config control register. */
outb
(
0x02
,
WRITE_DATA_PORT
);
/* Return to WaitForKey state. */
if
(
idev
==
NULL
)
return
-
ENODEV
;
}
/* found: get serial number and skip checksum */
serial_number
=
0
;
for
(
i
=
0
;
i
<
4
;
i
++
)
{
serial_number
|=
read_resource_data
()
<<
(
8
*
i
);
}
read_resource_data
();
/* get I/O port base address */
outb
(
0x60
,
ADDRESS_PORT
);
/* Select PnP I/O port base address 0. */
ioaddr
[
0
]
=
inb
(
READ_DATA_PORT
)
<<
8
;
outb
(
0x61
,
ADDRESS_PORT
);
ioaddr
[
0
]
|=
inb
(
READ_DATA_PORT
);
outb
(
0x62
,
ADDRESS_PORT
);
/* Select PnP I/O port base address 1. */
ioaddr
[
1
]
=
inb
(
READ_DATA_PORT
)
<<
8
;
outb
(
0x63
,
ADDRESS_PORT
);
ioaddr
[
1
]
|=
inb
(
READ_DATA_PORT
);
/* get IRQ */
outb
(
0x70
,
ADDRESS_PORT
);
/* Select PnP IRQ level select 0. */
irq
=
inb
(
READ_DATA_PORT
);
/* return to WaitForKey state */
outb
(
0x02
,
ADDRESS_PORT
);
/* Select PnP config control register. */
outb
(
0x02
,
WRITE_DATA_PORT
);
/* Return to WaitForKey state. */
/*
* Bring it online
*/
idev
->
prepare
(
idev
);
idev
->
activate
(
idev
);
/*
* Ports free ?
*/
if
(
!
idev
->
resource
[
0
].
start
||
check_region
(
idev
->
resource
[
0
].
start
,
16
))
continue
;
if
(
!
idev
->
resource
[
1
].
start
||
check_region
(
idev
->
resource
[
1
].
start
,
16
))
continue
;
serial_number
=
idev
->
bus
->
serial
;
ioaddr
[
0
]
=
idev
->
resource
[
0
].
start
;
ioaddr
[
1
]
=
idev
->
resource
[
1
].
start
;
irq
=
idev
->
irq
;
/* check I/O base and IRQ */
if
(
dev
->
base_addr
!=
0
&&
dev
->
base_addr
!=
ioaddr
[
0
])
{
return
-
ENODEV
;
}
if
(
dev
->
rmem_end
!=
0
&&
dev
->
rmem_end
!=
ioaddr
[
1
])
{
return
-
ENODEV
;
}
if
(
dev
->
irq
!=
0
&&
dev
->
irq
!=
irq
)
{
return
-
ENODEV
;
}
if
(
dev
->
base_addr
!=
0
&&
dev
->
base_addr
!=
ioaddr
[
0
])
continue
;
if
(
dev
->
rmem_end
!=
0
&&
dev
->
rmem_end
!=
ioaddr
[
1
])
continue
;
if
(
dev
->
irq
!=
0
&&
dev
->
irq
!=
irq
)
continue
;
/*
* Ok set it up.
*/
dev
->
base_addr
=
ioaddr
[
0
];
/* rmem_end holds the second I/O address - fv */
...
...
@@ -241,9 +205,9 @@ sb1000_probe(struct net_device *dev)
dev
->
irq
=
irq
;
if
(
sb1000_debug
>
0
)
printk
(
KERN_NOTICE
"%s: sb1000 at (%#3.3lx,%#3.3lx), csn %d
, "
printk
(
KERN_NOTICE
"%s: sb1000 at (%#3.3lx,%#3.3lx)
, "
"S/N %#8.8x, IRQ %d.
\n
"
,
dev
->
name
,
dev
->
base_addr
,
dev
->
rmem_end
,
csn
,
serial_number
,
dev
->
irq
);
dev
->
rmem_end
,
serial_number
,
dev
->
irq
);
dev
=
init_etherdev
(
dev
,
0
);
...
...
@@ -285,13 +249,21 @@ sb1000_probe(struct net_device *dev)
/* New-style flags. */
dev
->
flags
=
IFF_POINTOPOINT
|
IFF_NOARP
;
/* Lock resources */
request_region
(
ioaddr
[
0
],
16
,
dev
->
name
);
request_region
(
ioaddr
[
1
],
16
,
dev
->
name
);
return
0
;
}
}
/*
* SB1000 hardware routines to be used during open/configuration phases
*/
const
int
TimeOutJiffies
=
(
int
)(
8
.
75
*
HZ
);
static
inline
void
nicedelay
(
unsigned
long
usecs
)
...
...
@@ -1279,6 +1251,8 @@ init_module(void)
void
cleanup_module
(
void
)
{
unregister_netdev
(
&
dev_sb1000
);
release_region
(
&
dev_sb1000
.
base_addr
,
16
);
release_region
(
&
dev_sb1000
.
rmem_end
,
16
);
kfree_s
(
dev_sb1000
.
priv
,
sizeof
(
struct
sb1000_private
));
dev_sb1000
.
priv
=
NULL
;
}
...
...
drivers/net/tlan.c
View file @
e4077388
...
...
@@ -43,7 +43,7 @@
#include <linux/pci.h>
#include <linux/etherdevice.h>
#include <linux/delay.h>
#include <linux/spinlock.h>
typedef
u32
(
TLanIntVectorFunc
)(
struct
net_device
*
,
u16
);
...
...
@@ -234,13 +234,15 @@ static inline void
TLan_SetTimer
(
struct
net_device
*
dev
,
u32
ticks
,
u32
type
)
{
TLanPrivateInfo
*
priv
=
(
TLanPrivateInfo
*
)
dev
->
priv
;
unsigned
long
flags
;
cli
(
);
spin_lock_irqsave
(
&
priv
->
lock
,
flags
);
if
(
priv
->
timer
.
function
!=
NULL
)
{
spin_unlock_irqrestore
(
&
priv
->
lock
,
flags
);
return
;
}
priv
->
timer
.
function
=
&
TLan_Timer
;
s
ti
(
);
s
pin_unlock_irqrestore
(
&
priv
->
lock
,
flags
);
priv
->
timer
.
data
=
(
unsigned
long
)
dev
;
priv
->
timer
.
expires
=
jiffies
+
ticks
;
...
...
@@ -337,6 +339,8 @@ extern int init_module(void)
priv
->
sa_int
=
sa_int
;
priv
->
debug
=
debug
;
spin_lock_init
(
&
priv
->
lock
);
ether_setup
(
dev
);
failed
=
register_netdev
(
dev
);
...
...
@@ -770,6 +774,7 @@ int TLan_StartTx( struct sk_buff *skb, struct net_device *dev )
TLanList
*
tail_list
;
u8
*
tail_buffer
;
int
pad
;
unsigned
long
flags
;
if
(
!
priv
->
phyOnline
)
{
TLAN_DBG
(
TLAN_DEBUG_TX
,
"TLAN TRANSMIT: %s PHY is not ready
\n
"
,
dev
->
name
);
...
...
@@ -810,7 +815,7 @@ int TLan_StartTx( struct sk_buff *skb, struct net_device *dev )
tail_list
->
buffer
[
1
].
address
=
0
;
}
cli
(
);
spin_lock_irqsave
(
&
priv
->
lock
,
flags
);
tail_list
->
cStat
=
TLAN_CSTAT_READY
;
if
(
!
priv
->
txInProgress
)
{
priv
->
txInProgress
=
1
;
...
...
@@ -826,7 +831,7 @@ int TLan_StartTx( struct sk_buff *skb, struct net_device *dev )
(
priv
->
txList
+
(
priv
->
txTail
-
1
)
)
->
forward
=
virt_to_bus
(
tail_list
);
}
}
s
ti
(
);
s
pin_unlock_irqrestore
(
&
priv
->
lock
,
flags
);
CIRC_INC
(
priv
->
txTail
,
TLAN_NUM_TX_LISTS
);
...
...
@@ -870,10 +875,12 @@ void TLan_HandleInterrupt(int irq, void *dev_id, struct pt_regs *regs)
u32
host_cmd
;
u16
host_int
;
int
type
;
TLanPrivateInfo
*
priv
;
dev
=
(
struct
net_device
*
)
dev_id
;
priv
=
(
TLanPrivateInfo
*
)
dev
->
priv
;
cli
(
);
spin_lock
(
&
priv
->
lock
);
if
(
dev
->
interrupt
)
{
printk
(
"TLAN: Re-entering interrupt handler for %s: %ld.
\n
"
,
dev
->
name
,
dev
->
interrupt
);
}
...
...
@@ -892,7 +899,7 @@ void TLan_HandleInterrupt(int irq, void *dev_id, struct pt_regs *regs)
}
dev
->
interrupt
--
;
s
ti
(
);
s
pin_unlock
(
&
priv
->
lock
);
}
/* TLan_HandleInterrupts */
...
...
@@ -1558,6 +1565,7 @@ void TLan_Timer( unsigned long data )
struct
net_device
*
dev
=
(
struct
net_device
*
)
data
;
TLanPrivateInfo
*
priv
=
(
TLanPrivateInfo
*
)
dev
->
priv
;
u32
elapsed
;
unsigned
long
flags
;
priv
->
timer
.
function
=
NULL
;
...
...
@@ -1581,7 +1589,7 @@ void TLan_Timer( unsigned long data )
TLan_FinishReset
(
dev
);
break
;
case
TLAN_TIMER_ACTIVITY
:
cli
(
);
spin_lock_irqsave
(
&
priv
->
lock
,
flags
);
if
(
priv
->
timer
.
function
==
NULL
)
{
elapsed
=
jiffies
-
priv
->
timerSetAt
;
if
(
elapsed
>=
TLAN_TIMER_ACT_DELAY
)
{
...
...
@@ -1589,11 +1597,12 @@ void TLan_Timer( unsigned long data )
}
else
{
priv
->
timer
.
function
=
&
TLan_Timer
;
priv
->
timer
.
expires
=
priv
->
timerSetAt
+
TLAN_TIMER_ACT_DELAY
;
s
ti
(
);
s
pin_unlock_irqrestore
(
&
priv
->
lock
,
flags
);
add_timer
(
&
priv
->
timer
);
break
;
}
}
s
ti
(
);
s
pin_unlock_irqrestore
(
&
priv
->
lock
,
flags
);
break
;
default:
break
;
...
...
@@ -2438,13 +2447,16 @@ int TLan_MiiReadReg( struct net_device *dev, u16 phy, u16 reg, u16 *val )
u32
i
;
int
err
;
int
minten
;
TLanPrivateInfo
*
priv
=
(
TLanPrivateInfo
*
)
dev
->
priv
;
int
irq
;
unsigned
long
flags
;
err
=
FALSE
;
outw
(
TLAN_NET_SIO
,
dev
->
base_addr
+
TLAN_DIO_ADR
);
sio
=
dev
->
base_addr
+
TLAN_DIO_DATA
+
TLAN_NET_SIO
;
if
(
dev
->
interrupt
==
0
)
cli
(
);
spin_lock_irqsave
(
&
priv
->
lock
,
flags
);
dev
->
interrupt
++
;
TLan_MiiSync
(
dev
->
base_addr
);
...
...
@@ -2494,7 +2506,7 @@ int TLan_MiiReadReg( struct net_device *dev, u16 phy, u16 reg, u16 *val )
dev
->
interrupt
--
;
if
(
dev
->
interrupt
==
0
)
s
ti
(
);
s
pin_unlock_irqrestore
(
&
priv
->
lock
,
flags
);
return
err
;
...
...
@@ -2606,12 +2618,14 @@ void TLan_MiiWriteReg( struct net_device *dev, u16 phy, u16 reg, u16 val )
{
u16
sio
;
int
minten
;
unsigned
long
flags
;
TLanPrivateInfo
*
priv
=
(
TLanPrivateInfo
*
)
dev
->
priv
;
outw
(
TLAN_NET_SIO
,
dev
->
base_addr
+
TLAN_DIO_ADR
);
sio
=
dev
->
base_addr
+
TLAN_DIO_DATA
+
TLAN_NET_SIO
;
if
(
dev
->
interrupt
==
0
)
cli
(
);
spin_lock_irqsave
(
&
priv
->
lock
,
flags
);
dev
->
interrupt
++
;
TLan_MiiSync
(
dev
->
base_addr
);
...
...
@@ -2636,7 +2650,7 @@ void TLan_MiiWriteReg( struct net_device *dev, u16 phy, u16 reg, u16 val )
dev
->
interrupt
--
;
if
(
dev
->
interrupt
==
0
)
s
ti
(
);
s
pin_unlock_irqrestore
(
&
priv
->
lock
,
flags
);
}
/* TLan_MiiWriteReg */
...
...
@@ -2834,29 +2848,41 @@ void TLan_EeReceiveByte( u16 io_base, u8 *data, int stop )
int
TLan_EeReadByte
(
struct
net_device
*
dev
,
u8
ee_addr
,
u8
*
data
)
{
int
err
;
TLanPrivateInfo
*
priv
=
(
TLanPrivateInfo
*
)
dev
->
priv
;
unsigned
long
flags
;
int
ret
=
0
;
if
(
dev
->
interrupt
==
0
)
cli
(
);
spin_lock_irqsave
(
&
priv
->
lock
,
flags
);
dev
->
interrupt
++
;
TLan_EeSendStart
(
dev
->
base_addr
);
err
=
TLan_EeSendByte
(
dev
->
base_addr
,
0xA0
,
TLAN_EEPROM_ACK
);
if
(
err
)
return
1
;
{
ret
=
1
;
goto
fail
;
}
err
=
TLan_EeSendByte
(
dev
->
base_addr
,
ee_addr
,
TLAN_EEPROM_ACK
);
if
(
err
)
return
2
;
{
ret
=
2
;
goto
fail
;
}
TLan_EeSendStart
(
dev
->
base_addr
);
err
=
TLan_EeSendByte
(
dev
->
base_addr
,
0xA1
,
TLAN_EEPROM_ACK
);
if
(
err
)
return
3
;
{
ret
=
3
;
goto
fail
;
}
TLan_EeReceiveByte
(
dev
->
base_addr
,
data
,
TLAN_EEPROM_STOP
);
fail:
dev
->
interrupt
--
;
if
(
dev
->
interrupt
==
0
)
s
ti
(
);
s
pin_unlock_irqrestore
(
&
priv
->
lock
,
flags
);
return
0
;
return
ret
;
}
/* TLan_EeReadByte */
...
...
drivers/net/tlan.h
View file @
e4077388
...
...
@@ -187,6 +187,7 @@ typedef struct tlan_private_tag {
u8
tlanRev
;
u8
tlanFullDuplex
;
char
devName
[
8
];
spinlock_t
lock
;
}
TLanPrivateInfo
;
...
...
drivers/scsi/53c8xx_d.h
View file @
e4077388
/* DO NOT EDIT - Generated automatically by script_asm.pl */
static
u32
SCRIPT
[]
=
{
/*
...
...
drivers/scsi/g_NCR5380.c
View file @
e4077388
...
...
@@ -304,6 +304,7 @@ int __init generic_NCR5380_detect(Scsi_Host_Template * tpnt){
break
;
}
#ifdef CONFIG_SCSI_G_NCR5380_PORT
if
(
ports
)
{
/* wakeup sequence for the NCR53C400A and DTC3181E*/
...
...
@@ -343,7 +344,13 @@ int __init generic_NCR5380_detect(Scsi_Host_Template * tpnt){
request_region
(
overrides
[
current_override
].
NCR5380_map_name
,
NCR5380_region_size
,
"ncr5380"
);
#else
if
(
check_mem_region
(
overrides
[
current_override
].
NCR5380_map_name
,
NCR5380_region_size
))
continue
;
request_mem_region
(
overrides
[
current_override
].
NCR5380_map_name
,
NCR5380_region_size
,
"ncr5380"
);
#endif
instance
=
scsi_register
(
tpnt
,
sizeof
(
struct
NCR5380_hostdata
));
instance
->
NCR5380_instance_name
=
overrides
[
current_override
].
NCR5380_map_name
;
...
...
@@ -393,7 +400,11 @@ int generic_NCR5380_release_resources(struct Scsi_Host * instance)
NCR5380_setup
(
instance
);
#ifdef CONFIG_SCSI_G_NCR5380_PORT
release_region
(
instance
->
NCR5380_instance_name
,
NCR5380_region_size
);
#else
release_mem_region
(
instance
->
NCR5380_instance_name
,
NCR5380_region_size
);
#endif
if
(
instance
->
irq
!=
IRQ_NONE
)
free_irq
(
instance
->
irq
,
NULL
);
...
...
drivers/scsi/g_NCR5380.h
View file @
e4077388
...
...
@@ -123,7 +123,7 @@ int generic_NCR5380_proc_info(char* buffer, char** start, off_t offset, int leng
#define NCR5380_map_config memory
#define NCR5380_map_type
volatile unsigned char*
#define NCR5380_map_type
unsigned long
#define NCR5380_map_name base
...
...
drivers/scsi/ide-scsi.c
View file @
e4077388
...
...
@@ -602,11 +602,14 @@ int idescsi_detect (Scsi_Host_Template *host_template)
{
struct
Scsi_Host
*
host
;
int
id
;
int
last_lun
=
0
;
host_template
->
proc_name
=
"ide-scsi"
;
host
=
scsi_register
(
host_template
,
0
);
for
(
id
=
0
;
id
<
MAX_HWIFS
*
MAX_DRIVES
&&
idescsi_drives
[
id
];
id
++
);
for
(
id
=
0
;
id
<
MAX_HWIFS
*
MAX_DRIVES
&&
idescsi_drives
[
id
];
id
++
)
last_lun
=
IDE_MAX
(
last_lun
,
idescsi_drives
[
id
]
->
last_lun
);
host
->
max_id
=
id
;
host
->
max_lun
=
last_lun
+
1
;
host
->
can_queue
=
host
->
cmd_per_lun
*
id
;
return
1
;
}
...
...
drivers/scsi/sim710_d.h
View file @
e4077388
/* DO NOT EDIT - Generated automatically by script_asm.pl */
static
u32
SCRIPT
[]
=
{
/*
...
...
drivers/sound/mad16.c
View file @
e4077388
...
...
@@ -14,6 +14,7 @@
*
* OPTi 82C928 MAD16 (replaced by C929)
* OAK OTI-601D Mozart
* OAK OTI-605 Mozart (later version with MPU401 Midi)
* OPTi 82C929 MAD16 Pro
* OPTi 82C930
* OPTi 82C924
...
...
@@ -22,8 +23,9 @@
* connect some other components (OPL-[234] and a WSS compatible codec)
* to the PC bus and perform I/O, DMA and IRQ address decoding. There is
* also a UART for the MPU-401 mode (not 82C928/Mozart).
* The Mozart chip appears to be compatible with the 82C928 (can anybody
* confirm this?).
* The Mozart chip appears to be compatible with the 82C928, although later
* issues of the card, using the OTI-605 chip, have an MPU-401 compatable Midi
* port. This port is configured differently to that of the OPTi audio chips.
*
* NOTE! If you want to set CD-ROM address and/or joystick enable, define
* MAD16_CONF in local.h as combination of the following bits:
...
...
@@ -66,7 +68,10 @@
* Fixed bug. 16-Jun-1998
*
* Torsten Duwe Made Opti924 PnP support non-destructive
* 1998-12-23
* 23-Dec-1998
*
* Paul Grayson Added support for Midi on later Mozart cards.
* 25-Nov-1999
*/
#include "sound_config.h"
...
...
@@ -719,8 +724,6 @@ void attach_mad16(struct address_info *hw_config)
void
attach_mad16_mpu
(
struct
address_info
*
hw_config
)
{
if
(
board_type
<
C929
)
/* Early chip. No MPU support. Just SB MIDI */
{
#if defined(CONFIG_MIDI) && defined(CONFIG_MAD16_OLDCARD)
if
(
mad_read
(
MC1_PORT
)
&
0x20
)
...
...
@@ -730,18 +733,15 @@ void attach_mad16_mpu(struct address_info *hw_config)
hw_config
->
name
=
"Mad16/Mozart"
;
sb_dsp_init
(
hw_config
);
return
;
#endif
return
;
}
#if defined(CONFIG_UART401) && defined(CONFIG_MIDI)
if
(
!
already_initialized
)
return
;
hw_config
->
driver_use_1
=
SB_MIDI_ONLY
;
hw_config
->
name
=
"Mad16/Mozart"
;
attach_uart401
(
hw_config
);
#endif
}
int
probe_mad16_mpu
(
struct
address_info
*
hw_config
)
...
...
@@ -802,7 +802,60 @@ int probe_mad16_mpu(struct address_info *hw_config)
hw_config
->
driver_use_1
=
SB_MIDI_ONLY
;
return
sb_dsp_detect
(
hw_config
,
0
,
0
);
#else
/* assuming all later Mozart cards are identified as
* either 82C928 or Mozart. If so, following code attempts
* to set MPU register. TODO - add probing
*/
unsigned
char
tmp
;
tmp
=
mad_read
(
MC8_PORT
);
switch
(
hw_config
->
irq
)
{
case
5
:
tmp
|=
0x08
;
break
;
case
7
:
tmp
|=
0x10
;
break
;
case
9
:
tmp
|=
0x18
;
break
;
case
10
:
tmp
|=
0x20
;
break
;
case
11
:
tmp
|=
0x28
;
break
;
default:
printk
(
KERN_ERR
"mad16/MOZART: invalid mpu_irq
\n
"
);
return
0
;
}
switch
(
hw_config
->
io_base
)
{
case
0x300
:
tmp
|=
0x01
;
break
;
case
0x310
:
tmp
|=
0x03
;
break
;
case
0x320
:
tmp
|=
0x05
;
break
;
case
0x330
:
tmp
|=
0x07
;
break
;
default:
printk
(
KERN_ERR
"mad16/MOZART: invalid mpu_io
\n
"
);
return
0
;
}
mad_write
(
MC8_PORT
,
tmp
);
/* write MPU port parameters */
return
probe_uart401
(
hw_config
);
#endif
}
tmp
=
mad_read
(
MC6_PORT
)
&
0x83
;
...
...
drivers/sound/sb_ess.c
View file @
e4077388
...
...
@@ -40,10 +40,12 @@
* recording problems for high samplerates. I
* fixed this by removing ess_calc_best_speed ()
* and just doing what the documentation says.
* Andy Sloane
(June 4 1999):
Stole some code from ALSA to fix the playback
* Andy Sloane
(Jun 4 1999):
Stole some code from ALSA to fix the playback
* andy@guildsoftware.com speed on ES1869, ES1879, ES1887, and ES1888.
* 1879's were previously ignored by this driver;
* added (untested) support for those.
* Cvetan Ivanov (Oct 27 1999): Fixed ess_dsp_init to call ess_set_dma_hw for
* zezo@inet.bg _ALL_ ESS models, not only ES1887
*
* This files contains ESS chip specifics. It's based on the existing ESS
* handling as it resided in sb_common.c, sb_mixer.c and sb_audio.c. This
...
...
@@ -52,7 +54,7 @@
* - RECLEV support for ES1688 and later
* - 6 bits playback level support chips later than ES1688
* - Recording level support on a per-device basis for ES1887
* - Full-Duplex for ES1887
(under development)
* - Full-Duplex for ES1887
*
* Full duplex is enabled by specifying dma16. While the normal dma must
* be one of 0, 1 or 3, dma16 can be one of 0, 1, 3 or 5. DMA 5 is a 16 bit
...
...
@@ -100,7 +102,7 @@
* of writing 0x00 to 0x7f (which should be done by reset): The ES1887 moves
* into ES1888 mode. This means that it claims IRQ 11, which happens to be my
* ISDN adapter. Needless to say it no longer worked. I now understand why
* after rebooting 0x7f already was 0x05, the value of my choi
s
e: the BIOS
* after rebooting 0x7f already was 0x05, the value of my choi
c
e: the BIOS
* did it.
*
* Oh, and this is another trap: in ES1887 docs mixer register 0x70 is decribed
...
...
@@ -1200,10 +1202,10 @@ FKS_test (devc);
/* AAS: info stolen from ALSA: these boards have different clocks */
switch
(
devc
->
submodel
)
{
/* APPARENTLY NOT 1869
/* APPARENTLY NOT 1869
AND 1887
case SUBMDL_ES1869:
*/
case SUBMDL_ES1887:
*/
case
SUBMDL_ES1888
:
devc
->
caps
|=
SB_CAP_ES18XX_RATE
;
break
;
...
...
@@ -1304,6 +1306,13 @@ printk(KERN_INFO "ess_set_dma_hw: dma8=%d,dma16=%d,dup=%d\n"
*/
int
ess_dsp_init
(
sb_devc
*
devc
,
struct
address_info
*
hw_config
)
{
/*
* Caller also checks this, but anyway
*/
if
(
devc
->
model
!=
MDL_ESS
)
{
printk
(
KERN_INFO
"ess_dsp_init for non ESS chip
\n
"
);
return
1
;
}
/*
* This for ES1887 to run Full Duplex. Actually ES1888
* is allowed to do so too. I have no idea yet if this
...
...
@@ -1324,15 +1333,12 @@ int ess_dsp_init (sb_devc *devc, struct address_info *hw_config)
if
(
devc
->
dma8
!=
devc
->
dma16
&&
devc
->
dma16
!=
-
1
)
{
devc
->
duplex
=
1
;
}
}
if
(
!
ess_set_dma_hw
(
devc
))
{
free_irq
(
devc
->
irq
,
devc
);
return
0
;
}
return
1
;
}
else
{
return
-
1
;
}
}
/****************************************************************************
...
...
fs/Config.in
View file @
e4077388
...
...
@@ -88,6 +88,10 @@ if [ "$CONFIG_INET" = "y" ]; then
if [ "$CONFIG_NFSD" != "n" ]; then
bool ' Emulate SUN NFS server' CONFIG_NFSD_SUN
fi
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
bool ' Provide NFSv3 server support (EXPERIMENTAL)' CONFIG_NFSD_V3
fi
if [ "$CONFIG_NFS_FS" = "y" -o "$CONFIG_NFSD" = "y" ]; then
define_tristate CONFIG_SUNRPC y
define_tristate CONFIG_LOCKD y
...
...
fs/nfsd/Makefile
View file @
e4077388
...
...
@@ -11,6 +11,9 @@ O_TARGET := nfsd.o
O_OBJS
:=
nfssvc.o nfsctl.o nfsproc.o nfsfh.o vfs.o
\
export.o auth.o lockd.o nfscache.o nfsxdr.o
\
stats.o
ifdef
CONFIG_NFSD_V3
O_OBJS
+=
nfs3proc.o nfs3xdr.o
endif
M_OBJS
:=
$(O_TARGET)
...
...
fs/nfsd/nfs3proc.c
View file @
e4077388
This diff is collapsed.
Click to expand it.
fs/nfsd/nfs3xdr.c
View file @
e4077388
This diff is collapsed.
Click to expand it.
fs/nfsd/nfsproc.c
View file @
e4077388
...
...
@@ -390,7 +390,8 @@ nfsd_proc_symlink(struct svc_rqst *rqstp, struct nfsd_symlinkargs *argp,
*/
nfserr
=
nfsd_symlink
(
rqstp
,
&
argp
->
ffh
,
argp
->
fname
,
argp
->
flen
,
argp
->
tname
,
argp
->
tlen
,
&
newfh
);
&
newfh
,
&
argp
->
attrs
);
if
(
!
nfserr
)
{
argp
->
attrs
.
ia_valid
&=
~
ATTR_SIZE
;
nfserr
=
nfsd_setattr
(
rqstp
,
&
newfh
,
&
argp
->
attrs
);
...
...
@@ -469,7 +470,8 @@ nfsd_proc_readdir(struct svc_rqst *rqstp, struct nfsd_readdirargs *argp,
/* Read directory and encode entries on the fly */
nfserr
=
nfsd_readdir
(
rqstp
,
&
argp
->
fh
,
(
loff_t
)
argp
->
cookie
,
nfssvc_encode_entry
,
buffer
,
&
count
);
nfssvc_encode_entry
,
buffer
,
&
count
,
NULL
);
resp
->
count
=
count
;
fh_put
(
&
argp
->
fh
);
...
...
@@ -549,6 +551,8 @@ nfserrno (int errno)
{
NFSERR_NXIO
,
ENXIO
},
{
NFSERR_ACCES
,
EACCES
},
{
NFSERR_EXIST
,
EEXIST
},
{
NFSERR_XDEV
,
EXDEV
},
{
NFSERR_MLINK
,
EMLINK
},
{
NFSERR_NODEV
,
ENODEV
},
{
NFSERR_NOTDIR
,
ENOTDIR
},
{
NFSERR_ISDIR
,
EISDIR
},
...
...
@@ -556,6 +560,7 @@ nfserrno (int errno)
{
NFSERR_FBIG
,
EFBIG
},
{
NFSERR_NOSPC
,
ENOSPC
},
{
NFSERR_ROFS
,
EROFS
},
{
NFSERR_MLINK
,
EMLINK
},
{
NFSERR_NAMETOOLONG
,
ENAMETOOLONG
},
{
NFSERR_NOTEMPTY
,
ENOTEMPTY
},
#ifdef EDQUOT
...
...
fs/nfsd/nfssvc.c
View file @
e4077388
...
...
@@ -226,8 +226,20 @@ nfsd_dispatch(struct svc_rqst *rqstp, u32 *statp)
svc_putlong
(
&
rqstp
->
rq_resbuf
,
nfserr
);
/* Encode result.
* F
IXME: Most NFSv3 calls return wcc data even when the call failed
* F
or NFSv2, additional info is never returned in case of an error.
*/
#ifdef CONFIG_NFSD_V3
if
(
!
(
nfserr
&&
rqstp
->
rq_vers
==
2
))
{
xdr
=
proc
->
pc_encode
;
if
(
xdr
&&
!
xdr
(
rqstp
,
rqstp
->
rq_resbuf
.
buf
,
rqstp
->
rq_resp
))
{
/* Failed to encode result. Release cache entry */
dprintk
(
"nfsd: failed to encode result!
\n
"
);
nfsd_cache_update
(
rqstp
,
RC_NOCACHE
,
NULL
);
*
statp
=
rpc_system_err
;
return
1
;
}
}
#else
xdr
=
proc
->
pc_encode
;
if
(
!
nfserr
&&
xdr
&&
!
xdr
(
rqstp
,
rqstp
->
rq_resbuf
.
buf
,
rqstp
->
rq_resp
))
{
...
...
@@ -237,6 +249,7 @@ nfsd_dispatch(struct svc_rqst *rqstp, u32 *statp)
*
statp
=
rpc_system_err
;
return
1
;
}
#endif
/* CONFIG_NFSD_V3 */
/* Store reply in cache. */
nfsd_cache_update
(
rqstp
,
proc
->
pc_cachetype
,
statp
+
1
);
...
...
@@ -246,16 +259,16 @@ nfsd_dispatch(struct svc_rqst *rqstp, u32 *statp)
static
struct
svc_version
nfsd_version2
=
{
2
,
18
,
nfsd_procedures2
,
nfsd_dispatch
};
#ifdef CONFIG_NFSD_
NFS
3
#ifdef CONFIG_NFSD_
V
3
static
struct
svc_version
nfsd_version3
=
{
3
,
2
3
,
nfsd_procedures3
,
nfsd_dispatch
3
,
2
2
,
nfsd_procedures3
,
nfsd_dispatch
};
#endif
static
struct
svc_version
*
nfsd_version
[]
=
{
NULL
,
NULL
,
&
nfsd_version2
,
#ifdef CONFIG_NFSD_
NFS
3
#ifdef CONFIG_NFSD_
V
3
&
nfsd_version3
,
#endif
};
...
...
fs/nfsd/vfs.c
View file @
e4077388
This diff is collapsed.
Click to expand it.
include/linux/ide.h
View file @
e4077388
...
...
@@ -299,6 +299,8 @@ typedef struct ide_drive_s {
thresholds_t
smart_thresholds
;
values_t
smart_values
;
#endif
int
last_lun
;
/* last logical unit */
int
forced_lun
;
/* if hdxlun was given at boot */
}
ide_drive_t
;
/*
...
...
include/linux/nfsd/nfsd.h
View file @
e4077388
...
...
@@ -4,7 +4,7 @@
* Hodge-podge collection of knfsd-related stuff.
* I will sort this out later.
*
* Copyright (C) 1995 Olaf Kirch <okir@monad.swb.de>
* Copyright (C) 1995
-1997
Olaf Kirch <okir@monad.swb.de>
*/
#ifndef LINUX_NFSD_NFSD_H
...
...
@@ -61,6 +61,9 @@ typedef int (*nfsd_dirop_t)(struct inode *, struct dentry *, int, int);
* Procedure table for NFSv2
*/
extern
struct
svc_procedure
nfsd_procedures2
[];
#ifdef CONFIG_NFSD_V3
extern
struct
svc_procedure
nfsd_procedures3
[];
#endif
/* CONFIG_NFSD_V3 */
extern
struct
svc_program
nfsd_program
;
/*
...
...
@@ -74,11 +77,20 @@ void nfsd_racache_init(void);
void
nfsd_racache_shutdown
(
void
);
int
nfsd_lookup
(
struct
svc_rqst
*
,
struct
svc_fh
*
,
const
char
*
,
int
,
struct
svc_fh
*
);
#ifdef CONFIG_NFSD_V3
int
nfsd_access
(
struct
svc_rqst
*
,
struct
svc_fh
*
,
u32
*
);
#endif
/* CONFIG_NFSD_V3 */
int
nfsd_setattr
(
struct
svc_rqst
*
,
struct
svc_fh
*
,
struct
iattr
*
);
int
nfsd_create
(
struct
svc_rqst
*
,
struct
svc_fh
*
,
char
*
name
,
int
len
,
struct
iattr
*
attrs
,
int
type
,
dev_t
rdev
,
struct
svc_fh
*
res
);
#ifdef CONFIG_NFSD_V3
int
nfsd_create_v3
(
struct
svc_rqst
*
,
struct
svc_fh
*
,
char
*
name
,
int
len
,
struct
iattr
*
attrs
,
struct
svc_fh
*
res
,
int
createmode
,
u32
*
verifier
);
#endif
/* CONFIG_NFSD_V3 */
int
nfsd_open
(
struct
svc_rqst
*
,
struct
svc_fh
*
,
int
,
int
,
struct
file
*
);
void
nfsd_close
(
struct
file
*
);
...
...
@@ -90,7 +102,7 @@ int nfsd_readlink(struct svc_rqst *, struct svc_fh *,
char
*
,
int
*
);
int
nfsd_symlink
(
struct
svc_rqst
*
,
struct
svc_fh
*
,
char
*
name
,
int
len
,
char
*
path
,
int
plen
,
struct
svc_fh
*
res
);
struct
svc_fh
*
res
,
struct
iattr
*
);
int
nfsd_link
(
struct
svc_rqst
*
,
struct
svc_fh
*
,
char
*
,
int
,
struct
svc_fh
*
);
int
nfsd_rename
(
struct
svc_rqst
*
,
...
...
@@ -104,9 +116,13 @@ int nfsd_truncate(struct svc_rqst *, struct svc_fh *,
unsigned
long
size
);
int
nfsd_readdir
(
struct
svc_rqst
*
,
struct
svc_fh
*
,
loff_t
,
encode_dent_fn
,
u32
*
buffer
,
int
*
countp
);
u32
*
buffer
,
int
*
countp
,
u32
*
verf
);
int
nfsd_statfs
(
struct
svc_rqst
*
,
struct
svc_fh
*
,
struct
statfs
*
);
#ifdef CONFIG_NFSD_V3
int
nfsd_commit
(
struct
svc_rqst
*
,
struct
svc_fh
*
,
off_t
,
unsigned
long
);
#endif
/* CONFIG_NFSD_V3 */
int
nfsd_notify_change
(
struct
inode
*
,
struct
iattr
*
);
int
nfsd_permission
(
struct
svc_export
*
,
struct
dentry
*
,
int
);
...
...
include/linux/nfsd/nfsfh.h
View file @
e4077388
...
...
@@ -86,8 +86,33 @@ typedef struct svc_fh {
struct
knfs_fh
fh_handle
;
/* FH data */
struct
dentry
*
fh_dentry
;
/* validated dentry */
struct
svc_export
*
fh_export
;
/* export pointer */
#ifdef CONFIG_NFSD_V3
unsigned
char
fh_post_saved
;
/* post-op attrs saved */
unsigned
char
fh_pre_saved
;
/* pre-op attrs saved */
#endif
/* CONFIG_NFSD_V3 */
unsigned
char
fh_locked
;
/* inode locked by us */
unsigned
char
fh_dverified
;
/* dentry has been checked */
#ifdef CONFIG_NFSD_V3
/* Pre-op attributes saved during fh_lock */
__u64
fh_pre_size
;
/* size before operation */
time_t
fh_pre_mtime
;
/* mtime before oper */
time_t
fh_pre_ctime
;
/* ctime before oper */
/* Post-op attributes saved in fh_unlock */
umode_t
fh_post_mode
;
/* i_mode */
nlink_t
fh_post_nlink
;
/* i_nlink */
uid_t
fh_post_uid
;
/* i_uid */
gid_t
fh_post_gid
;
/* i_gid */
__u64
fh_post_size
;
/* i_size */
unsigned
long
fh_post_blocks
;
/* i_blocks */
unsigned
long
fh_post_blksize
;
/* i_blksize */
kdev_t
fh_post_rdev
;
/* i_rdev */
time_t
fh_post_atime
;
/* i_atime */
time_t
fh_post_mtime
;
/* i_mtime */
time_t
fh_post_ctime
;
/* i_ctime */
#endif
/* CONFIG_NFSD_V3 */
}
svc_fh
;
/*
...
...
@@ -128,6 +153,53 @@ fh_init(struct svc_fh *fhp)
return
fhp
;
}
#ifdef CONFIG_NFSD_V3
/*
* Fill in the pre_op attr for the wcc data
*/
static
inline
void
fill_pre_wcc
(
struct
svc_fh
*
fhp
)
{
struct
inode
*
inode
;
inode
=
fhp
->
fh_dentry
->
d_inode
;
if
(
!
fhp
->
fh_pre_saved
)
{
fhp
->
fh_pre_mtime
=
inode
->
i_mtime
;
fhp
->
fh_pre_ctime
=
inode
->
i_ctime
;
fhp
->
fh_pre_size
=
inode
->
i_size
;
fhp
->
fh_pre_saved
=
1
;
}
fhp
->
fh_locked
=
1
;
}
/*
* Fill in the post_op attr for the wcc data
*/
static
inline
void
fill_post_wcc
(
struct
svc_fh
*
fhp
)
{
struct
inode
*
inode
=
fhp
->
fh_dentry
->
d_inode
;
if
(
fhp
->
fh_post_saved
)
printk
(
"nfsd: inode locked twice during operation.
\n
"
);
fhp
->
fh_post_mode
=
inode
->
i_mode
;
fhp
->
fh_post_nlink
=
inode
->
i_nlink
;
fhp
->
fh_post_uid
=
inode
->
i_uid
;
fhp
->
fh_post_gid
=
inode
->
i_gid
;
fhp
->
fh_post_size
=
inode
->
i_size
;
fhp
->
fh_post_blksize
=
inode
->
i_blksize
;
fhp
->
fh_post_blocks
=
inode
->
i_blocks
;
fhp
->
fh_post_rdev
=
inode
->
i_rdev
;
fhp
->
fh_post_atime
=
inode
->
i_atime
;
fhp
->
fh_post_mtime
=
inode
->
i_mtime
;
fhp
->
fh_post_ctime
=
inode
->
i_ctime
;
fhp
->
fh_post_saved
=
1
;
fhp
->
fh_locked
=
0
;
}
#endif
/* CONFIG_NFSD_V3 */
/*
* Lock a file handle/inode
*/
...
...
@@ -152,7 +224,11 @@ fh_lock(struct svc_fh *fhp)
inode
=
dentry
->
d_inode
;
down
(
&
inode
->
i_sem
);
#ifdef CONFIG_NFSD_V3
fill_pre_wcc
(
fhp
);
#else
fhp
->
fh_locked
=
1
;
#endif
/* CONFIG_NFSD_V3 */
}
/*
...
...
@@ -165,11 +241,16 @@ fh_unlock(struct svc_fh *fhp)
printk
(
KERN_ERR
"fh_unlock: fh not verified!
\n
"
);
if
(
fhp
->
fh_locked
)
{
#ifdef CONFIG_NFSD_V3
fill_post_wcc
(
fhp
);
up
(
&
fhp
->
fh_dentry
->
d_inode
->
i_sem
);
#else
struct
dentry
*
dentry
=
fhp
->
fh_dentry
;
struct
inode
*
inode
=
dentry
->
d_inode
;
fhp
->
fh_locked
=
0
;
up
(
&
inode
->
i_sem
);
#endif
/* CONFIG_NFSD_V3 */
}
}
#endif
/* __KERNEL__ */
...
...
include/linux/nfsd/xdr3.h
View file @
e4077388
...
...
@@ -3,17 +3,18 @@
*
* XDR types for NFSv3 in nfsd.
*
* Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de>
* Copyright (C) 1996
-1998
, Olaf Kirch <okir@monad.swb.de>
*/
#ifndef LINUX_NFSD_XDR3_H
#define LINUX_NFSD_XDR3_H
#ifndef
_
LINUX_NFSD_XDR3_H
#define
_
LINUX_NFSD_XDR3_H
#include <linux/nfsd/xdr.h>
struct
nfsd3_sattrargs
{
struct
svc_fh
fh
;
struct
iattr
attrs
;
int
check_guard
;
time_t
guardtime
;
};
...
...
@@ -88,7 +89,7 @@ struct nfsd3_symlinkargs {
struct
nfsd3_readdirargs
{
struct
svc_fh
fh
;
__u
32
cookie
;
__u
64
cookie
;
__u32
dircount
;
__u32
count
;
__u32
*
verf
;
...
...
@@ -97,7 +98,7 @@ struct nfsd3_readdirargs {
struct
nfsd3_commitargs
{
struct
svc_fh
fh
;
__u64
offset
;
__u
64
count
;
__u
32
count
;
};
struct
nfsd3_attrstat
{
...
...
@@ -105,7 +106,8 @@ struct nfsd3_attrstat {
struct
svc_fh
fh
;
};
struct
nfsd3_lookupres
{
/* LOOKUP, CREATE, MKDIR, SYMLINK, MKNOD */
struct
nfsd3_diropres
{
__u32
status
;
struct
svc_fh
dirfh
;
struct
svc_fh
fh
;
...
...
@@ -137,12 +139,6 @@ struct nfsd3_writeres {
int
committed
;
};
struct
nfsd3_createres
{
__u32
status
;
struct
svc_fh
dirfh
;
struct
svc_fh
fh
;
};
struct
nfsd3_renameres
{
__u32
status
;
struct
svc_fh
ffh
;
...
...
@@ -158,10 +154,11 @@ struct nfsd3_linkres {
struct
nfsd3_readdirres
{
__u32
status
;
struct
svc_fh
fh
;
__u32
*
list_end
;
int
count
;
__u32
verf
[
2
];
};
struct
nfsd3_
statfs
res
{
struct
nfsd3_
fsstat
res
{
__u32
status
;
struct
statfs
stats
;
__u32
invarsec
;
...
...
@@ -184,6 +181,8 @@ struct nfsd3_pathconfres {
__u32
status
;
__u32
p_link_max
;
__u32
p_name_max
;
__u32
p_no_trunc
;
__u32
p_chown_restricted
;
__u32
p_case_insensitive
;
__u32
p_case_preserving
;
};
...
...
@@ -194,7 +193,7 @@ struct nfsd3_commitres {
};
/* dummy type for release */
struct
nfsd3_fhandle
2
{
struct
nfsd3_fhandle
_pair
{
__u32
dummy
;
struct
svc_fh
fh1
;
struct
svc_fh
fh2
;
...
...
@@ -213,16 +212,15 @@ union nfsd3_xdrstore {
struct
nfsd3_linkargs
linkargs
;
struct
nfsd3_symlinkargs
symlinkargs
;
struct
nfsd3_readdirargs
readdirargs
;
struct
nfsd3_
lookupres
looku
pres
;
struct
nfsd3_
diropres
diro
pres
;
struct
nfsd3_accessres
accessres
;
struct
nfsd3_readlinkres
readlinkres
;
struct
nfsd3_readres
readres
;
struct
nfsd3_writeres
writeres
;
struct
nfsd3_createres
createres
;
struct
nfsd3_renameres
renameres
;
struct
nfsd3_linkres
linkres
;
struct
nfsd3_readdirres
readdirres
;
struct
nfsd3_
statfsres
statfs
res
;
struct
nfsd3_
fsstatres
fsstat
res
;
struct
nfsd3_fsinfores
fsinfores
;
struct
nfsd3_pathconfres
pathconfres
;
struct
nfsd3_commitres
commitres
;
...
...
@@ -230,39 +228,87 @@ union nfsd3_xdrstore {
#define NFS3_SVC_XDRSIZE sizeof(union nfsd3_xdrstore)
void
nfsxdr_init
(
void
);
int
nfs3svc_decode_fhandle
(
struct
svc_rqst
*
,
u32
*
,
struct
svc_fh
*
);
int
nfs3svc_decode_sattr
3
args
(
struct
svc_rqst
*
,
u32
*
,
int
nfs3svc_decode_sattrargs
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd3_sattrargs
*
);
int
nfs3svc_decode_dirop
3
args
(
struct
svc_rqst
*
,
u32
*
,
int
nfs3svc_decode_diropargs
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd3_diropargs
*
);
int
nfs3svc_decode_read3args
(
struct
svc_rqst
*
,
u32
*
,
int
nfs3svc_decode_accessargs
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd3_accessargs
*
);
int
nfs3svc_decode_readargs
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd3_readargs
*
);
int
nfs3svc_decode_write
3
args
(
struct
svc_rqst
*
,
u32
*
,
int
nfs3svc_decode_writeargs
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd3_writeargs
*
);
int
nfs3svc_decode_create3args
(
struct
svc_rqst
*
,
u32
*
,
int
nfs3svc_decode_createargs
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd3_createargs
*
);
int
nfs3svc_decode_mkdirargs
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd3_createargs
*
);
int
nfs3svc_decode_rename3args
(
struct
svc_rqst
*
,
u32
*
,
int
nfs3svc_decode_mknodargs
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd3_mknodargs
*
);
int
nfs3svc_decode_renameargs
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd3_renameargs
*
);
int
nfs3svc_decode_link
3
args
(
struct
svc_rqst
*
,
u32
*
,
int
nfs3svc_decode_linkargs
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd3_linkargs
*
);
int
nfs3svc_decode_symlink
3
args
(
struct
svc_rqst
*
,
u32
*
,
int
nfs3svc_decode_symlinkargs
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd3_symlinkargs
*
);
int
nfs3svc_decode_readdir
3
args
(
struct
svc_rqst
*
,
u32
*
,
int
nfs3svc_decode_readdirargs
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd3_readdirargs
*
);
int
nfs3svc_decode_readdirplusargs
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd3_readdirargs
*
);
int
nfs3svc_decode_commitargs
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd3_commitargs
*
);
int
nfs3svc_encode_voidres
(
struct
svc_rqst
*
,
u32
*
,
void
*
);
int
nfs3svc_encode_attrstat
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd3_attrstat
*
);
int
nfs3svc_encode_wccstat
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd3_attrstat
*
);
int
nfs3svc_encode_diropres
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd3_diropres
*
);
int
nfs3svc_encode_accessres
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd3_accessres
*
);
int
nfs3svc_encode_readlinkres
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd3_readlinkres
*
);
int
nfs3svc_encode_readres
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd3_readres
*
);
int
nfs3svc_encode_statfsres
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd3_statfsres
*
);
int
nfs3svc_encode_writeres
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd3_writeres
*
);
int
nfs3svc_encode_createres
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd3_diropres
*
);
int
nfs3svc_encode_renameres
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd3_renameres
*
);
int
nfs3svc_encode_linkres
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd3_linkres
*
);
int
nfs3svc_encode_readdirres
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd3_readdirres
*
);
int
nfs3svc_encode_fsstatres
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd3_fsstatres
*
);
int
nfs3svc_encode_fsinfores
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd3_fsinfores
*
);
int
nfs3svc_encode_pathconfres
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd3_pathconfres
*
);
int
nfs3svc_encode_commitres
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd3_commitres
*
);
int
nfs3svc_release_fhandle
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd
_fhandle
*
);
struct
nfsd
3_attrstat
*
);
int
nfs3svc_release_fhandle2
(
struct
svc_rqst
*
,
u32
*
,
struct
nfsd3_fhandle
2
*
);
struct
nfsd3_fhandle
_pair
*
);
int
nfs3svc_encode_entry
(
struct
readdir_cd
*
,
const
char
*
name
,
int
namlen
,
unsigned
long
offset
,
ino_t
ino
);
int
namlen
,
off_t
offset
,
ino_t
ino
);
int
nfs3svc_encode_entry_plus
(
struct
readdir_cd
*
,
const
char
*
name
,
int
namlen
,
off_t
offset
,
ino_t
ino
);
#ifdef __KERNEL__
/*
* This is needed in nfs_readdir for encoding NFS3 directory cookies.
*/
static
inline
u32
*
enc64
(
u32
*
p
,
u64
val
)
{
*
p
++
=
htonl
(
val
>>
32
);
*
p
++
=
htonl
(
val
&
0xffffffff
);
return
p
;
}
#endif
/* __KERNEL__ */
#endif
/* LINUX_NFSD_XDR3_H */
#endif
/*
_
LINUX_NFSD_XDR3_H */
mm/swapfile.c
View file @
e4077388
...
...
@@ -106,13 +106,11 @@ swp_entry_t __get_swap_page(unsigned short count)
offset
=
scan_swap_map
(
p
,
count
);
swap_device_unlock
(
p
);
if
(
offset
)
{
int
curtp
=
type
;
entry
=
SWP_ENTRY
(
type
,
offset
);
type
=
swap_info
[
type
].
next
;
if
(
type
<
0
||
p
->
prio
!=
swap_info
[
type
].
prio
)
{
swap_list
.
next
=
curtp
;
swap_list
.
next
=
swap_list
.
head
;
}
else
{
swap_list
.
next
=
type
;
}
...
...
net/decnet/Makefile
View file @
e4077388
...
...
@@ -16,9 +16,7 @@ ifeq ($(CONFIG_DECNET_FW),y)
O_OBJS
+=
dn_fw.o
endif
ifeq
($(CONFIG_SYSCTL),y)
O_OBJS
+=
sysctl_net_decnet.o
endif
include
$(TOPDIR)/Rules.make
...
...
net/decnet/dn_dev.c
View file @
e4077388
...
...
@@ -291,7 +291,15 @@ static void dn_dev_sysctl_unregister(struct dn_dev_parms *parms)
kfree
(
t
);
}
}
#endif
#else
/* CONFIG_SYSCTL */
static
void
dn_dev_sysctl_unregister
(
struct
dn_dev_parms
*
parms
)
{
}
static
void
dn_dev_sysctl_register
(
struct
net_device
*
dev
,
struct
dn_dev_parms
*
parms
)
{
}
#endif
/* CONFIG_SYSCTL */
static
struct
dn_ifaddr
*
dn_dev_alloc_ifa
(
void
)
{
...
...
net/decnet/sysctl_net_decnet.c
View file @
e4077388
...
...
@@ -32,6 +32,8 @@ int decnet_time_wait = 30;
int
decnet_dn_count
=
3
;
int
decnet_di_count
=
5
;
int
decnet_dr_count
=
5
;
#ifdef CONFIG_SYSCTL
extern
int
decnet_dst_gc_interval
;
static
int
min_decnet_time_wait
[]
=
{
5
};
static
int
max_decnet_time_wait
[]
=
{
600
};
...
...
@@ -471,3 +473,12 @@ void dn_unregister_sysctl(void)
unregister_sysctl_table
(
dn_table_header
);
}
#else
/* CONFIG_SYSCTL */
void
dn_unregister_sysctl
(
void
)
{
}
void
dn_register_sysctl
(
void
)
{
}
#endif
net/netsyms.c
View file @
e4077388
...
...
@@ -68,6 +68,8 @@ extern int udp_port_rover;
#endif
extern
int
netdev_finish_unregister
(
struct
net_device
*
dev
);
#include <linux/rtnetlink.h>
#if defined(CONFIG_ULTRA) || defined(CONFIG_WD80x3) || \
...
...
@@ -223,6 +225,7 @@ EXPORT_SYMBOL(br_avl_find_addr);
#ifdef CONFIG_INET
/* Internet layer registration */
EXPORT_SYMBOL
(
inetdev_lock
);
EXPORT_SYMBOL
(
inet_add_protocol
);
EXPORT_SYMBOL
(
inet_del_protocol
);
EXPORT_SYMBOL
(
ip_route_output
);
...
...
@@ -521,8 +524,10 @@ EXPORT_SYMBOL(init_hippi_dev);
EXPORT_SYMBOL
(
unregister_hipdev
);
#endif
#ifdef CONFIG_SYSCTL
EXPORT_SYMBOL
(
sysctl_wmem_max
);
EXPORT_SYMBOL
(
sysctl_rmem_max
);
#endif
#if defined(CONFIG_ATALK) || defined(CONFIG_ATALK_MODULE)
#include<linux/if_ltalk.h>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment