Home » Mailing list archives » linux-kernel » 2008 » January » 23

[PATCH 18/27] CacheFiles: Be consistent about the use of mapping vs file->f_mapping in Ext3 [try #2]

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: David Howells <dhowells@...>
To: <Trond.Myklebust@...>
Cc: <nfsv4@...>, <linux-kernel@...>, <linux-fsdevel@...>, <selinux@...>, <linux-security-module@...>, <dhowells@...>
Subject: [PATCH 18/27] CacheFiles: Be consistent about the use of mapping vs file-&gt;f_mapping in Ext3 [try #2]
Date: Wednesday, January 23, 2008 - 1:22 pm

Change all the usages of file->f_mapping in ext3_*write_end() functions to use
the mapping argument directly.  This has two consequences:

 (*) Consistency.  Without this patch sometimes one is used and sometimes the
     other is.

 (*) A NULL file pointer can be passed.  This feature is then made use of by
     the generic hook in the next patch, which is used by CacheFiles to write
     pages to a file without setting up a file struct.

Signed-off-by: David Howells <dhowells@redhat.com>
---

 fs/ext3/inode.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index 9b162cd..bc918d3 100644
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -1227,7 +1227,7 @@ static int ext3_generic_write_end(struct file *file,
 				loff_t pos, unsigned len, unsigned copied,
 				struct page *page, void *fsdata)
 {
-	struct inode *inode = file->f_mapping->host;
+	struct inode *inode = mapping->host;
 
 	copied = block_write_end(file, mapping, pos, len, copied, page, fsdata);
 
@@ -1252,7 +1252,7 @@ static int ext3_ordered_write_end(struct file *file,
 				struct page *page, void *fsdata)
 {
 	handle_t *handle = ext3_journal_current_handle();
-	struct inode *inode = file->f_mapping->host;
+	struct inode *inode = mapping->host;
 	unsigned from, to;
 	int ret = 0, ret2;
 
@@ -1293,7 +1293,7 @@ static int ext3_writeback_write_end(struct file *file,
 				struct page *page, void *fsdata)
 {
 	handle_t *handle = ext3_journal_current_handle();
-	struct inode *inode = file->f_mapping->host;
+	struct inode *inode = mapping->host;
 	int ret = 0, ret2;
 	loff_t new_i_size;
 

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 00/27] Permit filesystem local caching [try #2], David Howells, (Wed Jan 23, 1:20 pm)
[PATCH 27/27] NFS: Separate caching by superblock, explicitl..., David Howells, (Wed Jan 23, 1:23 pm)
[PATCH 24/27] NFS: Use local caching [try #2], David Howells, (Wed Jan 23, 1:22 pm)
Re: [PATCH 24/27] NFS: Use local caching [try #2], Chuck Lever, (Thu Jan 24, 5:22 pm)
Re: [PATCH 24/27] NFS: Use local caching [try #2], David Howells, (Thu Feb 7, 6:57 am)
Re: [PATCH 24/27] NFS: Use local caching [try #2], David Howells, (Tue Jan 29, 11:25 pm)
Re: [PATCH 24/27] NFS: Use local caching [try #2], Chuck Lever, (Wed Jan 30, 6:36 pm)
Re: [PATCH 24/27] NFS: Use local caching [try #2], David Howells, (Thu Jan 31, 7:29 pm)
Re: [PATCH 24/27] NFS: Use local caching [try #2], Trond Myklebust, (Wed Jan 30, 2:46 am)
Re: [PATCH 24/27] NFS: Use local caching [try #2], Trond Myklebust, (Thu Jan 24, 5:08 pm)
[PATCH 26/27] NFS: Display local caching state [try #2], David Howells, (Wed Jan 23, 1:22 pm)
[PATCH 25/27] NFS: Configuration and mount option changes to..., David Howells, (Wed Jan 23, 1:22 pm)
Re: [PATCH 25/27] NFS: Configuration and mount option change..., Trond Myklebust, (Thu Jan 24, 5:14 pm)
[PATCH 22/27] CacheFiles: A cache that backs onto a mounted ..., David Howells, (Wed Jan 23, 1:22 pm)
[PATCH 21/27] CacheFiles: Export things for CacheFiles [try ..., David Howells, (Wed Jan 23, 1:22 pm)
[PATCH 23/27] NFS: Fix memory leak [try #2], David Howells, (Wed Jan 23, 1:22 pm)
Re: [PATCH 23/27] NFS: Fix memory leak [try #2], Trond Myklebust, (Thu Jan 24, 5:15 pm)
[PATCH 20/27] CacheFiles: Permit the page lock state to be m..., David Howells, (Wed Jan 23, 1:22 pm)
[PATCH 19/27] CacheFiles: Add a hook to write a single page ..., David Howells, (Wed Jan 23, 1:22 pm)
[PATCH 16/27] FS-Cache: Generic filesystem caching facility ..., David Howells, (Wed Jan 23, 1:22 pm)
[PATCH 18/27] CacheFiles: Be consistent about the use of map..., David Howells, (Wed Jan 23, 1:22 pm)
[PATCH 17/27] CacheFiles: Add missing copy_page export for i..., David Howells, (Wed Jan 23, 1:22 pm)
[PATCH 15/27] FS-Cache: Provide an add_wait_queue_tail() fun..., David Howells, (Wed Jan 23, 1:21 pm)
[PATCH 14/27] FS-Cache: Recruit a couple of page flags for c..., David Howells, (Wed Jan 23, 1:21 pm)
[PATCH 13/27] FS-Cache: Release page-&gt;private after faile..., David Howells, (Wed Jan 23, 1:21 pm)
[PATCH 12/27] Security: Make NFSD work with detached securit..., David Howells, (Wed Jan 23, 1:21 pm)
[PATCH 11/27] Security: Allow kernel services to override LS..., David Howells, (Wed Jan 23, 1:21 pm)
[PATCH 10/27] Security: Add a kernel_service object class to..., David Howells, (Wed Jan 23, 1:21 pm)
[PATCH 09/27] Security: Pre-add additional non-caching class..., David Howells, (Wed Jan 23, 1:21 pm)
[PATCH 07/27] Security: De-embed task security record from t..., David Howells, (Wed Jan 23, 1:21 pm)
[PATCH 08/27] Add a secctx_to_secid() LSM hook to go along w..., David Howells, (Wed Jan 23, 1:21 pm)
[PATCH 06/27] Security: Separate task security context from ..., David Howells, (Wed Jan 23, 1:21 pm)
[PATCH 05/27] Security: Change current-&gt;fs[ug]id to curre..., David Howells, (Wed Jan 23, 1:21 pm)
[PATCH 04/27] KEYS: Add keyctl function to get a security la..., David Howells, (Wed Jan 23, 1:21 pm)
[PATCH 01/27] KEYS: Increase the payload size when instantia..., David Howells, (Wed Jan 23, 1:20 pm)
[PATCH 03/27] KEYS: Allow the callout data to be passed as a..., David Howells, (Wed Jan 23, 1:20 pm)
[PATCH 02/27] KEYS: Check starting keyring as part of search..., David Howells, (Wed Jan 23, 1:20 pm)