From 54a47b5baef0cf7a12c0634c1bbdaa9fb1917b83 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Mon, 21 Nov 2005 21:32:23 -0800 Subject: [PATCH] --- yaml --- r: 14615 b: refs/heads/master c: 86e07ce71a8aad5074f7316f9b297d2137630283 h: refs/heads/master i: 14613: f3b7cb2d635ff0d6ac3e628a8a3efdf675f899aa 14611: ddb1d4be594baf555c3beb4f93f61591e7401c78 14607: c0a3932a59ac0c406e30594dea88e95981fd89e5 v: v3 --- [refs] | 2 +- trunk/fs/compat.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index a74082fbf734..2b9c8e0c693c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f3d48f0373c14a6203202f7b1dfc7b0d8aaf6ed2 +refs/heads/master: 86e07ce71a8aad5074f7316f9b297d2137630283 diff --git a/trunk/fs/compat.c b/trunk/fs/compat.c index 0f7abf246d32..818634120b69 100644 --- a/trunk/fs/compat.c +++ b/trunk/fs/compat.c @@ -168,8 +168,8 @@ asmlinkage long compat_sys_statfs(const char __user *path, struct compat_statfs if (!error) { struct kstatfs tmp; error = vfs_statfs(nd.dentry->d_inode->i_sb, &tmp); - if (!error && put_compat_statfs(buf, &tmp)) - error = -EFAULT; + if (!error) + error = put_compat_statfs(buf, &tmp); path_release(&nd); } return error; @@ -186,8 +186,8 @@ asmlinkage long compat_sys_fstatfs(unsigned int fd, struct compat_statfs __user if (!file) goto out; error = vfs_statfs(file->f_dentry->d_inode->i_sb, &tmp); - if (!error && put_compat_statfs(buf, &tmp)) - error = -EFAULT; + if (!error) + error = put_compat_statfs(buf, &tmp); fput(file); out: return error; @@ -236,8 +236,8 @@ asmlinkage long compat_sys_statfs64(const char __user *path, compat_size_t sz, s if (!error) { struct kstatfs tmp; error = vfs_statfs(nd.dentry->d_inode->i_sb, &tmp); - if (!error && put_compat_statfs64(buf, &tmp)) - error = -EFAULT; + if (!error) + error = put_compat_statfs64(buf, &tmp); path_release(&nd); } return error; @@ -257,8 +257,8 @@ asmlinkage long compat_sys_fstatfs64(unsigned int fd, compat_size_t sz, struct c if (!file) goto out; error = vfs_statfs(file->f_dentry->d_inode->i_sb, &tmp); - if (!error && put_compat_statfs64(buf, &tmp)) - error = -EFAULT; + if (!error) + error = put_compat_statfs64(buf, &tmp); fput(file); out: return error;