diff options
author | David S. Miller <davem@davemloft.net> | 2019-01-21 23:41:32 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-01-21 23:41:32 +0100 |
commit | fa7f3a8d56b38a3ed1880a3780afba82387da277 (patch) | |
tree | a4628ee966f21963e5e97a6d1a227a3e8138183e /fs/afs/yfsclient.c | |
parent | Merge branch 'mlxsw-spectrum_router-Add-GRE-tunnel-support-for-Spectrum-2' (diff) | |
parent | Linux 5.0-rc3 (diff) | |
download | linux-fa7f3a8d56b38a3ed1880a3780afba82387da277.tar.xz linux-fa7f3a8d56b38a3ed1880a3780afba82387da277.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Completely minor snmp doc conflict.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/afs/yfsclient.c')
-rw-r--r-- | fs/afs/yfsclient.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/afs/yfsclient.c b/fs/afs/yfsclient.c index 12658c1363ae..5aa57929e8c2 100644 --- a/fs/afs/yfsclient.c +++ b/fs/afs/yfsclient.c @@ -803,7 +803,7 @@ int yfs_fs_create_file(struct afs_fs_cursor *fc, bp = xdr_encode_YFSFid(bp, &vnode->fid); bp = xdr_encode_string(bp, name, namesz); bp = xdr_encode_YFSStoreStatus_mode(bp, mode); - bp = xdr_encode_u32(bp, 0); /* ViceLockType */ + bp = xdr_encode_u32(bp, yfs_LockNone); /* ViceLockType */ yfs_check_req(call, bp); afs_use_fs_server(call, fc->cbi); |