summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2012-06-12 16:20:36 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2012-07-31 09:45:38 +0400
commit5d37e9e6dec65cd21be68ee92de99686213e916b (patch)
tree8d52a542cdd917053e3c8ad71d7529887a39d9c5 /fs
parenteb04c28288bb0098d0e75d81ba2a575239de71d8 (diff)
downloadop-kernel-dev-5d37e9e6dec65cd21be68ee92de99686213e916b.zip
op-kernel-dev-5d37e9e6dec65cd21be68ee92de99686213e916b.tar.gz
fs: Skip atime update on frozen filesystem
It is unexpected to block reading of frozen filesystem because of atime update. Also handling blocking on frozen filesystem because of atime update would make locking more complex than it already is. So just skip atime update when filesystem is frozen like we skip it when filesystem is remounted read-only. BugLink: https://bugs.launchpad.net/bugs/897421 Tested-by: Kamal Mostafa <kamal@canonical.com> Tested-by: Peter M. Petrakis <peter.petrakis@canonical.com> Tested-by: Dann Frazier <dann.frazier@canonical.com> Tested-by: Massimo Morana <massimo.morana@canonical.com> Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/inode.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/inode.c b/fs/inode.c
index 006c85c..74d7c20 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1542,9 +1542,11 @@ void touch_atime(struct path *path)
if (timespec_equal(&inode->i_atime, &now))
return;
- if (mnt_want_write(mnt))
+ if (!sb_start_write_trylock(inode->i_sb))
return;
+ if (__mnt_want_write(mnt))
+ goto skip_update;
/*
* File systems can error out when updating inodes if they need to
* allocate new space to modify an inode (such is the case for
@@ -1553,7 +1555,9 @@ void touch_atime(struct path *path)
* so just ignore the return value.
*/
update_time(inode, &now, S_ATIME);
- mnt_drop_write(mnt);
+ __mnt_drop_write(mnt);
+skip_update:
+ sb_end_write(inode->i_sb);
}
EXPORT_SYMBOL(touch_atime);
OpenPOWER on IntegriCloud