projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arm64: dts: rockchip: fix sdmmc1_bus4 pinctrl for rk3328
[firefly-linux-kernel-4.4.55.git]
/
fs
/
nfs
/
nfs42proc.c
diff --git
a/fs/nfs/nfs42proc.c
b/fs/nfs/nfs42proc.c
index 3e92a3cde15d8b61878a7c2ce7d13da1cf01b290..7f1a0fb8c49351685d18aef2e22f5d630c892f35 100644
(file)
--- a/
fs/nfs/nfs42proc.c
+++ b/
fs/nfs/nfs42proc.c
@@
-14,7
+14,7
@@
#include "pnfs.h"
#include "internal.h"
#include "pnfs.h"
#include "internal.h"
-#define NFSDBG_FACILITY NFSDBG_P
NFS
+#define NFSDBG_FACILITY NFSDBG_P
ROC
static int nfs42_set_rw_stateid(nfs4_stateid *dst, struct file *file,
fmode_t fmode)
static int nfs42_set_rw_stateid(nfs4_stateid *dst, struct file *file,
fmode_t fmode)
@@
-269,6
+269,7
@@
int nfs42_proc_layoutstats_generic(struct nfs_server *server,
task = rpc_run_task(&task_setup);
if (IS_ERR(task))
return PTR_ERR(task);
task = rpc_run_task(&task_setup);
if (IS_ERR(task))
return PTR_ERR(task);
+ rpc_put_task(task);
return 0;
}
return 0;
}
@@
-284,6
+285,7
@@
static int _nfs42_proc_clone(struct rpc_message *msg, struct file *src_f,
.dst_fh = NFS_FH(dst_inode),
.src_offset = src_offset,
.dst_offset = dst_offset,
.dst_fh = NFS_FH(dst_inode),
.src_offset = src_offset,
.dst_offset = dst_offset,
+ .count = count,
.dst_bitmask = server->cache_consistency_bitmask,
};
struct nfs42_clone_res res = {
.dst_bitmask = server->cache_consistency_bitmask,
};
struct nfs42_clone_res res = {