The patch titled
nfs statfs error-handling fix
has been added to the -mm tree. Its filename is
nfs-statfs-error-handling-fix.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: nfs statfs error-handling fix
From: Amnon Aaronsohn <amnonaar@xxxxxxxxx>
The nfs statfs function returns a success code on error, and fills the
output buffer with invalid values. The attached patch makes it return a
correct error code instead.
Signed-off-by: Amnon Aaronsohn <amnonaar@xxxxxxxxx>
Cc: Trond Myklebust <trond.myklebust@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/nfs/super.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff -puN fs/nfs/super.c~nfs-statfs-error-handling-fix fs/nfs/super.c
--- a/fs/nfs/super.c~nfs-statfs-error-handling-fix
+++ a/fs/nfs/super.c
@@ -204,9 +204,9 @@ static int nfs_statfs(struct dentry *den
lock_kernel();
error = server->nfs_client->rpc_ops->statfs(server, fh, &res);
- buf->f_type = NFS_SUPER_MAGIC;
if (error < 0)
- goto out_err;
+ goto out;
+ buf->f_type = NFS_SUPER_MAGIC;
/*
* Current versions of glibc do not correctly handle the
@@ -235,13 +235,7 @@ static int nfs_statfs(struct dentry *den
buf->f_namelen = server->namelen;
out:
unlock_kernel();
- return 0;
-
- out_err:
- dprintk("%s: statfs error = %d\n", __FUNCTION__, -error);
- buf->f_bsize = buf->f_blocks = buf->f_bfree = buf->f_bavail = -1;
- goto out;
-
+ return error;
}
/*
_
Patches currently in -mm which might be from amnonaar@xxxxxxxxx are
nfs-statfs-error-handling-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
