patch-2.4.23 linux-2.4.23/fs/nfs/nfs3xdr.c
Next file: linux-2.4.23/fs/nfs/write.c
Previous file: linux-2.4.23/fs/nfs/nfs3proc.c
Back to the patch index
Back to the overall index
- Lines: 34
- Date:
2003-11-28 10:26:21.000000000 -0800
- Orig file:
linux-2.4.22/fs/nfs/nfs3xdr.c
- Orig date:
2002-11-28 15:53:15.000000000 -0800
diff -urN linux-2.4.22/fs/nfs/nfs3xdr.c linux-2.4.23/fs/nfs/nfs3xdr.c
@@ -599,8 +599,6 @@
u32 *
nfs3_decode_dirent(u32 *p, struct nfs_entry *entry, int plus)
{
- struct nfs_entry old = *entry;
-
if (!*p++) {
if (!*p)
return ERR_PTR(-EAGAIN);
@@ -616,20 +614,12 @@
p = xdr_decode_hyper(p, &entry->cookie);
if (plus) {
- p = xdr_decode_post_op_attr(p, &entry->fattr);
+ struct nfs_fattr fattr;
+ p = xdr_decode_post_op_attr(p, &fattr);
/* In fact, a post_op_fh3: */
if (*p++) {
- p = xdr_decode_fhandle(p, &entry->fh);
- /* Ugh -- server reply was truncated */
- if (p == NULL) {
- dprintk("NFS: FH truncated\n");
- *entry = old;
- return ERR_PTR(-EAGAIN);
- }
- } else {
- /* If we don't get a file handle, the attrs
- * aren't worth a lot. */
- entry->fattr.valid = 0;
+ struct nfs_fh fh;
+ p = xdr_decode_fhandle(p, &fh);
}
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)