From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Hellwig Subject: [PATCH] remove trim_fs method from Documentation/filesystems/Locking Date: Tue, 4 Jan 2011 07:14:24 +0100 Message-ID: <20110104061424.GA16112@lst.de> References: <20101109170706.GA5501@lst.de> <20101216110454.GA5965@lst.de> <20110104.145627.180311923.ryusuke@osrg.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: viro@ZenIV.linux.org.uk, linux-fsdevel@vger.kernel.org, torvalds@linux-foundation.org To: Ryusuke Konishi Return-path: Received: from verein.lst.de ([213.95.11.210]:57420 "EHLO verein.lst.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751099Ab1ADGOs (ORCPT ); Tue, 4 Jan 2011 01:14:48 -0500 Content-Disposition: inline In-Reply-To: <20110104.145627.180311923.ryusuke@osrg.net> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: The ->trim_fs has been removed meanwhile, so remove it from the documentation as well. Signed-off-by: Christoph Hellwig Reported-by: Ryusuke Konishi Index: linux-2.6/Documentation/filesystems/Locking =================================================================== --- linux-2.6.orig/Documentation/filesystems/Locking 2011-01-04 07:08:41.296003372 +0100 +++ linux-2.6/Documentation/filesystems/Locking 2011-01-04 07:08:45.561004280 +0100 @@ -115,7 +115,6 @@ prototypes: ssize_t (*quota_read)(struct super_block *, int, char *, size_t, loff_t); ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t); int (*bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t); - int (*trim_fs) (struct super_block *, struct fstrim_range *); locking rules: All may block [not true, see below] @@ -138,7 +137,6 @@ show_options: no (namespace_sem) quota_read: no (see below) quota_write: no (see below) bdev_try_to_free_page: no (see below) -trim_fs: no ->statfs() has s_umount (shared) when called by ustat(2) (native or compat), but that's an accident of bad API; s_umount is used to pin