diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-31 01:45:48 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-31 01:45:48 -0400 |
| commit | aa43f77939c97bf9d3580c6a5e71a5a40290e451 (patch) | |
| tree | 095c0b8b3da4b6554a3f8ef4b39240a5d9216d4d /fs/cifs/smberr.h | |
| parent | 2818c5dec5e28d65d52afbb7695bbbafe6377ee5 (diff) | |
| parent | 4c15343167b5febe7bb0ba96aad5bef42ae94d3b (diff) | |
Merge branch 'merge'
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 |