diff options
| author | David S. Miller <davem@davemloft.net> | 2019-08-28 00:23:31 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-08-28 00:23:31 +0300 |
| commit | 68aaf4459556b1f9370c259fd486aecad2257552 (patch) | |
| tree | 99d92536a3263634969be6b70a96facea85a0df1 /fs/ceph/locks.c | |
| parent | d00ee466a07eb9182ad3caf6140c7ebb527b4c64 (diff) | |
| parent | 9e8312f5e160ade069e131d54ab8652cf0e86e1a (diff) | |
| download | linux-68aaf4459556b1f9370c259fd486aecad2257552.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor conflict in r8169, bug fix had two versions in net
and net-next, take the net-next hunks.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/ceph/locks.c')
| -rw-r--r-- | fs/ceph/locks.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ceph/locks.c b/fs/ceph/locks.c index ac9b53b89365..5083e238ad15 100644 --- a/fs/ceph/locks.c +++ b/fs/ceph/locks.c @@ -111,8 +111,7 @@ static int ceph_lock_message(u8 lock_type, u16 operation, struct inode *inode, req->r_wait_for_completion = ceph_lock_wait_for_completion; err = ceph_mdsc_do_request(mdsc, inode, req); - - if (operation == CEPH_MDS_OP_GETFILELOCK) { + if (!err && operation == CEPH_MDS_OP_GETFILELOCK) { fl->fl_pid = -le64_to_cpu(req->r_reply_info.filelock_reply->pid); if (CEPH_LOCK_SHARED == req->r_reply_info.filelock_reply->type) fl->fl_type = F_RDLCK; |