diff options
| author | Christoph Hellwig <hch@infradead.org> | 2013-12-06 12:30:16 -0800 |
|---|---|---|
| committer | Ben Myers <bpm@sgi.com> | 2013-12-18 16:08:04 -0600 |
| commit | 568d994e9f53657cb6b3e9c95a83c130d36f83c9 (patch) | |
| tree | a4246ce0b646bc7859e04eaf601ab55e6cd23cdf /fs/xfs | |
| parent | 683cb941598d1d81283c940c100e0ce40f494105 (diff) | |
| download | linux-rpi-568d994e9f53657cb6b3e9c95a83c130d36f83c9.tar.gz linux-rpi-568d994e9f53657cb6b3e9c95a83c130d36f83c9.tar.bz2 linux-rpi-568d994e9f53657cb6b3e9c95a83c130d36f83c9.zip | |
xfs: use xfs_ilock_attr_map_shared in xfs_attr_list_int
We might not have read in the extent list at this point, so make sure we
take the ilock exclusively if we have to do so.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/xfs_attr_list.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/xfs/xfs_attr_list.c b/fs/xfs/xfs_attr_list.c index 2d174b128153..01db96f60cf0 100644 --- a/fs/xfs/xfs_attr_list.c +++ b/fs/xfs/xfs_attr_list.c @@ -507,17 +507,17 @@ xfs_attr_list_int( { int error; xfs_inode_t *dp = context->dp; + uint lock_mode; XFS_STATS_INC(xs_attr_list); if (XFS_FORCED_SHUTDOWN(dp->i_mount)) return EIO; - xfs_ilock(dp, XFS_ILOCK_SHARED); - /* * Decide on what work routines to call based on the inode size. */ + lock_mode = xfs_ilock_attr_map_shared(dp); if (!xfs_inode_hasattr(dp)) { error = 0; } else if (dp->i_d.di_aformat == XFS_DINODE_FMT_LOCAL) { @@ -527,9 +527,7 @@ xfs_attr_list_int( } else { error = xfs_attr_node_list(context); } - - xfs_iunlock(dp, XFS_ILOCK_SHARED); - + xfs_iunlock(dp, lock_mode); return error; } |