aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ceph/addr.c
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2009-10-27 14:50:50 -0400
committerSage Weil <sage@newdream.net>2009-10-27 14:57:03 -0400
commit6b8051855d983db8480ff1ea1b02ef2b49203c22 (patch)
treeafb72be534ddd4c474a2ec9b7cf2ea5ab86799bc /fs/ceph/addr.c
parente53c2fe075feda1fd4f009956ac026dc24c3a199 (diff)
ceph: allocate and parse mount args before client instance
This simplifies much of the error handling during mount. It also means that we have the mount args before client creation, and we can initialize based on those options. Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/addr.c')
-rw-r--r--fs/ceph/addr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index c7d673ffe023..bf535815592d 100644
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -600,8 +600,8 @@ static int ceph_writepages_start(struct address_space *mapping,
600 pr_warning("writepage_start %p on forced umount\n", inode); 600 pr_warning("writepage_start %p on forced umount\n", inode);
601 return -EIO; /* we're in a forced umount, don't write! */ 601 return -EIO; /* we're in a forced umount, don't write! */
602 } 602 }
603 if (client->mount_args.wsize && client->mount_args.wsize < wsize) 603 if (client->mount_args->wsize && client->mount_args->wsize < wsize)
604 wsize = client->mount_args.wsize; 604 wsize = client->mount_args->wsize;
605 if (wsize < PAGE_CACHE_SIZE) 605 if (wsize < PAGE_CACHE_SIZE)
606 wsize = PAGE_CACHE_SIZE; 606 wsize = PAGE_CACHE_SIZE;
607 max_pages_ever = wsize >> PAGE_CACHE_SHIFT; 607 max_pages_ever = wsize >> PAGE_CACHE_SHIFT;