diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2008-04-22 07:34:25 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2008-04-22 07:34:25 -0400 |
| commit | f838bad1b3be8ca0c785ee0e0c570dfda74cf377 (patch) | |
| tree | 5a842a8056a708cfad55a20fa8ab733dd94b0903 /fs/cifs/cifsglob.h | |
| parent | dd919660aacdf4adfcd279556aa03e595f7f0fc2 (diff) | |
| parent | 807501475fce0ebe68baedf87f202c3e4ee0d12c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 { | |||
| 454 | 454 | ||
| 455 | struct dfs_info3_param { | 455 | struct dfs_info3_param { |
| 456 | int flags; /* DFSREF_REFERRAL_SERVER, DFSREF_STORAGE_SERVER*/ | 456 | int flags; /* DFSREF_REFERRAL_SERVER, DFSREF_STORAGE_SERVER*/ |
| 457 | int PathConsumed; | 457 | int path_consumed; |
| 458 | int server_type; | 458 | int server_type; |
| 459 | int ref_flag; | 459 | int ref_flag; |
| 460 | char *path_name; | 460 | char *path_name; |