From patchwork Mon Nov 14 06:24:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kazuya Mio X-Patchwork-Id: 125484 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0E89BB7134 for ; Mon, 14 Nov 2011 17:32:05 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752073Ab1KNGcD (ORCPT ); Mon, 14 Nov 2011 01:32:03 -0500 Received: from TYO201.gate.nec.co.jp ([202.32.8.193]:57323 "EHLO tyo201.gate.nec.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751700Ab1KNGcC (ORCPT ); Mon, 14 Nov 2011 01:32:02 -0500 Received: from mailgate3.nec.co.jp ([10.7.69.197]) by tyo201.gate.nec.co.jp (8.13.8/8.13.4) with ESMTP id pAE6Vu0c017217; Mon, 14 Nov 2011 15:31:56 +0900 (JST) Received: (from root@localhost) by mailgate3.nec.co.jp (8.11.7/3.7W-MAILGATE-NEC) id pAE6VuW02713; Mon, 14 Nov 2011 15:31:56 +0900 (JST) Received: from mail01b.kamome.nec.co.jp (mail01b.kamome.nec.co.jp [10.25.43.2]) by mailsv4.nec.co.jp (8.13.8/8.13.4) with ESMTP id pAE6Vtdq010609; Mon, 14 Nov 2011 15:31:56 +0900 (JST) Received: from monta.jp.nec.com ([10.26.220.14] [10.26.220.14]) by mail03.kamome.nec.co.jp with ESMTP id BT-MMP-2013763; Mon, 14 Nov 2011 15:24:44 +0900 Received: from [10.64.168.30] ([10.64.168.30] [10.64.168.30]) by mail.jp.nec.com with ESMTP; Mon, 14 Nov 2011 15:24:44 +0900 Message-ID: <4EC0B42B.3030002@sx.jp.nec.com> Date: Mon, 14 Nov 2011 15:24:43 +0900 From: Kazuya Mio User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.0; ja; rv:1.9.2.18) Gecko/20110613 Thunderbird/3.1.11 MIME-Version: 1.0 To: ext4 CC: Theodore Tso , Andreas Dilger Subject: [PATCH v3 06/11] e4defrag: Allow user who has read+write access to defrag Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Anyone who has read+write access can defrag the file for this fix. Currently, non-root user needs owner authority to defrag the file. But non-root user who is not owner might have read+write access. Signed-off-by: Kazuya Mio --- misc/e4defrag.8.in | 3 +-- misc/e4defrag.c | 24 ++++-------------------- 2 files changed, 5 insertions(+), 22 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/misc/e4defrag.8.in b/misc/e4defrag.8.in index e91ac85..d922426 100644 --- a/misc/e4defrag.8.in +++ b/misc/e4defrag.8.in @@ -46,9 +46,8 @@ is a device or a mount point, .B e4defrag doesn't defragment files in mount point of other device. .PP -Non-privileged users can execute .B e4defrag -to their own file. +can be called for the file only if read and write access are allowed. .SH AUTHOR Written by Akira Fujita and Takashi Sato . diff --git a/misc/e4defrag.c b/misc/e4defrag.c index 8b19776..effd774 100644 --- a/misc/e4defrag.c +++ b/misc/e4defrag.c @@ -156,7 +156,6 @@ int extents_before_defrag; int extents_after_defrag; int mode_flag; unsigned int threshold; -unsigned int current_uid; unsigned int defraged_file_count; unsigned int frag_files_before_defrag; unsigned int frag_files_after_defrag; @@ -477,6 +476,7 @@ static int check_free_size(int fd, const char *file, ext4_fsblk_t blk_count) { ext4_fsblk_t free_blk_count; struct statfs64 fsbuf; + uid_t current_uid = getuid(); if (fstatfs64(fd, &fsbuf) < 0) { if (mode_flag & DETAIL) { @@ -528,13 +528,12 @@ static int file_frag_count(int fd) * file_check() - Check file's attributes. * * @fd: defrag target file's descriptor. - * @buf: a pointer of the struct stat64. * @file: file name. * @extents: file extents. * @blk_count: file blocks. */ -static int file_check(int fd, const struct stat64 *buf, const char *file, - int extents, ext4_fsblk_t blk_count) +static int file_check(int fd, const char *file, int extents, + ext4_fsblk_t blk_count) { int ret; struct flock lock; @@ -558,20 +557,6 @@ static int file_check(int fd, const struct stat64 *buf, const char *file, return -1; } - /* Access authority */ - if (current_uid != ROOT_UID && - buf->st_uid != current_uid) { - if (mode_flag & DETAIL) { - printf("\033[79;0H\033[K[%u/%u] \"%s\"\t\t" - " extents: %d -> %d\n", defraged_file_count, - total_count, file, extents, extents); - IN_FTW_PRINT_ERR_MSG( - "File is not current user's file" - " or current user is not root"); - } - return -1; - } - /* Lock status */ if (fcntl(fd, F_GETLK, &lock) < 0) { if (mode_flag & DETAIL) { @@ -1051,7 +1036,7 @@ static int file_defrag(const char *file, const struct stat64 *buf, file_frags_start = get_exts_count(orig_list); blk_count = get_file_blocks(orig_list); - if (file_check(fd, buf, file, file_frags_start, blk_count) < 0) + if (file_check(fd, file, file_frags_start, blk_count) < 0) goto out; if (fsync(fd) < 0) { @@ -1255,7 +1240,6 @@ int main(int argc, char *argv[]) if (argc == optind) goto out; - current_uid = getuid(); threshold = (mode_flag & FORCE) ? ~0U : DEFAULT_THRESHOLD; /* Main process */