diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-02-15 13:36:30 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-02-15 13:36:30 -0500 |
commit | 52833e897fd8c6f62b3e5e27291fa9bc803f7460 (patch) | |
tree | cfe90047ee6c7402674a29ec7258319142b96ff1 /fs/compat.c | |
parent | 8d042218b075de3cdbe066198515b3521553746e (diff) | |
parent | 4ee29f6a52158cea526b16a44ae38643946103ec (diff) |
Merge branch 'linus_origin' into hotfixes
Diffstat (limited to 'fs/compat.c')
-rw-r--r-- | fs/compat.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/compat.c b/fs/compat.c index 439292aa1ec6..2ce4456aad30 100644 --- a/fs/compat.c +++ b/fs/compat.c | |||
@@ -241,10 +241,10 @@ asmlinkage long compat_sys_statfs(const char __user *path, struct compat_statfs | |||
241 | error = user_path_walk(path, &nd); | 241 | error = user_path_walk(path, &nd); |
242 | if (!error) { | 242 | if (!error) { |
243 | struct kstatfs tmp; | 243 | struct kstatfs tmp; |
244 | error = vfs_statfs(nd.dentry, &tmp); | 244 | error = vfs_statfs(nd.path.dentry, &tmp); |
245 | if (!error) | 245 | if (!error) |
246 | error = put_compat_statfs(buf, &tmp); | 246 | error = put_compat_statfs(buf, &tmp); |
247 | path_release(&nd); | 247 | path_put(&nd.path); |
248 | } | 248 | } |
249 | return error; | 249 | return error; |
250 | } | 250 | } |
@@ -309,10 +309,10 @@ asmlinkage long compat_sys_statfs64(const char __user *path, compat_size_t sz, s | |||
309 | error = user_path_walk(path, &nd); | 309 | error = user_path_walk(path, &nd); |
310 | if (!error) { | 310 | if (!error) { |
311 | struct kstatfs tmp; | 311 | struct kstatfs tmp; |
312 | error = vfs_statfs(nd.dentry, &tmp); | 312 | error = vfs_statfs(nd.path.dentry, &tmp); |
313 | if (!error) | 313 | if (!error) |
314 | error = put_compat_statfs64(buf, &tmp); | 314 | error = put_compat_statfs64(buf, &tmp); |
315 | path_release(&nd); | 315 | path_put(&nd.path); |
316 | } | 316 | } |
317 | return error; | 317 | return error; |
318 | } | 318 | } |