linuxmsm/laptops-kernel
0
0
Fork 0
mirror of https://github.com/linux-msm/laptops-kernel.git synced 2026-08-13 14:19:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git

Browse Source
This commit is contained in:
Mark Brown
2026-07-31 13:10:30 +01:00
parent fe86dd2ae7 4aeb63d5ac
commit 49e0989f25
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/nfs/nfs4proc.c
+14 -3
View File
@@ -10364,6 +10364,7 @@ static void nfs41_free_stateid_release(void *calldata)
struct nfs_free_stateid_data *data = calldata;
struct nfs_client *clp = data->server->nfs_client;
nfs_sb_deactive(data->server->super);
nfs_put_client(clp);
kfree(calldata);
}
@@ -10402,17 +10403,22 @@ static int nfs41_free_stateid(struct nfs_server *server,
struct nfs_free_stateid_data *data;
struct rpc_task *task;
struct nfs_client *clp = server->nfs_client;
int ret = -EIO;
if (!refcount_inc_not_zero(&clp->cl_count))
return -EIO;
return ret;
if (!nfs_sb_active(server->super))
goto out_put_clp;
nfs4_state_protect(clp, NFS_SP4_MACH_CRED_STATEID,
&task_setup.rpc_client, &msg);
dprintk("NFS call free_stateid %p\n", stateid);
data = kmalloc_obj(*data);
if (!data)
return -ENOMEM;
if (!data) {
ret = -ENOMEM;
goto out_put_server;
}
data->server = server;
nfs4_stateid_copy(&data->args.stateid, stateid);
@@ -10428,6 +10434,11 @@ static int nfs41_free_stateid(struct nfs_server *server,
rpc_put_task(task);
stateid->type = NFS4_FREED_STATEID_TYPE;
return 0;
out_put_server:
nfs_sb_deactive(server->super);
out_put_clp:
nfs_put_client(clp);
return ret;
}
static void