diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-09 13:34:48 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-09 13:34:48 -0500 |
| commit | f6614b7bb405a9b35dd28baea989a749492c46b2 (patch) | |
| tree | 3a6bc580d98fb191ff44a374b61a3a55641f94ac /fs/cifs/inode.c | |
| parent | 63bfd7384b119409685a17d5c58f0b56e5dc03da (diff) | |
| parent | 3565bd46b1c6a3dbf1f670d3275aa4018a4c65ae (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 a memleak in cifs_setattr_nounix()
cifs: make cifs_ioctl handle NULL filp->private_data correctly
Diffstat (limited to 'fs/cifs/inode.c')
| -rw-r--r-- | fs/cifs/inode.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 39869c3c3efb..ef3a55bf86b6 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c | |||
| @@ -2177,7 +2177,6 @@ cifs_setattr_nounix(struct dentry *direntry, struct iattr *attrs) | |||
| 2177 | 2177 | ||
| 2178 | setattr_copy(inode, attrs); | 2178 | setattr_copy(inode, attrs); |
| 2179 | mark_inode_dirty(inode); | 2179 | mark_inode_dirty(inode); |
| 2180 | return 0; | ||
| 2181 | 2180 | ||
| 2182 | cifs_setattr_exit: | 2181 | cifs_setattr_exit: |
| 2183 | kfree(full_path); | 2182 | kfree(full_path); |