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
nexedi
linux
Commits
b43d4dda
Commit
b43d4dda
authored
18 years ago
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
git://oss.sgi.com:8090/oss/git/rc-fixes-xfs-2.6
parents
8e63e66b
9bd6f13d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
fs/xfs/linux-2.6/xfs_aops.c
fs/xfs/linux-2.6/xfs_aops.c
+2
-1
fs/xfs/linux-2.6/xfs_iops.c
fs/xfs/linux-2.6/xfs_iops.c
+2
-0
No files found.
fs/xfs/linux-2.6/xfs_aops.c
View file @
b43d4dda
...
...
@@ -747,10 +747,11 @@ xfs_convert_page(
struct
backing_dev_info
*
bdi
;
bdi
=
inode
->
i_mapping
->
backing_dev_info
;
wbc
->
nr_to_write
--
;
if
(
bdi_write_congested
(
bdi
))
{
wbc
->
encountered_congestion
=
1
;
done
=
1
;
}
else
if
(
--
wbc
->
nr_to_write
<=
0
)
{
}
else
if
(
wbc
->
nr_to_write
<=
0
)
{
done
=
1
;
}
}
...
...
This diff is collapsed.
Click to expand it.
fs/xfs/linux-2.6/xfs_iops.c
View file @
b43d4dda
...
...
@@ -673,6 +673,8 @@ linvfs_setattr(
if
(
ia_valid
&
ATTR_ATIME
)
{
vattr
.
va_mask
|=
XFS_AT_ATIME
;
vattr
.
va_atime
=
attr
->
ia_atime
;
if
(
ia_valid
&
ATTR_ATIME_SET
)
inode
->
i_atime
=
attr
->
ia_atime
;
}
if
(
ia_valid
&
ATTR_MTIME
)
{
vattr
.
va_mask
|=
XFS_AT_MTIME
;
...
...
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