diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-04-26 12:01:33 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-04-26 12:01:33 +0200 |
| commit | da398dbd7d871bae332a800f7d194af18a2a9058 (patch) | |
| tree | 2dbdc51bd9caa1539480b3d80d082adfdb8179c3 /fs/nfs/nfs42proc.c | |
| parent | 2792107dc3af29ecc1a9b3dc5bc873dac4b61cd6 (diff) | |
| parent | 8113a85f872003a9f5c58f9f143054b0d8ec73a5 (diff) | |
Merge branch 'linus' into x86/mm, to pick up dependent fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/nfs/nfs42proc.c')
| -rw-r--r-- | fs/nfs/nfs42proc.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c index ff6f85fb676b..5196bfa7894d 100644 --- a/fs/nfs/nfs42proc.c +++ b/fs/nfs/nfs42proc.c @@ -329,9 +329,6 @@ ssize_t nfs42_proc_copy(struct file *src, loff_t pos_src, }; ssize_t err, err2; - if (!nfs_server_capable(file_inode(dst), NFS_CAP_COPY)) - return -EOPNOTSUPP; - src_lock = nfs_get_lock_context(nfs_file_open_context(src)); if (IS_ERR(src_lock)) return PTR_ERR(src_lock); |