git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
[sfrench/cifs-2.6.git]
/
drivers
/
staging
/
lustre
/
lustre
/
llite
/
file.c
diff --git
a/drivers/staging/lustre/lustre/llite/file.c
b/drivers/staging/lustre/lustre/llite/file.c
index 2d6e64dea2660228855afd4ad0491c4a63e01b91..938b859b6650b2e4b48ebad34d75081a3595bd2e 100644
(file)
--- a/
drivers/staging/lustre/lustre/llite/file.c
+++ b/
drivers/staging/lustre/lustre/llite/file.c
@@
-1016,7
+1016,7
@@
static bool file_is_noatime(const struct file *file)
if ((mnt->mnt_flags & MNT_NODIRATIME) && S_ISDIR(inode->i_mode))
return true;
- if ((inode->i_sb->s_flags &
MS
_NODIRATIME) && S_ISDIR(inode->i_mode))
+ if ((inode->i_sb->s_flags &
SB
_NODIRATIME) && S_ISDIR(inode->i_mode))
return true;
return false;