diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-03-04 05:47:50 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-03-04 05:47:52 -0500 |
| commit | 4f16d4e0c9a4b20d9f0db365587b96d6001efd7d (patch) | |
| tree | fa25dcf285b26f1fac2bf267d0d1cd2c4eba90b8 /fs/cifs/inode.c | |
| parent | 1e259e0a9982078896f3404240096cbea01daca4 (diff) | |
| parent | 6630125419ef37ff8781713c5e9d416f2a4ba357 (diff) | |
Merge branch 'perf/core' into perf/urgent
Merge reason: Switch from pre-merge topical split to the post-merge urgent track
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/cifs/inode.c')
| -rw-r--r-- | fs/cifs/inode.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index cf18ee765590..e3fda978f481 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c | |||
| @@ -1762,8 +1762,18 @@ cifs_setattr_unix(struct dentry *direntry, struct iattr *attrs) | |||
| 1762 | CIFS_MOUNT_MAP_SPECIAL_CHR); | 1762 | CIFS_MOUNT_MAP_SPECIAL_CHR); |
| 1763 | } | 1763 | } |
| 1764 | 1764 | ||
| 1765 | if (!rc) | 1765 | if (!rc) { |
| 1766 | rc = inode_setattr(inode, attrs); | 1766 | rc = inode_setattr(inode, attrs); |
| 1767 | |||
| 1768 | /* force revalidate when any of these times are set since some | ||
| 1769 | of the fs types (eg ext3, fat) do not have fine enough | ||
| 1770 | time granularity to match protocol, and we do not have a | ||
| 1771 | a way (yet) to query the server fs's time granularity (and | ||
| 1772 | whether it rounds times down). | ||
| 1773 | */ | ||
| 1774 | if (!rc && (attrs->ia_valid & (ATTR_MTIME | ATTR_CTIME))) | ||
| 1775 | cifsInode->time = 0; | ||
| 1776 | } | ||
| 1767 | out: | 1777 | out: |
| 1768 | kfree(args); | 1778 | kfree(args); |
| 1769 | kfree(full_path); | 1779 | kfree(full_path); |