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
81d7ed29
Commit
81d7ed29
authored
Apr 25, 2008
by
Chris Mason
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Btrfs: Throttle file_write when data=ordered is flushing the inode
Signed-off-by:
Chris Mason
<
chris.mason@oracle.com
>
parent
bce4eae9
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
28 additions
and
2 deletions
+28
-2
fs/btrfs/btrfs_inode.h
fs/btrfs/btrfs_inode.h
+1
-0
fs/btrfs/file.c
fs/btrfs/file.c
+1
-0
fs/btrfs/inode.c
fs/btrfs/inode.c
+4
-0
fs/btrfs/ordered-data.c
fs/btrfs/ordered-data.c
+13
-0
fs/btrfs/ordered-data.h
fs/btrfs/ordered-data.h
+1
-0
fs/btrfs/transaction.c
fs/btrfs/transaction.c
+8
-2
No files found.
fs/btrfs/btrfs_inode.h
View file @
81d7ed29
...
@@ -31,6 +31,7 @@ struct btrfs_inode {
...
@@ -31,6 +31,7 @@ struct btrfs_inode {
struct
extent_io_tree
io_tree
;
struct
extent_io_tree
io_tree
;
struct
extent_io_tree
io_failure_tree
;
struct
extent_io_tree
io_failure_tree
;
struct
inode
vfs_inode
;
struct
inode
vfs_inode
;
atomic_t
ordered_writeback
;
u64
ordered_trans
;
u64
ordered_trans
;
/*
/*
...
...
fs/btrfs/file.c
View file @
81d7ed29
...
@@ -977,6 +977,7 @@ static ssize_t btrfs_file_write(struct file *file, const char __user *buf,
...
@@ -977,6 +977,7 @@ static ssize_t btrfs_file_write(struct file *file, const char __user *buf,
(
start_pos
+
num_written
-
1
)
>>
PAGE_CACHE_SHIFT
);
(
start_pos
+
num_written
-
1
)
>>
PAGE_CACHE_SHIFT
);
}
}
current
->
backing_dev_info
=
NULL
;
current
->
backing_dev_info
=
NULL
;
btrfs_ordered_throttle
(
root
,
inode
);
return
num_written
?
num_written
:
err
;
return
num_written
?
num_written
:
err
;
}
}
...
...
fs/btrfs/inode.c
View file @
81d7ed29
...
@@ -1419,6 +1419,7 @@ static int btrfs_init_locked_inode(struct inode *inode, void *p)
...
@@ -1419,6 +1419,7 @@ static int btrfs_init_locked_inode(struct inode *inode, void *p)
inode
->
i_mapping
,
GFP_NOFS
);
inode
->
i_mapping
,
GFP_NOFS
);
extent_io_tree_init
(
&
BTRFS_I
(
inode
)
->
io_failure_tree
,
extent_io_tree_init
(
&
BTRFS_I
(
inode
)
->
io_failure_tree
,
inode
->
i_mapping
,
GFP_NOFS
);
inode
->
i_mapping
,
GFP_NOFS
);
atomic_set
(
&
BTRFS_I
(
inode
)
->
ordered_writeback
,
0
);
return
0
;
return
0
;
}
}
...
@@ -1728,6 +1729,7 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans,
...
@@ -1728,6 +1729,7 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans,
inode
->
i_mapping
,
GFP_NOFS
);
inode
->
i_mapping
,
GFP_NOFS
);
extent_io_tree_init
(
&
BTRFS_I
(
inode
)
->
io_failure_tree
,
extent_io_tree_init
(
&
BTRFS_I
(
inode
)
->
io_failure_tree
,
inode
->
i_mapping
,
GFP_NOFS
);
inode
->
i_mapping
,
GFP_NOFS
);
atomic_set
(
&
BTRFS_I
(
inode
)
->
ordered_writeback
,
0
);
BTRFS_I
(
inode
)
->
delalloc_bytes
=
0
;
BTRFS_I
(
inode
)
->
delalloc_bytes
=
0
;
BTRFS_I
(
inode
)
->
root
=
root
;
BTRFS_I
(
inode
)
->
root
=
root
;
...
@@ -1956,6 +1958,7 @@ static int btrfs_create(struct inode *dir, struct dentry *dentry,
...
@@ -1956,6 +1958,7 @@ static int btrfs_create(struct inode *dir, struct dentry *dentry,
extent_io_tree_init
(
&
BTRFS_I
(
inode
)
->
io_failure_tree
,
extent_io_tree_init
(
&
BTRFS_I
(
inode
)
->
io_failure_tree
,
inode
->
i_mapping
,
GFP_NOFS
);
inode
->
i_mapping
,
GFP_NOFS
);
BTRFS_I
(
inode
)
->
delalloc_bytes
=
0
;
BTRFS_I
(
inode
)
->
delalloc_bytes
=
0
;
atomic_set
(
&
BTRFS_I
(
inode
)
->
ordered_writeback
,
0
);
BTRFS_I
(
inode
)
->
io_tree
.
ops
=
&
btrfs_extent_io_ops
;
BTRFS_I
(
inode
)
->
io_tree
.
ops
=
&
btrfs_extent_io_ops
;
}
}
dir
->
i_sb
->
s_dirt
=
1
;
dir
->
i_sb
->
s_dirt
=
1
;
...
@@ -3292,6 +3295,7 @@ static int btrfs_symlink(struct inode *dir, struct dentry *dentry,
...
@@ -3292,6 +3295,7 @@ static int btrfs_symlink(struct inode *dir, struct dentry *dentry,
extent_io_tree_init
(
&
BTRFS_I
(
inode
)
->
io_failure_tree
,
extent_io_tree_init
(
&
BTRFS_I
(
inode
)
->
io_failure_tree
,
inode
->
i_mapping
,
GFP_NOFS
);
inode
->
i_mapping
,
GFP_NOFS
);
BTRFS_I
(
inode
)
->
delalloc_bytes
=
0
;
BTRFS_I
(
inode
)
->
delalloc_bytes
=
0
;
atomic_set
(
&
BTRFS_I
(
inode
)
->
ordered_writeback
,
0
);
BTRFS_I
(
inode
)
->
io_tree
.
ops
=
&
btrfs_extent_io_ops
;
BTRFS_I
(
inode
)
->
io_tree
.
ops
=
&
btrfs_extent_io_ops
;
}
}
dir
->
i_sb
->
s_dirt
=
1
;
dir
->
i_sb
->
s_dirt
=
1
;
...
...
fs/btrfs/ordered-data.c
View file @
81d7ed29
...
@@ -269,3 +269,16 @@ int btrfs_del_ordered_inode(struct inode *inode)
...
@@ -269,3 +269,16 @@ int btrfs_del_ordered_inode(struct inode *inode)
return
ret
;
return
ret
;
}
}
int
btrfs_ordered_throttle
(
struct
btrfs_root
*
root
,
struct
inode
*
inode
)
{
struct
btrfs_transaction
*
cur
=
root
->
fs_info
->
running_transaction
;
while
(
cur
==
root
->
fs_info
->
running_transaction
&&
atomic_read
(
&
BTRFS_I
(
inode
)
->
ordered_writeback
))
{
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18)
congestion_wait
(
WRITE
,
HZ
/
20
);
#else
blk_congestion_wait
(
WRITE
,
HZ
/
20
);
#endif
}
return
0
;
}
fs/btrfs/ordered-data.h
View file @
81d7ed29
...
@@ -39,4 +39,5 @@ int btrfs_find_first_ordered_inode(struct btrfs_ordered_inode_tree *tree,
...
@@ -39,4 +39,5 @@ int btrfs_find_first_ordered_inode(struct btrfs_ordered_inode_tree *tree,
u64
*
root_objectid
,
u64
*
objectid
,
u64
*
root_objectid
,
u64
*
objectid
,
struct
inode
**
inode
);
struct
inode
**
inode
);
int
btrfs_del_ordered_inode
(
struct
inode
*
inode
);
int
btrfs_del_ordered_inode
(
struct
inode
*
inode
);
int
btrfs_ordered_throttle
(
struct
btrfs_root
*
root
,
struct
inode
*
inode
);
#endif
#endif
fs/btrfs/transaction.c
View file @
81d7ed29
...
@@ -512,8 +512,11 @@ int btrfs_write_ordered_inodes(struct btrfs_trans_handle *trans,
...
@@ -512,8 +512,11 @@ int btrfs_write_ordered_inodes(struct btrfs_trans_handle *trans,
mutex_unlock
(
&
root
->
fs_info
->
trans_mutex
);
mutex_unlock
(
&
root
->
fs_info
->
trans_mutex
);
mutex_unlock
(
&
root
->
fs_info
->
fs_mutex
);
mutex_unlock
(
&
root
->
fs_info
->
fs_mutex
);
if
(
S_ISREG
(
inode
->
i_mode
))
if
(
S_ISREG
(
inode
->
i_mode
))
{
atomic_inc
(
&
BTRFS_I
(
inode
)
->
ordered_writeback
);
filemap_fdatawrite
(
inode
->
i_mapping
);
filemap_fdatawrite
(
inode
->
i_mapping
);
atomic_dec
(
&
BTRFS_I
(
inode
)
->
ordered_writeback
);
}
iput
(
inode
);
iput
(
inode
);
mutex_lock
(
&
root
->
fs_info
->
fs_mutex
);
mutex_lock
(
&
root
->
fs_info
->
fs_mutex
);
...
@@ -530,8 +533,11 @@ int btrfs_write_ordered_inodes(struct btrfs_trans_handle *trans,
...
@@ -530,8 +533,11 @@ int btrfs_write_ordered_inodes(struct btrfs_trans_handle *trans,
mutex_unlock
(
&
root
->
fs_info
->
trans_mutex
);
mutex_unlock
(
&
root
->
fs_info
->
trans_mutex
);
mutex_unlock
(
&
root
->
fs_info
->
fs_mutex
);
mutex_unlock
(
&
root
->
fs_info
->
fs_mutex
);
if
(
S_ISREG
(
inode
->
i_mode
))
if
(
S_ISREG
(
inode
->
i_mode
))
{
atomic_inc
(
&
BTRFS_I
(
inode
)
->
ordered_writeback
);
filemap_write_and_wait
(
inode
->
i_mapping
);
filemap_write_and_wait
(
inode
->
i_mapping
);
atomic_dec
(
&
BTRFS_I
(
inode
)
->
ordered_writeback
);
}
atomic_dec
(
&
inode
->
i_count
);
atomic_dec
(
&
inode
->
i_count
);
iput
(
inode
);
iput
(
inode
);
...
...
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