Merge branch 'master' into next
Conflicts: fs/nfsd/nfs4recover.c Manually fixed above to use new creds API functions, e.g. nfs4_save_creds(). Signed-off-by: James Morris <jmorris@namei.org>
This commit is contained in:
@@ -106,6 +106,7 @@ void udf_clear_inode(struct inode *inode)
|
||||
udf_truncate_tail_extent(inode);
|
||||
unlock_kernel();
|
||||
write_inode_now(inode, 0);
|
||||
invalidate_inode_buffers(inode);
|
||||
}
|
||||
iinfo = UDF_I(inode);
|
||||
kfree(iinfo->i_ext.i_data);
|
||||
|
Reference in New Issue
Block a user