diff options
Diffstat (limited to 'fs/cifs/file.c')
-rw-r--r-- | fs/cifs/file.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 31a0a33b9d95..0aac824371a5 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c | |||
@@ -75,7 +75,11 @@ static inline int cifs_convert_flags(unsigned int flags) | |||
75 | return (GENERIC_READ | GENERIC_WRITE); | 75 | return (GENERIC_READ | GENERIC_WRITE); |
76 | } | 76 | } |
77 | 77 | ||
78 | return 0x20197; | 78 | return (READ_CONTROL | FILE_WRITE_ATTRIBUTES | FILE_READ_ATTRIBUTES | |
79 | FILE_WRITE_EA | FILE_APPEND_DATA | FILE_WRITE_DATA | | ||
80 | FILE_READ_DATA); | ||
81 | |||
82 | |||
79 | } | 83 | } |
80 | 84 | ||
81 | static inline int cifs_get_disposition(unsigned int flags) | 85 | static inline int cifs_get_disposition(unsigned int flags) |
@@ -542,7 +546,6 @@ int cifs_close(struct inode *inode, struct file *file) | |||
542 | msleep(timeout); | 546 | msleep(timeout); |
543 | timeout *= 8; | 547 | timeout *= 8; |
544 | } | 548 | } |
545 | kfree(pSMBFile->search_resume_name); | ||
546 | kfree(file->private_data); | 549 | kfree(file->private_data); |
547 | file->private_data = NULL; | 550 | file->private_data = NULL; |
548 | } else | 551 | } else |
@@ -601,12 +604,6 @@ int cifs_closedir(struct inode *inode, struct file *file) | |||
601 | else | 604 | else |
602 | cifs_buf_release(ptmp); | 605 | cifs_buf_release(ptmp); |
603 | } | 606 | } |
604 | ptmp = pCFileStruct->search_resume_name; | ||
605 | if (ptmp) { | ||
606 | cFYI(1, ("closedir free resume name")); | ||
607 | pCFileStruct->search_resume_name = NULL; | ||
608 | kfree(ptmp); | ||
609 | } | ||
610 | kfree(file->private_data); | 607 | kfree(file->private_data); |
611 | file->private_data = NULL; | 608 | file->private_data = NULL; |
612 | } | 609 | } |