aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-19 19:46:45 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-19 19:46:45 -0800
commitb86db4744230c94e480de56f1b7f31117edbf193 (patch)
treee94240a428f525c11c8758ebdd50398cec95e7be /include/linux
parent76db8ac45fc738f7d7664fe9b56d15c594a45228 (diff)
parente681c047e47c0abe67bf95857f23814372793cb0 (diff)
downloadmrst-s0i3-test-b86db4744230c94e480de56f1b7f31117edbf193.tar.gz
mrst-s0i3-test-b86db4744230c94e480de56f1b7f31117edbf193.tar.xz
mrst-s0i3-test-b86db4744230c94e480de56f1b7f31117edbf193.zip
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: ext4: Add EXT4_IOC_TRIM ioctl to handle batched discard fs: Do not dispatch FITRIM through separate super_operation ext4: ext4_fill_super shouldn't return 0 on corruption jbd2: fix /proc/fs/jbd2/<dev> when using an external journal ext4: missing unlock in ext4_clear_request_list() ext4: fix setting random pages PageUptodate
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/fs.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 334d68a1710..eedc00b7b1e 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1612,7 +1612,6 @@ struct super_operations {
ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t);
#endif
int (*bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t);
- int (*trim_fs) (struct super_block *, struct fstrim_range *);
};
/*