diff options
author | Christoph Hellwig <hch@lst.de> | 2010-06-04 05:30:01 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-08-09 16:47:36 -0400 |
commit | eef2380c187890816b73b1a4cb89a09203759469 (patch) | |
tree | 1b4764753f0e2c718accd4f3541493efcd663007 /fs/libfs.c | |
parent | 6a1a90ad1b0edb556a7550a6ef8a8756f0304dd5 (diff) |
default to simple_setattr
With the new truncate sequence every filesystem that wants to support file
size changes on disk needs to implement its own ->setattr. So instead
of calling inode_setattr which supports size changes call into a simple
method that doesn't support this. simple_setattr is almost what we
want except that it does not mark the inode dirty after changes. Given
that marking the inode dirty is a no-op for the simple in-memory filesystems
that use simple_setattr currently just add the mark_inode_dirty call.
Also add a WARN_ON for the presence of a truncate method to simple_setattr
to catch new instances of it during the transition period.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/libfs.c')
-rw-r--r-- | fs/libfs.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/fs/libfs.c b/fs/libfs.c index 861a88797716..40562224b718 100644 --- a/fs/libfs.c +++ b/fs/libfs.c | |||
@@ -370,21 +370,26 @@ int simple_setsize(struct inode *inode, loff_t newsize) | |||
370 | EXPORT_SYMBOL(simple_setsize); | 370 | EXPORT_SYMBOL(simple_setsize); |
371 | 371 | ||
372 | /** | 372 | /** |
373 | * simple_setattr - setattr for simple in-memory filesystem | 373 | * simple_setattr - setattr for simple filesystem |
374 | * @dentry: dentry | 374 | * @dentry: dentry |
375 | * @iattr: iattr structure | 375 | * @iattr: iattr structure |
376 | * | 376 | * |
377 | * Returns 0 on success, -error on failure. | 377 | * Returns 0 on success, -error on failure. |
378 | * | 378 | * |
379 | * simple_setattr implements setattr for an in-memory filesystem which | 379 | * simple_setattr is a simple ->setattr implementation without a proper |
380 | * does not store its own file data or metadata (eg. uses the page cache | 380 | * implementation of size changes. |
381 | * and inode cache as its data store). | 381 | * |
382 | * It can either be used for in-memory filesystems or special files | ||
383 | * on simple regular filesystems. Anything that needs to change on-disk | ||
384 | * or wire state on size changes needs its own setattr method. | ||
382 | */ | 385 | */ |
383 | int simple_setattr(struct dentry *dentry, struct iattr *iattr) | 386 | int simple_setattr(struct dentry *dentry, struct iattr *iattr) |
384 | { | 387 | { |
385 | struct inode *inode = dentry->d_inode; | 388 | struct inode *inode = dentry->d_inode; |
386 | int error; | 389 | int error; |
387 | 390 | ||
391 | WARN_ON_ONCE(inode->i_op->truncate); | ||
392 | |||
388 | error = inode_change_ok(inode, iattr); | 393 | error = inode_change_ok(inode, iattr); |
389 | if (error) | 394 | if (error) |
390 | return error; | 395 | return error; |
@@ -396,7 +401,8 @@ int simple_setattr(struct dentry *dentry, struct iattr *iattr) | |||
396 | } | 401 | } |
397 | 402 | ||
398 | setattr_copy(inode, iattr); | 403 | setattr_copy(inode, iattr); |
399 | return error; | 404 | mark_inode_dirty(inode); |
405 | return 0; | ||
400 | } | 406 | } |
401 | EXPORT_SYMBOL(simple_setattr); | 407 | EXPORT_SYMBOL(simple_setattr); |
402 | 408 | ||