diff options
| author | Christoph Hellwig | 2010-02-03 20:43:31 +0100 |
|---|---|---|
| committer | Alex Elder | 2010-02-12 20:43:57 +0100 |
| commit | 87185517de81101da5afbc82cefdeed6eeaa38fb (patch) | |
| tree | 29cb781d74d5e81d941e1a913222de90f6266477 /fs/xfs/linux-2.6 | |
| parent | xfs: kill xfs_bawrite (diff) | |
| download | kernel-qcow2-linux-87185517de81101da5afbc82cefdeed6eeaa38fb.tar.gz kernel-qcow2-linux-87185517de81101da5afbc82cefdeed6eeaa38fb.tar.xz kernel-qcow2-linux-87185517de81101da5afbc82cefdeed6eeaa38fb.zip | |
xfs: only clear the suid bit once in xfs_write
file_remove_suid already calls into ->setattr to clear the suid and
sgid bits if needed, no need to start a second transaction to do it
ourselves.
Note that xfs_write_clear_setuid issues a sync transaction while the
path through ->setattr doesn't, but that is consistant with the
other filesystems.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Alex Elder <aelder@sgi.com>
Signed-off-by: Alex Elder <aelder@sgi.com>
Diffstat (limited to 'fs/xfs/linux-2.6')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_lrw.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/fs/xfs/linux-2.6/xfs_lrw.c b/fs/xfs/linux-2.6/xfs_lrw.c index c80fa00d2ad7..eac6f80d786d 100644 --- a/fs/xfs/linux-2.6/xfs_lrw.c +++ b/fs/xfs/linux-2.6/xfs_lrw.c @@ -630,18 +630,9 @@ start: * by root. This keeps people from modifying setuid and * setgid binaries. */ - - if (((xip->i_d.di_mode & S_ISUID) || - ((xip->i_d.di_mode & (S_ISGID | S_IXGRP)) == - (S_ISGID | S_IXGRP))) && - !capable(CAP_FSETID)) { - error = xfs_write_clear_setuid(xip); - if (likely(!error)) - error = -file_remove_suid(file); - if (unlikely(error)) { - goto out_unlock_internal; - } - } + error = -file_remove_suid(file); + if (unlikely(error)) + goto out_unlock_internal; /* We can write back this queue in page reclaim */ current->backing_dev_info = mapping->backing_dev_info; |