提交 e88d0c9a 编写于 作者: M Mark Fasheh

ocfs2: Remove ocfs2_write_should_remove_suid()

Use should_remove_suid() instead.
Signed-off-by: NMark Fasheh <mark.fasheh@oracle.com>
上级 d23a147b
...@@ -943,20 +943,6 @@ static int ocfs2_write_remove_suid(struct inode *inode) ...@@ -943,20 +943,6 @@ static int ocfs2_write_remove_suid(struct inode *inode)
return ret; return ret;
} }
static inline int ocfs2_write_should_remove_suid(struct inode *inode)
{
mode_t mode = inode->i_mode;
if (!capable(CAP_FSETID)) {
if (unlikely(mode & S_ISUID))
return 1;
if (unlikely((mode & S_ISGID) && (mode & S_IXGRP)))
return 1;
}
return 0;
}
static ssize_t ocfs2_file_aio_write(struct kiocb *iocb, static ssize_t ocfs2_file_aio_write(struct kiocb *iocb,
const struct iovec *iov, const struct iovec *iov,
unsigned long nr_segs, unsigned long nr_segs,
...@@ -1021,7 +1007,7 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb, ...@@ -1021,7 +1007,7 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb,
* inode. There's also the dinode i_size state which * inode. There's also the dinode i_size state which
* can be lost via setattr during extending writes (we * can be lost via setattr during extending writes (we
* set inode->i_size at the end of a write. */ * set inode->i_size at the end of a write. */
if (ocfs2_write_should_remove_suid(inode)) { if (should_remove_suid(filp->f_dentry)) {
if (meta_level == 0) { if (meta_level == 0) {
ocfs2_meta_unlock(inode, meta_level); ocfs2_meta_unlock(inode, meta_level);
meta_level = 1; meta_level = 1;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册