diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-03-08 17:49:24 +0100 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-03-08 17:49:24 +0100 |
commit | 9446389ef612096704fdf18fa79bab423d4110f0 (patch) | |
tree | 3e4fda7270be58ae176d20d318e61fb115b325b5 /fs/cifs/cifsglob.h | |
parent | Merge branch 'cleanups' into next (diff) | |
parent | x86_64: make ptrace always sign-extend orig_ax to 64 bits (diff) | |
download | linux-9446389ef612096704fdf18fa79bab423d4110f0.tar.xz linux-9446389ef612096704fdf18fa79bab423d4110f0.zip |
Merge commit 'origin' into devel
Diffstat (limited to 'fs/cifs/cifsglob.h')
-rw-r--r-- | fs/cifs/cifsglob.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index 5d32d8ddc82e..69a2e1942542 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h @@ -454,7 +454,7 @@ struct dir_notify_req { struct dfs_info3_param { int flags; /* DFSREF_REFERRAL_SERVER, DFSREF_STORAGE_SERVER*/ - int PathConsumed; + int path_consumed; int server_type; int ref_flag; char *path_name; |