mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-17 06:48:07 +00:00
Koen Kooi
2177f80076
Duplicate patches between PSP and 3.2.17 have been dropped from the 3.2.17 series Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
55 lines
1.7 KiB
Diff
55 lines
1.7 KiB
Diff
From 4fd3b67b3816e020c889f75e986ba290110c3224 Mon Sep 17 00:00:00 2001
|
|
From: Trond Myklebust <Trond.Myklebust@netapp.com>
|
|
Date: Wed, 18 Apr 2012 12:20:10 -0400
|
|
Subject: [PATCH 086/165] NFSv4: Ensure that the LOCK code sets
|
|
exception->inode
|
|
|
|
commit 05ffe24f5290dc095f98fbaf84afe51ef404ccc5 upstream.
|
|
|
|
All callers of nfs4_handle_exception() that need to handle
|
|
NFS4ERR_OPENMODE correctly should set exception->inode
|
|
|
|
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
---
|
|
fs/nfs/nfs4proc.c | 9 +++++++--
|
|
1 files changed, 7 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
|
|
index 757293b..57f9971 100644
|
|
--- a/fs/nfs/nfs4proc.c
|
|
+++ b/fs/nfs/nfs4proc.c
|
|
@@ -4453,7 +4453,9 @@ static int _nfs4_do_setlk(struct nfs4_state *state, int cmd, struct file_lock *f
|
|
static int nfs4_lock_reclaim(struct nfs4_state *state, struct file_lock *request)
|
|
{
|
|
struct nfs_server *server = NFS_SERVER(state->inode);
|
|
- struct nfs4_exception exception = { };
|
|
+ struct nfs4_exception exception = {
|
|
+ .inode = state->inode,
|
|
+ };
|
|
int err;
|
|
|
|
do {
|
|
@@ -4471,7 +4473,9 @@ static int nfs4_lock_reclaim(struct nfs4_state *state, struct file_lock *request
|
|
static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock *request)
|
|
{
|
|
struct nfs_server *server = NFS_SERVER(state->inode);
|
|
- struct nfs4_exception exception = { };
|
|
+ struct nfs4_exception exception = {
|
|
+ .inode = state->inode,
|
|
+ };
|
|
int err;
|
|
|
|
err = nfs4_set_lock_state(state, request);
|
|
@@ -4551,6 +4555,7 @@ static int nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock *
|
|
{
|
|
struct nfs4_exception exception = {
|
|
.state = state,
|
|
+ .inode = state->inode,
|
|
};
|
|
int err;
|
|
|
|
--
|
|
1.7.7.6
|
|
|