diff options
| author | Chris Zankel <chris@zankel.net> | 2014-12-15 23:09:06 -0500 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2014-12-15 23:09:06 -0500 |
| commit | 865566ed33f08637c3486b4d301e96a9064ad2eb (patch) | |
| tree | dfa26622c8feaa57153d87d207133f01aff5858b /fs/nfs/inode.c | |
| parent | c0d7aa07504a8f4abd7b02b9144c4a92b7565f45 (diff) | |
| parent | b2776bf7149bddd1f4161f14f79520f17fc1d71d (diff) | |
Merge tag 'v3.18' into for_next
Linux 3.18
Diffstat (limited to 'fs/nfs/inode.c')
| -rw-r--r-- | fs/nfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 6388a59f2add..00689a8a85e4 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c | |||
| @@ -626,7 +626,7 @@ int nfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat) | |||
| 626 | { | 626 | { |
| 627 | struct inode *inode = dentry->d_inode; | 627 | struct inode *inode = dentry->d_inode; |
| 628 | int need_atime = NFS_I(inode)->cache_validity & NFS_INO_INVALID_ATIME; | 628 | int need_atime = NFS_I(inode)->cache_validity & NFS_INO_INVALID_ATIME; |
| 629 | int err; | 629 | int err = 0; |
| 630 | 630 | ||
| 631 | trace_nfs_getattr_enter(inode); | 631 | trace_nfs_getattr_enter(inode); |
| 632 | /* Flush out writes to the server in order to update c/mtime. */ | 632 | /* Flush out writes to the server in order to update c/mtime. */ |