Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
linux
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Martyn Welch
linux
Commits
4da54c21
Commit
4da54c21
authored
11 years ago
by
Al Viro
Browse files
Options
Downloads
Patches
Plain Diff
nfs: switch to iter_splice_write_file()
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
96f9bc8f
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
fs/nfs/file.c
+1
-31
1 addition, 31 deletions
fs/nfs/file.c
fs/nfs/internal.h
+0
-2
0 additions, 2 deletions
fs/nfs/internal.h
fs/nfs/nfs4file.c
+1
-1
1 addition, 1 deletion
fs/nfs/nfs4file.c
with
2 additions
and
34 deletions
fs/nfs/file.c
+
1
−
31
View file @
4da54c21
...
@@ -690,36 +690,6 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from)
...
@@ -690,36 +690,6 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from)
}
}
EXPORT_SYMBOL_GPL
(
nfs_file_write
);
EXPORT_SYMBOL_GPL
(
nfs_file_write
);
ssize_t
nfs_file_splice_write
(
struct
pipe_inode_info
*
pipe
,
struct
file
*
filp
,
loff_t
*
ppos
,
size_t
count
,
unsigned
int
flags
)
{
struct
inode
*
inode
=
file_inode
(
filp
);
unsigned
long
written
=
0
;
ssize_t
ret
;
dprintk
(
"NFS splice_write(%pD2, %lu@%llu)
\n
"
,
filp
,
(
unsigned
long
)
count
,
(
unsigned
long
long
)
*
ppos
);
/*
* The combination of splice and an O_APPEND destination is disallowed.
*/
ret
=
generic_file_splice_write
(
pipe
,
filp
,
ppos
,
count
,
flags
);
if
(
ret
>
0
)
written
=
ret
;
if
(
ret
>=
0
&&
nfs_need_sync_write
(
filp
,
inode
))
{
int
err
=
vfs_fsync
(
filp
,
0
);
if
(
err
<
0
)
ret
=
err
;
}
if
(
ret
>
0
)
nfs_add_stats
(
inode
,
NFSIOS_NORMALWRITTENBYTES
,
written
);
return
ret
;
}
EXPORT_SYMBOL_GPL
(
nfs_file_splice_write
);
static
int
static
int
do_getlk
(
struct
file
*
filp
,
int
cmd
,
struct
file_lock
*
fl
,
int
is_local
)
do_getlk
(
struct
file
*
filp
,
int
cmd
,
struct
file_lock
*
fl
,
int
is_local
)
{
{
...
@@ -950,7 +920,7 @@ const struct file_operations nfs_file_operations = {
...
@@ -950,7 +920,7 @@ const struct file_operations nfs_file_operations = {
.
lock
=
nfs_lock
,
.
lock
=
nfs_lock
,
.
flock
=
nfs_flock
,
.
flock
=
nfs_flock
,
.
splice_read
=
nfs_file_splice_read
,
.
splice_read
=
nfs_file_splice_read
,
.
splice_write
=
nfs
_file_splice_write
,
.
splice_write
=
iter
_file_splice_write
,
.
check_flags
=
nfs_check_flags
,
.
check_flags
=
nfs_check_flags
,
.
setlease
=
nfs_setlease
,
.
setlease
=
nfs_setlease
,
};
};
...
...
This diff is collapsed.
Click to expand it.
fs/nfs/internal.h
+
0
−
2
View file @
4da54c21
...
@@ -328,8 +328,6 @@ ssize_t nfs_file_write(struct kiocb *, struct iov_iter *);
...
@@ -328,8 +328,6 @@ ssize_t nfs_file_write(struct kiocb *, struct iov_iter *);
int
nfs_file_release
(
struct
inode
*
,
struct
file
*
);
int
nfs_file_release
(
struct
inode
*
,
struct
file
*
);
int
nfs_lock
(
struct
file
*
,
int
,
struct
file_lock
*
);
int
nfs_lock
(
struct
file
*
,
int
,
struct
file_lock
*
);
int
nfs_flock
(
struct
file
*
,
int
,
struct
file_lock
*
);
int
nfs_flock
(
struct
file
*
,
int
,
struct
file_lock
*
);
ssize_t
nfs_file_splice_write
(
struct
pipe_inode_info
*
,
struct
file
*
,
loff_t
*
,
size_t
,
unsigned
int
);
int
nfs_check_flags
(
int
);
int
nfs_check_flags
(
int
);
int
nfs_setlease
(
struct
file
*
,
long
,
struct
file_lock
**
);
int
nfs_setlease
(
struct
file
*
,
long
,
struct
file_lock
**
);
...
...
This diff is collapsed.
Click to expand it.
fs/nfs/nfs4file.c
+
1
−
1
View file @
4da54c21
...
@@ -130,7 +130,7 @@ const struct file_operations nfs4_file_operations = {
...
@@ -130,7 +130,7 @@ const struct file_operations nfs4_file_operations = {
.
lock
=
nfs_lock
,
.
lock
=
nfs_lock
,
.
flock
=
nfs_flock
,
.
flock
=
nfs_flock
,
.
splice_read
=
nfs_file_splice_read
,
.
splice_read
=
nfs_file_splice_read
,
.
splice_write
=
nfs
_file_splice_write
,
.
splice_write
=
iter
_file_splice_write
,
.
check_flags
=
nfs_check_flags
,
.
check_flags
=
nfs_check_flags
,
.
setlease
=
nfs_setlease
,
.
setlease
=
nfs_setlease
,
};
};
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment