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
f96599ee
Commit
f96599ee
authored
20 years ago
by
David S. Miller
Browse files
Options
Browse Files
Download
Plain Diff
Merge nuts.davemloft.net:/disk1/BK/sparcwork-2.6
into nuts.davemloft.net:/disk1/BK/sparc-2.6
parents
96531b37
736e44e8
No related merge requests found
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
40 additions
and
23 deletions
+40
-23
arch/sparc64/kernel/sparc64_ksyms.c
arch/sparc64/kernel/sparc64_ksyms.c
+3
-0
drivers/block/carmel.c
drivers/block/carmel.c
+2
-1
drivers/fc4/soc.h
drivers/fc4/soc.h
+7
-3
fs/intermezzo/file.c
fs/intermezzo/file.c
+3
-3
fs/intermezzo/fileset.c
fs/intermezzo/fileset.c
+6
-4
fs/intermezzo/journal.c
fs/intermezzo/journal.c
+2
-2
fs/intermezzo/kml_reint.c
fs/intermezzo/kml_reint.c
+6
-4
fs/intermezzo/psdev.c
fs/intermezzo/psdev.c
+4
-4
fs/intermezzo/upcall.c
fs/intermezzo/upcall.c
+7
-2
No files found.
arch/sparc64/kernel/sparc64_ksyms.c
View file @
f96599ee
...
...
@@ -91,6 +91,7 @@ extern int compat_sys_ioctl(unsigned int fd, unsigned int cmd, u32 arg);
extern
int
(
*
handle_mathemu
)(
struct
pt_regs
*
,
struct
fpustate
*
);
extern
long
sparc32_open
(
const
char
*
filename
,
int
flags
,
int
mode
);
extern
int
io_remap_page_range
(
struct
vm_area_struct
*
vma
,
unsigned
long
from
,
unsigned
long
offset
,
unsigned
long
size
,
pgprot_t
prot
,
int
space
);
extern
void
(
*
prom_palette
)(
int
);
extern
int
__ashrdi3
(
int
,
int
);
...
...
@@ -388,3 +389,5 @@ EXPORT_SYMBOL(xor_vis_2);
EXPORT_SYMBOL
(
xor_vis_3
);
EXPORT_SYMBOL
(
xor_vis_4
);
EXPORT_SYMBOL
(
xor_vis_5
);
EXPORT_SYMBOL
(
prom_palette
);
This diff is collapsed.
Click to expand it.
drivers/block/carmel.c
View file @
f96599ee
...
...
@@ -994,7 +994,8 @@ static void carm_handle_array_info(struct carm_host *host,
}
printk
(
KERN_INFO
DRV_NAME
"(%s): port %u device %Lu sectors
\n
"
,
pci_name
(
host
->
pdev
),
port
->
port_no
,
port
->
capacity
);
pci_name
(
host
->
pdev
),
port
->
port_no
,
(
unsigned
long
long
)
port
->
capacity
);
printk
(
KERN_INFO
DRV_NAME
"(%s): port %u device
\"
%s
\"\n
"
,
pci_name
(
host
->
pdev
),
port
->
port_no
,
port
->
name
);
...
...
This diff is collapsed.
Click to expand it.
drivers/fc4/soc.h
View file @
f96599ee
...
...
@@ -114,18 +114,22 @@ static inline u8 xram_get_8 (xram_p x)
static
inline
void
xram_copy_from
(
void
*
p
,
xram_p
x
,
int
len
)
{
for
(
len
>>=
2
;
len
>
0
;
len
--
,
x
+=
sizeof
(
u32
))
{
u32
val
;
u32
val
,
*
p32
=
p
;
val
=
((
sbus_readw
(
x
+
0x00UL
)
<<
16
)
|
(
sbus_readw
(
x
+
0x02UL
)));
*
((
u32
*
)
p
)
++
=
val
;
*
p32
++
=
val
;
p
=
p32
;
}
}
static
inline
void
xram_copy_to
(
xram_p
x
,
void
*
p
,
int
len
)
{
for
(
len
>>=
2
;
len
>
0
;
len
--
,
x
+=
sizeof
(
u32
))
{
u32
tmp
=
*
((
u32
*
)
p
)
++
;
u32
tmp
,
*
p32
=
p
;
tmp
=
*
p32
++
;
p
=
p32
;
sbus_writew
(
tmp
>>
16
,
x
+
0x00UL
);
sbus_writew
(
tmp
,
x
+
0x02UL
);
}
...
...
This diff is collapsed.
Click to expand it.
fs/intermezzo/file.c
View file @
f96599ee
...
...
@@ -82,7 +82,7 @@ static int presto_open_upcall(int minor, struct dentry *de)
info
.
remote_generation
=
dd
->
remote_generation
;
}
else
CERROR
(
"get_fileid failed %d, ino: %Lx, fetching by name
\n
"
,
rc
,
dd
->
remote_ino
);
(
unsigned
long
long
)
dd
->
remote_ino
);
rc
=
izo_upc_open
(
minor
,
pathlen
,
path
,
fset
->
fset_name
,
&
info
);
PRESTO_FREE
(
buffer
,
PAGE_SIZE
);
...
...
@@ -380,7 +380,7 @@ static ssize_t presto_file_write(struct file *file, const char *buf,
<<
file
->
f_dentry
->
d_inode
->
i_sb
->
s_blocksize_bits
);
error
=
presto_reserve_space
(
fset
->
fset_cache
,
res_size
);
CDEBUG
(
D_INODE
,
"Reserved %Ld for %
d
\n
"
,
res_size
,
size
);
CDEBUG
(
D_INODE
,
"Reserved %Ld for %
Zd
\n
"
,
res_size
,
size
);
if
(
error
)
{
EXIT
;
return
-
ENOSPC
;
...
...
@@ -440,7 +440,7 @@ static ssize_t presto_file_write(struct file *file, const char *buf,
fops
=
filter_c2cffops
(
cache
->
cache_filter
);
res
=
fops
->
write
(
file
,
buf
,
size
,
off
);
if
(
res
!=
size
)
{
CDEBUG
(
D_FILE
,
"file write returns short write: size %
d, res %
d
\n
"
,
size
,
res
);
CDEBUG
(
D_FILE
,
"file write returns short write: size %
Zd, res %Z
d
\n
"
,
size
,
res
);
}
if
(
(
res
>
0
)
&&
fdata
)
...
...
This diff is collapsed.
Click to expand it.
fs/intermezzo/fileset.c
View file @
f96599ee
...
...
@@ -647,8 +647,9 @@ int izo_set_fileid(struct file *dir, struct izo_ioctl_data *data)
CDEBUG
(
D_FILE
,
"de:%p dd:%p
\n
"
,
dentry
,
dd
);
if
(
dd
->
remote_ino
!=
0
)
{
CERROR
(
"remote_ino already set? %Lx:%Lx
\n
"
,
dd
->
remote_ino
,
dd
->
remote_generation
);
CERROR
(
"remote_ino already set? %Lx:%Lx
\n
"
,
(
unsigned
long
long
)
dd
->
remote_ino
,
(
unsigned
long
long
)
dd
->
remote_generation
);
rc
=
0
;
EXIT
;
goto
out_close
;
...
...
@@ -656,8 +657,9 @@ int izo_set_fileid(struct file *dir, struct izo_ioctl_data *data)
CDEBUG
(
D_FILE
,
"setting %p %p, %s to %Lx:%Lx
\n
"
,
dentry
,
dd
,
buf
,
data
->
ioc_ino
,
data
->
ioc_generation
);
buf
,
(
unsigned
long
long
)
data
->
ioc_ino
,
(
unsigned
long
long
)
data
->
ioc_generation
);
dd
->
remote_ino
=
data
->
ioc_ino
;
dd
->
remote_generation
=
data
->
ioc_generation
;
...
...
This diff is collapsed.
Click to expand it.
fs/intermezzo/journal.c
View file @
f96599ee
...
...
@@ -1470,7 +1470,7 @@ int presto_clear_lml_close(struct presto_file_set *fset, loff_t lml_offset)
return
0
;
}
CDEBUG
(
D_JOURNAL
,
"reading prefix: off %ld, size %d
\n
"
,
CDEBUG
(
D_JOURNAL
,
"reading prefix: off %ld, size %
Z
d
\n
"
,
(
long
)
lml_offset
,
sizeof
(
record
));
rc
=
presto_fread
(
fset
->
fset_lml
.
fd_file
,
(
char
*
)
&
record
,
sizeof
(
record
),
&
offset
);
...
...
@@ -1621,7 +1621,7 @@ int presto_get_fileid(int minor, struct presto_file_set *fset,
/* journal_log_suffix expects journal_log to set this */
suffix
->
recno
=
0
;
CDEBUG
(
D_FILE
,
"actual kml size: %d
\n
"
,
logrecord
-
record
);
CDEBUG
(
D_FILE
,
"actual kml size: %
Z
d
\n
"
,
logrecord
-
record
);
CDEBUG
(
D_FILE
,
"get fileid: uid %d, gid %d, path: %s
\n
"
,
uid
,
gid
,
path
);
error
=
izo_upc_get_fileid
(
minor
,
size
,
record
,
...
...
This diff is collapsed.
Click to expand it.
fs/intermezzo/kml_reint.c
View file @
f96599ee
...
...
@@ -162,7 +162,8 @@ static int reint_close(struct kml_rec *rec, struct file *file,
*/
if
(
error
==
ENOENT
)
{
CDEBUG
(
D_KML
,
"manually updating remote offset uuid %s"
"recno %d offset %Lu
\n
"
,
info
.
uuid
,
info
.
recno
,
info
.
kml_offset
);
"recno %d offset %Lu
\n
"
,
info
.
uuid
,
info
.
recno
,
(
unsigned
long
long
)
info
.
kml_offset
);
error
=
izo_rcvd_upd_remote
(
fset
,
info
.
uuid
,
info
.
recno
,
info
.
kml_offset
);
if
(
error
)
CERROR
(
"izo_rcvd_upd_remote error %d
\n
"
,
error
);
...
...
@@ -528,7 +529,7 @@ int kml_reint_rec(struct file *dir, struct izo_ioctl_data *data)
if
(
rec
.
suffix
->
recno
!=
lr_rec
.
lr_remote_recno
+
1
)
{
CERROR
(
"KML record number %Lu expected, not %d
\n
"
,
lr_rec
.
lr_remote_recno
+
1
,
(
unsigned
long
long
)
(
lr_rec
.
lr_remote_recno
+
1
)
,
rec
.
suffix
->
recno
);
#if 0
...
...
@@ -631,8 +632,9 @@ int izo_get_fileid(struct file *dir, struct izo_ioctl_data *data)
data
->
ioc_generation
=
file
->
f_dentry
->
d_inode
->
i_generation
;
filp_close
(
file
,
0
);
CDEBUG
(
D_FILE
,
"%s ino %Lx, gen %Lx
\n
"
,
rec
.
path
,
data
->
ioc_ino
,
data
->
ioc_generation
);
CDEBUG
(
D_FILE
,
"%s ino %Lx, gen %Lx
\n
"
,
rec
.
path
,
(
unsigned
long
long
)
data
->
ioc_ino
,
(
unsigned
long
long
)
data
->
ioc_generation
);
out:
if
(
buf
)
...
...
This diff is collapsed.
Click to expand it.
fs/intermezzo/psdev.c
View file @
f96599ee
...
...
@@ -227,7 +227,7 @@ static ssize_t presto_psdev_write(struct file *file, const char *buf,
/* move data into response buffer. */
if
(
req
->
rq_bufsize
<
count
)
{
CERROR
(
"psdev_write: too much cnt: %d, cnt: %d, "
CERROR
(
"psdev_write: too much cnt: %d, cnt: %
Z
d, "
"opc: %d, uniq: %d.
\n
"
,
req
->
rq_bufsize
,
count
,
hdr
.
opcode
,
hdr
.
unique
);
count
=
req
->
rq_bufsize
;
/* don't have more space! */
...
...
@@ -281,7 +281,7 @@ static ssize_t presto_psdev_read(struct file * file, char * buf,
}
if
(
count
<
req
->
rq_bufsize
)
{
CERROR
(
"psdev_read: buffer too small, read %d of %d bytes
\n
"
,
CERROR
(
"psdev_read: buffer too small, read %
Z
d of %d bytes
\n
"
,
count
,
req
->
rq_bufsize
);
}
...
...
@@ -592,8 +592,8 @@ int izo_upc_upcall(int minor, int *size, struct izo_upcall_hdr *buffer,
req
->
rq_opcode
,
jiffies
-
req
->
rq_posttime
,
req
->
rq_unique
,
req
->
rq_rep_size
);
CDEBUG
(
D_UPCALL
,
"..process %d woken up by Lento for req at 0x%
x, data at %x
\n
"
,
current
->
pid
,
(
int
)
req
,
(
int
)
req
->
rq_data
);
"..process %d woken up by Lento for req at 0x%
p, data at %p
\n
"
,
current
->
pid
,
req
,
req
->
rq_data
);
if
(
channel
->
uc_pid
)
{
/* i.e. Lento is still alive */
/* Op went through, interrupt or not we go on */
...
...
This diff is collapsed.
Click to expand it.
fs/intermezzo/upcall.c
View file @
f96599ee
...
...
@@ -142,7 +142,10 @@ int izo_upc_kml(int minor, __u64 offset, __u32 first_recno, __u64 length, __u32
CDEBUG
(
D_UPCALL
,
"KML: fileset %s, offset %Lu, length %Lu, "
"first %u, last %d; minor %d
\n
"
,
fsetname
,
hdr
->
u_offset
,
hdr
->
u_length
,
hdr
->
u_first_recno
,
fsetname
,
(
unsigned
long
long
)
hdr
->
u_offset
,
(
unsigned
long
long
)
hdr
->
u_length
,
hdr
->
u_first_recno
,
hdr
->
u_last_recno
,
minor
);
error
=
izo_upc_upcall
(
minor
,
&
size
,
hdr
,
ASYNCHRONOUS
);
...
...
@@ -174,7 +177,9 @@ int izo_upc_kml_truncate(int minor, __u64 length, __u32 last_recno, char *fsetna
CDEBUG
(
D_UPCALL
,
"KML TRUNCATE: fileset %s, length %Lu, "
"last recno %d, minor %d
\n
"
,
fsetname
,
hdr
->
u_length
,
hdr
->
u_last_recno
,
minor
);
fsetname
,
(
unsigned
long
long
)
hdr
->
u_length
,
hdr
->
u_last_recno
,
minor
);
error
=
izo_upc_upcall
(
minor
,
&
size
,
hdr
,
ASYNCHRONOUS
);
...
...
This diff is collapsed.
Click to expand it.
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