diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-04 10:31:36 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-04 10:31:36 -0400 |
| commit | 31e77ac55f18db0ec1c724840927562ef3093ef6 (patch) | |
| tree | 01bb0ac2868debd2246df4c5e5617a2ce9f09600 /fs/cifs/smberr.h | |
| parent | 5029996547a9f3988459e11955c13259495308ef (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'fs/cifs/smberr.h')
| -rw-r--r-- | fs/cifs/smberr.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/cifs/smberr.h b/fs/cifs/smberr.h index cd41c67ff8d3..212c3c296409 100644 --- a/fs/cifs/smberr.h +++ b/fs/cifs/smberr.h | |||
| @@ -95,6 +95,7 @@ | |||
| 95 | #define ERRinvlevel 124 | 95 | #define ERRinvlevel 124 |
| 96 | #define ERRdirnotempty 145 | 96 | #define ERRdirnotempty 145 |
| 97 | #define ERRnotlocked 158 | 97 | #define ERRnotlocked 158 |
| 98 | #define ERRcancelviolation 173 | ||
| 98 | #define ERRalreadyexists 183 | 99 | #define ERRalreadyexists 183 |
| 99 | #define ERRbadpipe 230 | 100 | #define ERRbadpipe 230 |
| 100 | #define ERRpipebusy 231 | 101 | #define ERRpipebusy 231 |