diff options
author | Chuck Lever <cel@citi.umich.edu> | 2005-08-18 14:24:09 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-18 15:53:56 -0400 |
commit | 5529680981807b44abf3be30fb6d612ff04f68ff (patch) | |
tree | 57da4e9135c0a85c1f8c6bc797250c0209420b51 /fs/nfs/read.c | |
parent | 3c7bf1eaee1255315fc7c2c4c300295e556ef768 (diff) |
[PATCH] NFS: split nfsi->flags into two fields
Certain bits in nfsi->flags can be manipulated with atomic bitops, and some
are better manipulated via logical bitmask operations.
This patch splits the flags field into two. The next patch introduces atomic
bitops for one of the fields.
Test plan:
Millions of fsx ops on SMP clients.
Signed-off-by: Chuck Lever <cel@netapp.com>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/nfs/read.c')
-rw-r--r-- | fs/nfs/read.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/read.c b/fs/nfs/read.c index 6f866b8aa2d5..90df0500ca1b 100644 --- a/fs/nfs/read.c +++ b/fs/nfs/read.c | |||
@@ -140,7 +140,7 @@ static int nfs_readpage_sync(struct nfs_open_context *ctx, struct inode *inode, | |||
140 | if (rdata->res.eof != 0 || result == 0) | 140 | if (rdata->res.eof != 0 || result == 0) |
141 | break; | 141 | break; |
142 | } while (count); | 142 | } while (count); |
143 | NFS_FLAGS(inode) |= NFS_INO_INVALID_ATIME; | 143 | NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ATIME; |
144 | 144 | ||
145 | if (count) | 145 | if (count) |
146 | memclear_highpage_flush(page, rdata->args.pgbase, count); | 146 | memclear_highpage_flush(page, rdata->args.pgbase, count); |
@@ -473,7 +473,7 @@ void nfs_readpage_result(struct rpc_task *task) | |||
473 | } | 473 | } |
474 | task->tk_status = -EIO; | 474 | task->tk_status = -EIO; |
475 | } | 475 | } |
476 | NFS_FLAGS(data->inode) |= NFS_INO_INVALID_ATIME; | 476 | NFS_I(data->inode)->cache_validity |= NFS_INO_INVALID_ATIME; |
477 | data->complete(data, status); | 477 | data->complete(data, status); |
478 | } | 478 | } |
479 | 479 | ||