diff options
| author | David S. Miller <davem@davemloft.net> | 2010-11-14 14:57:05 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-14 14:57:05 -0500 |
| commit | c25ecd0a21d5e08160cb5cc984f9e2b8ee347443 (patch) | |
| tree | 0e4dcacf1bf603f259b8d27445a10e60fa8d00d7 /fs/cifs/inode.c | |
| parent | 190683a9d5457e6d962c232ffbecac3ab158dddd (diff) | |
| parent | 9457b24a0955bbdd2e89220a75de69fe09501bba (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
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); |