From 7b380540928bc831d37088ccfd039526afec4a5c Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 13 Dec 2006 00:34:33 -0800 Subject: [PATCH] --- yaml --- r: 44464 b: refs/heads/master c: b227613841d4d211a10c5860acc73e133b613bc0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/inode.c | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 9b550984c1cd..e88bcf03ca13 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c0350bd0c9b59957760e67516973db35bafa050 +refs/heads/master: b227613841d4d211a10c5860acc73e133b613bc0 diff --git a/trunk/fs/inode.c b/trunk/fs/inode.c index d00de182ecb9..04536ebc5ac4 100644 --- a/trunk/fs/inode.c +++ b/trunk/fs/inode.c @@ -1144,7 +1144,6 @@ sector_t bmap(struct inode * inode, sector_t block) res = inode->i_mapping->a_ops->bmap(inode->i_mapping, block); return res; } - EXPORT_SYMBOL(bmap); /** @@ -1163,19 +1162,22 @@ void touch_atime(struct vfsmount *mnt, struct dentry *dentry) if (IS_RDONLY(inode)) return; - - if ((inode->i_flags & S_NOATIME) || - (inode->i_sb->s_flags & MS_NOATIME) || - ((inode->i_sb->s_flags & MS_NODIRATIME) && S_ISDIR(inode->i_mode))) + if (inode->i_flags & S_NOATIME) + return; + if (inode->i_sb->s_flags & MS_NOATIME) + return; + if ((inode->i_sb->s_flags & MS_NODIRATIME) && S_ISDIR(inode->i_mode)) return; /* * We may have a NULL vfsmount when coming from NFSD */ - if (mnt && - ((mnt->mnt_flags & MNT_NOATIME) || - ((mnt->mnt_flags & MNT_NODIRATIME) && S_ISDIR(inode->i_mode)))) - return; + if (mnt) { + if (mnt->mnt_flags & MNT_NOATIME) + return; + if ((mnt->mnt_flags & MNT_NODIRATIME) && S_ISDIR(inode->i_mode)) + return; + } now = current_fs_time(inode->i_sb); if (!timespec_equal(&inode->i_atime, &now)) { @@ -1183,7 +1185,6 @@ void touch_atime(struct vfsmount *mnt, struct dentry *dentry) mark_inode_dirty_sync(inode); } } - EXPORT_SYMBOL(touch_atime); /**