diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-09 08:10:09 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-09 08:10:09 -0700 |
commit | 26c5e98e88a6126adef2ddce21899e5afe823a2b (patch) | |
tree | b5300f706c700667384d811a74750d2fe287e0ae /fs/cifs/fcntl.c | |
parent | a9545ee3c8153e133556aaaa8110337ca3f864dc (diff) | |
parent | af4b3c355cbd38703471e55d11f42d8640db4118 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
[CIFS] fix build warning
[CIFS] Fixed build warning in is_ip
[CIFS] cleanup cifsd completion
[CIFS] Remove over-indented code in find_unc().
[CIFS] fix typo
[CIFS] Remove duplicate call to mode_to_acl
[CIFS] convert usage of implicit booleans to bool
[CIFS] fixed compatibility issue with samba refferal request
[CIFS] Fix statfs formatting
[CIFS] Adds to dns_resolver checking if the server name is an IP addr and skipping upcall in this case.
[CIFS] Fix spelling mistake
[CIFS] Update cifs version number
Diffstat (limited to 'fs/cifs/fcntl.c')
-rw-r--r-- | fs/cifs/fcntl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/fcntl.c b/fs/cifs/fcntl.c index 7d1d5aa4c430..5a57581eb4b2 100644 --- a/fs/cifs/fcntl.c +++ b/fs/cifs/fcntl.c @@ -68,7 +68,7 @@ int cifs_dir_notify(struct file *file, unsigned long arg) { int xid; int rc = -EINVAL; - int oplock = FALSE; + int oplock = 0; struct cifs_sb_info *cifs_sb; struct cifsTconInfo *pTcon; char *full_path = NULL; |