From 6c2aad0567e693f9588d0a0683f96ed872fb4641 Mon Sep 17 00:00:00 2001 From: Mark Fasheh Date: Tue, 19 Dec 2006 15:25:52 -0800 Subject: [PATCH] ocfs2: ignore NULL vfsmnt in ocfs2_should_update_atime() This can come from NFSD. Signed-off-by: Mark Fasheh --- fs/ocfs2/file.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index a50447d461e5..10953a508f2f 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -149,6 +149,17 @@ int ocfs2_should_update_atime(struct inode *inode, ((inode->i_sb->s_flags & MS_NODIRATIME) && S_ISDIR(inode->i_mode))) return 0; + /* + * We can be called with no vfsmnt structure - NFSD will + * sometimes do this. + * + * Note that our action here is different than touch_atime() - + * if we can't tell whether this is a noatime mount, then we + * don't know whether to trust the value of s_atime_quantum. + */ + if (vfsmnt == NULL) + return 0; + if ((vfsmnt->mnt_flags & MNT_NOATIME) || ((vfsmnt->mnt_flags & MNT_NODIRATIME) && S_ISDIR(inode->i_mode))) return 0; -- 2.30.2