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
a514c6ff
Commit
a514c6ff
authored
Oct 23, 2003
by
Stephen Lord
Browse files
Options
Browse Files
Download
Plain Diff
Merge
ssh://lord@kernel.bkbits.net/xfs-2.6
into jen.americas.sgi.com:/src/lord/bitkeeper/xfs-2.6
parents
5f65098e
919b8be6
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
57 additions
and
90 deletions
+57
-90
MAINTAINERS
MAINTAINERS
+1
-1
fs/xfs/linux/xfs_ioctl.c
fs/xfs/linux/xfs_ioctl.c
+1
-1
fs/xfs/linux/xfs_vnode.h
fs/xfs/linux/xfs_vnode.h
+2
-6
fs/xfs/support/move.h
fs/xfs/support/move.h
+7
-11
fs/xfs/xfs_dir2_node.c
fs/xfs/xfs_dir2_node.c
+46
-71
No files found.
MAINTAINERS
View file @
a514c6ff
...
...
@@ -2307,7 +2307,7 @@ S: Maintained
XFS FILESYSTEM
P: Silicon Graphics Inc
M: owner-xfs@oss.sgi.com
M:
lord
@sgi.com
M:
nathans
@sgi.com
L: linux-xfs@oss.sgi.com
W: http://oss.sgi.com/projects/xfs
S: Supported
...
...
fs/xfs/linux/xfs_ioctl.c
View file @
a514c6ff
...
...
@@ -226,8 +226,8 @@ xfs_vget_fsop_handlereq(
xfs_inode_t
*
ip
;
struct
inode
*
inodep
;
vnode_t
*
vpp
;
xfs_ino_t
ino
;
__u32
igen
;
ino_t
ino
;
int
error
;
if
(
!
capable
(
cap
))
...
...
fs/xfs/linux/xfs_vnode.h
View file @
a514c6ff
...
...
@@ -30,7 +30,7 @@
* http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
*
* Portions Copyright (c) 1989, 1993
*
The Regents of the University of California. All rights reserved.
*
The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
...
...
@@ -40,11 +40,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
...
...
fs/xfs/support/move.h
View file @
a514c6ff
...
...
@@ -30,7 +30,7 @@
* http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
*
* Portions Copyright (c) 1982, 1986, 1993, 1994
*
The Regents of the University of California. All rights reserved.
*
The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
...
...
@@ -40,11 +40,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
...
...
@@ -73,11 +69,11 @@ enum uio_seg {
};
struct
uio
{
struct
iovec
*
uio_iov
;
int
uio_iovcnt
;
xfs_off_t
uio_offset
;
int
uio_resid
;
enum
uio_seg
uio_segflg
;
struct
iovec
*
uio_iov
;
/* pointer to array of iovecs */
int
uio_iovcnt
;
/* number of iovecs in array */
xfs_off_t
uio_offset
;
/* offset in file this uio corresponds to */
int
uio_resid
;
/* residual i/o count */
enum
uio_seg
uio_segflg
;
/* see above */
};
typedef
struct
uio
uio_t
;
...
...
fs/xfs/xfs_dir2_node.c
View file @
a514c6ff
...
...
@@ -1371,9 +1371,6 @@ xfs_dir2_node_addname_int(
xfs_dir2_db_t
fbno
;
/* freespace block number */
xfs_dabuf_t
*
fbp
;
/* freespace buffer */
int
findex
;
/* freespace entry index */
xfs_dir2_db_t
foundbno
=
0
;
/* found freespace block no */
int
foundindex
=
0
;
/* found freespace entry idx */
int
foundhole
;
/* found hole in freespace */
xfs_dir2_free_t
*
free
=
NULL
;
/* freespace block structure */
xfs_dir2_db_t
ifbno
;
/* initial freespace block no */
xfs_dir2_db_t
lastfbno
=
0
;
/* highest freespace block no */
...
...
@@ -1382,7 +1379,6 @@ xfs_dir2_node_addname_int(
xfs_mount_t
*
mp
;
/* filesystem mount point */
int
needlog
;
/* need to log data header */
int
needscan
;
/* need to rescan data frees */
int
needfreesp
;
/* need to allocate freesp blk */
xfs_dir2_data_off_t
*
tagp
;
/* data entry tag pointer */
xfs_trans_t
*
tp
;
/* transaction pointer */
...
...
@@ -1390,7 +1386,6 @@ xfs_dir2_node_addname_int(
mp
=
dp
->
i_mount
;
tp
=
args
->
trans
;
length
=
XFS_DIR2_DATA_ENTSIZE
(
args
->
namelen
);
foundhole
=
0
;
/*
* If we came in with a freespace block that means that lookup
* found an entry with our hash value. This is the freespace
...
...
@@ -1445,7 +1440,6 @@ xfs_dir2_node_addname_int(
return
error
;
lastfbno
=
XFS_DIR2_DA_TO_DB
(
mp
,
(
xfs_dablk_t
)
fo
);
fbno
=
ifbno
;
foundindex
=
-
1
;
}
/*
* While we haven't identified a data block, search the freeblock
...
...
@@ -1485,7 +1479,6 @@ xfs_dir2_node_addname_int(
return
error
;
}
if
(
unlikely
(
fbp
==
NULL
))
{
foundhole
=
1
;
continue
;
}
free
=
fbp
->
data
;
...
...
@@ -1499,30 +1492,10 @@ xfs_dir2_node_addname_int(
INT_GET
(
free
->
bests
[
findex
],
ARCH_CONVERT
)
>=
length
)
dbno
=
INT_GET
(
free
->
hdr
.
firstdb
,
ARCH_CONVERT
)
+
findex
;
else
{
/*
* If we haven't found an empty entry yet, and this
* one is empty, remember this slot.
*/
if
(
foundindex
==
-
1
&&
INT_GET
(
free
->
bests
[
findex
],
ARCH_CONVERT
)
==
NULLDATAOFF
&&
!
foundhole
)
{
foundindex
=
findex
;
foundbno
=
fbno
;
}
/*
* Are we done with the freeblock?
*/
if
(
++
findex
==
INT_GET
(
free
->
hdr
.
nvalid
,
ARCH_CONVERT
))
{
/*
* If there is space left in this freeblock,
* and we don't have an empty entry yet,
* remember this slot.
*/
if
(
foundindex
==
-
1
&&
findex
<
XFS_DIR2_MAX_FREE_BESTS
(
mp
)
&&
!
foundhole
)
{
foundindex
=
findex
;
foundbno
=
fbno
;
}
/*
* Drop the block.
*/
...
...
@@ -1553,9 +1526,10 @@ xfs_dir2_node_addname_int(
/*
* Allocate and initialize the new data block.
*/
if
((
error
=
xfs_dir2_grow_inode
(
args
,
XFS_DIR2_DATA_SPACE
,
&
dbno
))
||
(
error
=
xfs_dir2_data_init
(
args
,
dbno
,
&
dbp
)))
{
if
(
unlikely
((
error
=
xfs_dir2_grow_inode
(
args
,
XFS_DIR2_DATA_SPACE
,
&
dbno
))
||
(
error
=
xfs_dir2_data_init
(
args
,
dbno
,
&
dbp
))))
{
/*
* Drop the freespace buffer unless it came from our
* caller.
...
...
@@ -1565,55 +1539,55 @@ xfs_dir2_node_addname_int(
return
error
;
}
/*
* If the freespace entry for this data block is not in the
* freespace block we have in hand, drop the one we have
* and get the right one.
* If (somehow) we have a freespace block, get rid of it.
*/
needfreesp
=
0
;
if
(
XFS_DIR2_DB_TO_FDB
(
mp
,
dbno
)
!=
fbno
||
fbp
==
NULL
)
{
if
(
fbp
)
xfs_da_brelse
(
tp
,
fbp
);
if
(
fblk
&&
fblk
->
bp
)
fblk
->
bp
=
NULL
;
fbno
=
XFS_DIR2_DB_TO_FDB
(
mp
,
dbno
);
if
((
error
=
xfs_da_read_buf
(
tp
,
dp
,
XFS_DIR2_DB_TO_DA
(
mp
,
fbno
),
-
2
,
&
fbp
,
XFS_DATA_FORK
)))
{
xfs_da_buf_done
(
dbp
);
return
error
;
}
/*
* If there wasn't a freespace block, the read will
* return a NULL fbp. Allocate one later.
*/
if
(
unlikely
(
fbp
==
NULL
))
{
needfreesp
=
1
;
}
else
{
free
=
fbp
->
data
;
ASSERT
(
INT_GET
(
free
->
hdr
.
magic
,
ARCH_CONVERT
)
==
XFS_DIR2_FREE_MAGIC
);
}
}
if
(
fbp
)
xfs_da_brelse
(
tp
,
fbp
);
if
(
fblk
&&
fblk
->
bp
)
fblk
->
bp
=
NULL
;
/*
*
If we don't have a data block, and there's no free slot in a
*
freeblock, we need to add a new freeblock
.
*
Get the freespace block corresponding to the data block
*
that was just allocated
.
*/
if
(
unlikely
(
needfreesp
||
foundindex
==
-
1
))
{
/*
* Add the new freeblock.
*/
fbno
=
XFS_DIR2_DB_TO_FDB
(
mp
,
dbno
);
if
(
unlikely
(
error
=
xfs_da_read_buf
(
tp
,
dp
,
XFS_DIR2_DB_TO_DA
(
mp
,
fbno
),
-
2
,
&
fbp
,
XFS_DATA_FORK
)))
{
xfs_da_buf_done
(
dbp
);
return
error
;
}
/*
* If there wasn't a freespace block, the read will
* return a NULL fbp. Allocate and initialize a new one.
*/
if
(
fbp
==
NULL
)
{
if
((
error
=
xfs_dir2_grow_inode
(
args
,
XFS_DIR2_FREE_SPACE
,
&
fbno
)))
{
return
error
;
}
if
(
XFS_DIR2_DB_TO_FDB
(
mp
,
dbno
)
!=
fbno
)
{
if
(
unlikely
(
XFS_DIR2_DB_TO_FDB
(
mp
,
dbno
)
!=
fbno
)
)
{
cmn_err
(
CE_ALERT
,
"xfs_dir2_node_addname_int: needed block %lld, got %lld
\n
"
,
(
long
long
)
XFS_DIR2_DB_TO_FDB
(
mp
,
dbno
),
(
long
long
)
fbno
);
"xfs_dir2_node_addname_int: dir ino "
"%llu needed freesp block %lld for
\n
"
" data block %lld, got %lld
\n
"
" ifbno %llu lastfbno %d
\n
"
,
dp
->
i_ino
,
XFS_DIR2_DB_TO_FDB
(
mp
,
dbno
),
dbno
,
fbno
,
ifbno
,
lastfbno
);
if
(
fblk
)
{
cmn_err
(
CE_ALERT
,
" fblk 0x%llu blkno %llu "
"index %d magic 0x%x
\n
"
,
fblk
,
fblk
->
blkno
,
fblk
->
index
,
fblk
->
magic
);
}
else
{
cmn_err
(
CE_ALERT
,
" ... fblk is NULL
\n
"
);
}
XFS_ERROR_REPORT
(
"xfs_dir2_node_addname_int"
,
XFS_ERRLEVEL_LOW
,
mp
);
return
XFS_ERROR
(
EFSCORRUPTED
);
...
...
@@ -1640,8 +1614,9 @@ xfs_dir2_node_addname_int(
XFS_DIR2_MAX_FREE_BESTS
(
mp
));
INT_ZERO
(
free
->
hdr
.
nvalid
,
ARCH_CONVERT
);
INT_ZERO
(
free
->
hdr
.
nused
,
ARCH_CONVERT
);
foundindex
=
0
;
foundbno
=
fbno
;
}
else
{
free
=
fbp
->
data
;
ASSERT
(
INT_GET
(
free
->
hdr
.
magic
,
ARCH_CONVERT
)
==
XFS_DIR2_FREE_MAGIC
);
}
/*
...
...
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