tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux

* 'for-2.6.27' of git://linux-nfs.org/~bfields/linux:
fs/nfsd/export.c: Adjust error handling code involving auth_domain_put
MAINTAINERS: mention lockd and sunrpc in nfs entries
lockd: trivial sparse endian annotations

Linus Torvalds b0e0c9e7 dae81683

+9 -9
+2 -2
MAINTAINERS
··· 2462 2462 W: http://www.kerneljanitors.org/ 2463 2463 S: Maintained 2464 2464 2465 - KERNEL NFSD 2465 + KERNEL NFSD, SUNRPC, AND LOCKD SERVERS 2466 2466 P: J. Bruce Fields 2467 2467 M: bfields@fieldses.org 2468 2468 P: Neil Brown ··· 3078 3078 L: netdev@vger.kernel.org 3079 3079 S: Maintained 3080 3080 3081 - NFS CLIENT 3081 + NFS, SUNRPC, AND LOCKD CLIENTS 3082 3082 P: Trond Myklebust 3083 3083 M: Trond.Myklebust@netapp.com 3084 3084 L: linux-nfs@vger.kernel.org
+2 -2
fs/lockd/svc4proc.c
··· 83 83 { 84 84 struct nlm_host *host; 85 85 struct nlm_file *file; 86 - int rc = rpc_success; 86 + __be32 rc = rpc_success; 87 87 88 88 dprintk("lockd: TEST4 called\n"); 89 89 resp->cookie = argp->cookie; ··· 116 116 { 117 117 struct nlm_host *host; 118 118 struct nlm_file *file; 119 - int rc = rpc_success; 119 + __be32 rc = rpc_success; 120 120 121 121 dprintk("lockd: LOCK called\n"); 122 122
+2 -2
fs/lockd/svcproc.c
··· 112 112 { 113 113 struct nlm_host *host; 114 114 struct nlm_file *file; 115 - int rc = rpc_success; 115 + __be32 rc = rpc_success; 116 116 117 117 dprintk("lockd: TEST called\n"); 118 118 resp->cookie = argp->cookie; ··· 146 146 { 147 147 struct nlm_host *host; 148 148 struct nlm_file *file; 149 - int rc = rpc_success; 149 + __be32 rc = rpc_success; 150 150 151 151 dprintk("lockd: LOCK called\n"); 152 152
+3 -3
fs/nfsd/export.c
··· 1023 1023 /* Look up the dentry */ 1024 1024 err = path_lookup(nxp->ex_path, 0, &nd); 1025 1025 if (err) 1026 - goto out_unlock; 1026 + goto out_put_clp; 1027 1027 err = -EINVAL; 1028 1028 1029 1029 exp = exp_get_by_name(clp, nd.path.mnt, nd.path.dentry, NULL); ··· 1090 1090 exp_put(exp); 1091 1091 if (fsid_key && !IS_ERR(fsid_key)) 1092 1092 cache_put(&fsid_key->h, &svc_expkey_cache); 1093 - if (clp) 1094 - auth_domain_put(clp); 1095 1093 path_put(&nd.path); 1094 + out_put_clp: 1095 + auth_domain_put(clp); 1096 1096 out_unlock: 1097 1097 exp_writeunlock(); 1098 1098 out: