diff options
author | Christoph Hellwig <hch@lst.de> | 2008-12-03 06:20:22 -0500 |
---|---|---|
committer | Niv Sardi <xaiki@sgi.com> | 2008-12-03 23:39:19 -0500 |
commit | 2234d54d3d855d6ffae88a24772a9389d6755e0c (patch) | |
tree | 7b08b29770cc9aa80d34b55ec811d190dd2ba70e /fs/xfs | |
parent | ddcd856d81861a523d79d077facd875da1f66792 (diff) |
remove useless mnt_want_write call in xfs_write
When mnt_want_write was introduced a call to it was added around
xfs_ichgtime, but there is no need for this because a file can't be open
read/write on a r/o mount, and a mount can't degrade r/o while we still
have files open for writing. As the mnt_want_write changes were never
merged into the CVS tree this patch is for mainline only.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <david@fromorbit.com>
Signed-off-by: Niv Sardi <xaiki@sgi.com>
Diffstat (limited to 'fs/xfs')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_lrw.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/fs/xfs/linux-2.6/xfs_lrw.c b/fs/xfs/linux-2.6/xfs_lrw.c index 4959c8744997..59b7d5f9e64a 100644 --- a/fs/xfs/linux-2.6/xfs_lrw.c +++ b/fs/xfs/linux-2.6/xfs_lrw.c | |||
@@ -51,7 +51,6 @@ | |||
51 | #include "xfs_vnodeops.h" | 51 | #include "xfs_vnodeops.h" |
52 | 52 | ||
53 | #include <linux/capability.h> | 53 | #include <linux/capability.h> |
54 | #include <linux/mount.h> | ||
55 | #include <linux/writeback.h> | 54 | #include <linux/writeback.h> |
56 | 55 | ||
57 | 56 | ||
@@ -668,15 +667,8 @@ start: | |||
668 | if (new_size > xip->i_size) | 667 | if (new_size > xip->i_size) |
669 | xip->i_new_size = new_size; | 668 | xip->i_new_size = new_size; |
670 | 669 | ||
671 | /* | 670 | if (likely(!(ioflags & IO_INVIS))) |
672 | * We're not supposed to change timestamps in readonly-mounted | ||
673 | * filesystems. Throw it away if anyone asks us. | ||
674 | */ | ||
675 | if (likely(!(ioflags & IO_INVIS) && | ||
676 | !mnt_want_write(file->f_path.mnt))) { | ||
677 | xfs_ichgtime(xip, XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG); | 671 | xfs_ichgtime(xip, XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG); |
678 | mnt_drop_write(file->f_path.mnt); | ||
679 | } | ||
680 | 672 | ||
681 | /* | 673 | /* |
682 | * If the offset is beyond the size of the file, we have a couple | 674 | * If the offset is beyond the size of the file, we have a couple |